octave-nkf: src/lex.l comparison

comparison src/lex.l @ 2877:5c1b9e545dd1

[project @ 1997-04-24 09:07:39 by jwe]

author	jwe
date	Thu, 24 Apr 1997 09:10:13 +0000
parents	6dcb8e1c9bb2
children	1a30f46e1870

comparison

equal deleted inserted replaced

-:b4a9f014a8ea
+:5c1b9e545dd1
 "--"	{ do_comma_insert_check (); BIN_OP_RETURN (MINUS_MINUS, true); }
 "<="	{ BIN_OP_RETURN (EXPR_LE, false); }
 "=="	{ BIN_OP_RETURN (EXPR_EQ, false); }
 {NOTEQ}	{ BIN_OP_RETURN (EXPR_NE, false); }
 ">="	{ BIN_OP_RETURN (EXPR_GE, false); }
+"&"	{ BIN_OP_RETURN (EXPR_AND, false); }
 "|"	{ BIN_OP_RETURN (EXPR_OR, false); }
-"&"	{ BIN_OP_RETURN (EXPR_AND, false); }
 "<"	{ BIN_OP_RETURN (EXPR_LT, false); }
 ">"	{ BIN_OP_RETURN (EXPR_GT, false); }
 "*"	{ BIN_OP_RETURN ('*', false); }
 "/"	{ BIN_OP_RETURN ('/', false); }
 "\\"	{ BIN_OP_RETURN (LEFTDIV, false); }
 ";"	{ BIN_OP_RETURN (';', true); }
 ","	{ BIN_OP_RETURN (',', true); }
 {POW}	{ BIN_OP_RETURN (POW, false); }
 "="	{ BIN_OP_RETURN ('=', true); }
+"&&"	{ BIN_OP_RETURN (EXPR_AND_AND, false); }
 "||"	{ BIN_OP_RETURN (EXPR_OR_OR, false); }
-"&&"	{ BIN_OP_RETURN (EXPR_AND_AND, false); }
 {NOT} {
 if (lexer_flags.plotting && ! lexer_flags.in_plot_range)
 lexer_flags.past_plot_range = true;
 BIN_OP_RETURN (EXPR_NOT, false);
 }
 "." {
 TOK_RETURN ('.');
 }
+"+="	{ BIN_OP_RETURN (ADD_EQ, false); }
+"-="	{ BIN_OP_RETURN (SUB_EQ, false); }
+"*="	{ BIN_OP_RETURN (MUL_EQ, false); }
+"/="	{ BIN_OP_RETURN (DIV_EQ, false); }
+".+="	{ BIN_OP_RETURN (ADD_EQ, false); }
+".-="	{ BIN_OP_RETURN (SUB_EQ, false); }
+".*="	{ BIN_OP_RETURN (EMUL_EQ, false); }
+"./="	{ BIN_OP_RETURN (EDIV_EQ, false); }
+"&="	{ BIN_OP_RETURN (AND_EQ, false); }
+"|="	{ BIN_OP_RETURN (OR_EQ, false); }
 %{
 // Unrecognized input is a lexical error.
 %}
 {
 return 0;
 }
 }
-// Handle keywords.  Could probably be more efficient...
+// Handle keywords.
 static int
 is_keyword (const string& s)
 {
 if (lexer_flags.plotting && lexer_flags.in_plot_style)
 	      return LEXICAL_ERROR;
 	    }
 	  else
 	    {
+	      // Prepare for local symbols.
 	      tmp_local_sym_tab = new symbol_table ();
-	      curr_sym_tab = tmp_local_sym_tab;
+	      promptflag--;
 	      lexer_flags.defining_func = true;
-	      promptflag--;
+	      lexer_flags.parsed_function_name = false;
 	      lexer_flags.beginning_of_function = true;
 	      if (! (reading_fcn_file || reading_script_file))
 		input_line_number = 1;
 	    }
 	  break;
 bool next_tok_is_paren = (c == '(');
 // Make sure we put the return values of a function in the symbol
 // table that is local to the function.
+// If we are defining a function and we have not seen the function
+// name yet and the next token is `=', then this identifier must be
+// the only return value for the function and it belongs in the
+// local symbol table.
 if (next_tok_is_eq
-&& lexer_flags.defining_func && lexer_flags.maybe_screwed)
+&& lexer_flags.defining_func
+&& ! lexer_flags.parsed_function_name)
 curr_sym_tab = tmp_local_sym_tab;
 // Kluge alert.
 //
 // If we are looking at a text style function, set up to gobble its
 // After seeing an identifer, it is ok to convert spaces to a comma
 // (if needed).
 lexer_flags.convert_spaces_to_comma = true;
-// If we are defining a function and we have not seen the parameter
+if (! next_tok_is_eq)
-// list yet and the next token is `=', return a token that
+{
-// represents the only return value for the function.  For example,
+lexer_flags.quote_is_transpose = true;
-//
-//   function SCREW = f (args);
+do_comma_insert_check ();
-//
-// The variable maybe_screwed is reset in parse.y.
+maybe_unput_comma (spc_gobbled);
+}
-if (next_tok_is_eq)
-{
-current_input_column += yyleng;
-if (lexer_flags.defining_func && lexer_flags.maybe_screwed)
-	return SCREW;
-else
-	return NAME;
-}
-// At this point, we are only dealing with identifiers that are not
-// followed by `=' (if the next token is `=', there is no need to
-// check to see if we should insert a comma (invalid syntax), or
-// allow a following `'' to be treated as a transpose (the next
-// token is `=', so it can't be `''.
-lexer_flags.quote_is_transpose = true;
-do_comma_insert_check ();
-maybe_unput_comma (spc_gobbled);
 current_input_column += yyleng;
 return NAME;
 }
 // Print a warning if a function file that defines a function has
 // anything other than comments and whitespace following the END token
 looping = 0;
 // Not initially defining a function.
 beginning_of_function = false;
 defining_func = false;
+parsed_function_name = false;
 // Not parsing a function return or parameter list.
 looking_at_return_list = false;
 looking_at_parameter_list = false;
 // Not initially looking at indirect references.
 looking_at_indirect_ref = false;
 // Not initially screwed by `function [...] = f (...)' syntax.
-maybe_screwed = false;
 maybe_screwed_again = 0;
 // Quote marks strings intially.
 quote_is_transpose = false;
 }
 symbols_of_lex (void)
 {
 DEFVAR (whitespace_in_literal_matrix, "", 0, whitespace_in_literal_matrix,
 "control auto-insertion of commas and semicolons in literal matrices");
 }
-// Maybe someday...
-//
-// "+="		return ADD_EQ;
-// "-="		return SUB_EQ;
-// "*="		return MUL_EQ;
-// "/="		return DIV_EQ;
-// "\\="	return LEFTDIV_EQ;
-// ".+="	return ADD_EQ;
-// ".-="	return SUB_EQ;
-// ".*="	return EMUL_EQ;
-// "./="	return EDIV_EQ;
-// ".\\="	return ELEFTDIV_EQ;
 /*
 ;;; Local Variables: ***
 ;;; mode: C++ ***
 ;;; End: ***

Mercurial > octave-nkf

comparison src/lex.l @ 2877:5c1b9e545dd1