Mercurial > octave-nkf

changeset 412:116ab89ce023

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1994-04-20 08:25:04 by jwe]
author jwe
date Wed, 20 Apr 1994 08:25:04 +0000
parents b936220a35cf
children 32e8edd62246
files src/lex.l
diffstat 1 files changed, 7 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/src/lex.l	Wed Apr 20 08:09:26 1994 +0000
+++ b/src/lex.l	Wed Apr 20 08:25:04 1994 +0000
@@ -376,7 +376,7 @@
 				     && in_brace_or_paren.top ()
 				     && convert_spaces_to_comma)
 				{
-				  unput (',');
+				  unput (','); /* XXX */
 				  return ']';
 				}
 			    }
@@ -397,7 +397,7 @@
  			  if (! (postfix_un_op || bin_op)
 			      && in_brace_or_paren.top ()
 			      && convert_spaces_to_comma)
-			    TOK_RETURN (',');
+			    TOK_RETURN (','); /* XXX */
 			}
 
 <MATRIX>{SN}*\;{SN}*	|
@@ -470,16 +470,6 @@
 		      in_plot_range = 1;
 		      TOK_RETURN (OPEN_BRACE);
 		    }
-
-		  if (do_comma_insert)
-		    {
-		      yyless (0);
-		      do_comma_insert = 0;
-		      quote_is_transpose = 0;
-		      cant_be_identifier = 0;
-		      convert_spaces_to_comma = 1;
-		      return (',');
-		    }
 		  else
 		    {
 		      mlnm.push (1);
@@ -1452,10 +1442,12 @@
 
       int c1 = yyinput ();
       unput (c1);
-      int other_op = match_any (c1, ",;\n](");
+      int other_op = match_any (c1, ",;\n]");
 
-      if (! (postfix_un_op || bin_op || other_op))
-	unput (',');
+      int index_op = (! spc_prev && c1 == '(');
+
+      if (! (postfix_un_op || bin_op || other_op || index_op))
+	unput (','); /* XXX */
     }
 
   return NAME;