octave-dspies: src/lex.l comparison

comparison src/lex.l @ 3388:42cb61dd0248

[project @ 1999-12-16 04:51:43 by jwe]

author	jwe
date	Thu, 16 Dec 1999 04:51:46 +0000
parents	8623649c967c
children	18366d37e7dd

comparison

equal deleted inserted replaced

-:eb4223985ca8
+:42cb61dd0248
 //   [eye (2)]
 //
 // will result in a call to `eye' with the argument `2'.
 static int Vwhitespace_in_literal_matrix;
+static bool Vwarn_separator_insert = false;
 // Forward declarations for functions defined at the bottom of this
 // file.
 static void fixup_column_count (char *s);
 static int handle_identifier (const string& tok, int spc_gobbled);
 static bool have_continuation (bool trailing_comments_ok = true);
 static bool have_ellipsis_continuation (bool trailing_comments_ok = true);
 static yum_yum eat_whitespace (void);
 static yum_yum eat_continuation (void);
+static void maybe_warn_separator_insert (char sep);
 %}
 D	[0-9]
 S	[ \t]
 // commas.
 %}
 <MATRIX>{S}*\,{S}* {
 current_input_column += yyleng;
 int tmp = eat_continuation ();
 lexer_flags.quote_is_transpose = false;
 lexer_flags.cant_be_identifier = false;
 lexer_flags.convert_spaces_to_comma = true;
-if (Vwhitespace_in_literal_matrix != 2
-	&& (tmp & ATE_NEWLINE) == ATE_NEWLINE)
+if ((tmp & ATE_NEWLINE) == ATE_NEWLINE)
-unput (';');
+{
+	maybe_warn_separator_insert (';');
+	if (Vwhitespace_in_literal_matrix != 2)
+	  unput (';');
+}
 return (',');
 }
 %{
 // In some cases, spaces in matrix constants can turn into commas.
 // here we can end up inserting too many commas.
 %}
 <MATRIX>{S}+ {
 current_input_column += yyleng;
-if (Vwhitespace_in_literal_matrix != 2)
+int tmp = eat_continuation ();
+int bin_op = next_token_is_bin_op (true);
+int postfix_un_op = next_token_is_postfix_unary_op (true);
+if (! (postfix_un_op || bin_op)
+	&& nesting_level.is_bracket ()
+	&& lexer_flags.convert_spaces_to_comma)
 {
-	int tmp = eat_continuation ();
+	if ((tmp & ATE_NEWLINE) == ATE_NEWLINE)
-	int bin_op = next_token_is_bin_op (true);
+	  {
-	int postfix_un_op = next_token_is_postfix_unary_op (true);
+	    maybe_warn_separator_insert (';');
-	if (! (postfix_un_op || bin_op)
+	    if (Vwhitespace_in_literal_matrix != 2)
-	    && nesting_level.is_bracket ()
+	      unput (';');
-	    && lexer_flags.convert_spaces_to_comma)
+	  }
+	if (Vwhitespace_in_literal_matrix != 2)
 	  {
 	    lexer_flags.quote_is_transpose = false;
 	    lexer_flags.cant_be_identifier = false;
 	    lexer_flags.convert_spaces_to_comma = true;
-	    if ((tmp & ATE_NEWLINE) == ATE_NEWLINE)
-	      unput (';');
+	    maybe_warn_separator_insert (',');
 	    return (',');
 	  }
 }
 }
 <MATRIX>{S}*{COMMENT}{SNLCMT}* |
 <MATRIX>{S}*{NL}{SNLCMT}* {
 fixup_column_count (yytext);
 eat_whitespace ();
 if (Vwhitespace_in_literal_matrix != 2)
 {
 	lexer_flags.quote_is_transpose = false;
 	lexer_flags.cant_be_identifier = false;
 	lexer_flags.convert_spaces_to_comma = true;
 	if (nesting_level.none ())
 	  return LEXICAL_ERROR;
+}
-	if (nesting_level.is_bracket ())
+if (nesting_level.is_bracket ())
+{
+	maybe_warn_separator_insert (';');
+	if (Vwhitespace_in_literal_matrix != 2)
 	  return ';';
 }
 }
 %{
 else
 {
 int c1 = yyinput ();
 unput (c1);
-if (lexer_flags.bracketflag && Vwhitespace_in_literal_matrix != 2)
+if (lexer_flags.bracketflag)
 	{
 	  int bin_op = next_token_is_bin_op (spc_gobbled);
 	  int postfix_un_op = next_token_is_postfix_unary_op (spc_gobbled);
 	  if (! (postfix_un_op || bin_op || sep_op)
 	      && nesting_level.is_bracket ()
 	      && lexer_flags.convert_spaces_to_comma)
 	    {
-	      unput (',');
+	      maybe_warn_separator_insert (',');
-	      return ']';
+	      if (Vwhitespace_in_literal_matrix != 2)
+		{
+		  unput (',');
+		  return ']';
+		}
 	    }
 	}
 }
 lexer_flags.quote_is_transpose = true;
 }
 static void
 maybe_unput_comma (int spc_gobbled)
 {
-if (Vwhitespace_in_literal_matrix != 2 && nesting_level.is_bracket ())
+if (nesting_level.is_bracket ())
 {
 int bin_op = next_token_is_bin_op (spc_gobbled);
 int postfix_un_op = next_token_is_postfix_unary_op (spc_gobbled);
 int sep_op = next_token_is_sep_op ();
 int dot_op = (c1 == '.'
 		    && (isalpha (c2) || isspace (c2) || c2 == '_'));
-int index_op = (c1 == '('
+if (postfix_un_op || bin_op || sep_op || dot_op)
-		      && (Vwhitespace_in_literal_matrix == 0
+	return;
-			  || ! spc_gobbled));
+int index_op = (c1 == '(');
-if (! (postfix_un_op || bin_op || sep_op || dot_op || index_op))
-	unput (',');
+if (index_op)
+	{
+	  // If there is no space before the '(', we don't insert a comma.
+	  if (! spc_gobbled)
+	    return;
+	  maybe_warn_separator_insert (',');
+	  // If there is a space, we only insert a comma if we are
+	  // trying to be Matlab-like.
+	  if (Vwhitespace_in_literal_matrix == 1)
+	    unput (',');
+	}
+else
+	{
+	  maybe_warn_separator_insert (',');
+	  if (Vwhitespace_in_literal_matrix != 2)
+	    unput (',');
+	}
 }
 }
 // Figure out exactly what kind of token to return when we have seen
 // an identifier.  Handles keywords.
 // Quote marks strings intially.
 quote_is_transpose = false;
 }
+static void
+maybe_warn_separator_insert (char sep)
+{
+string nm = curr_fcn_file_full_name;
+if (Vwarn_separator_insert)
+{
+if (nm.empty ())
+	warning ("potential auto-insertion of `%c' near line %d",
+		 sep, input_line_number);
+else
+	warning ("potential auto-insertion of `%c' near line %d of file %s",
+		 sep, input_line_number, nm.c_str ());
+}
+}
+static int
+warn_separator_insert (void)
+{
+Vwarn_separator_insert = check_preference ("warn_separator_insert");
+return 0;
+}
 static int
 whitespace_in_literal_matrix (void)
 {
 int pref = 0;
 }
 void
 symbols_of_lex (void)
 {
+DEFVAR (warn_separator_insert, 0.0, warn_separator_insert,
+"print warning if commas or semicolons that might be inserted\n\
+automatically in literal matrices");
 DEFVAR (whitespace_in_literal_matrix, "", whitespace_in_literal_matrix,
 "control auto-insertion of commas and semicolons in literal matrices");
 }
 /*

Mercurial > octave-dspies

comparison src/lex.l @ 3388:42cb61dd0248