# HG changeset patch
# User jwe
# Date 791245593 0
# Node ID d1a1608f1028427687e0577a916b5988069f11ed
# Parent  5972ef4972ccc7901b3fc492fb66fb9bfea628df
[project @ 1995-01-27 22:26:33 by jwe]

diff --git a/src/lex.l b/src/lex.l
--- a/src/lex.l
+++ b/src/lex.l
@@ -255,9 +255,9 @@
 %}
 
 <MATRIX>{SNLCMT}*\n{SNLCMT}* {
+    fixup_column_count (yytext);
     if (user_pref.whitespace_in_literal_matrix != 2)
       {
-	fixup_column_count (yytext);
 	quote_is_transpose = 0;
 	cant_be_identifier = 0;
 	convert_spaces_to_comma = 1;
@@ -277,9 +277,12 @@
 %}
 
 \[{S}* {
-    fixup_column_count (yytext);
+    nesting_level.push (BRACE);
 
-    nesting_level.push (BRACE);
+    current_input_column += yyleng;
+    quote_is_transpose = 0;
+    cant_be_identifier = 0;
+    convert_spaces_to_comma = 1;
 
     promptflag--;
     eat_whitespace ();
@@ -287,14 +290,14 @@
     if (plotting && ! past_plot_range)
       {
 	in_plot_range = 1;
-	TOK_RETURN (OPEN_BRACE);
+	return OPEN_BRACE;
       }
     else
       {
 	mlnm.push (1);
 	braceflag++;
 	BEGIN MATRIX;
-	TOK_RETURN ('[');
+	return '[';
       }
   }
 
@@ -1383,6 +1386,7 @@
 
  done:
   yyunput (c, yytext);
+  current_input_column--;
   return retval;
 }