octave-nkf: src/lex.l comparison

comparison src/lex.l @ 5102:b04b30d30c66

[project @ 2004-12-28 01:59:05 by jwe]

author	jwe
date	Tue, 28 Dec 2004 01:59:05 +0000
parents	7830f271a53f
children	04d810c3eb51

comparison

equal deleted inserted replaced

-:9b1af8135ecd
+:b04b30d30c66
 #define TOK_RETURN(tok) \
 do \
 { \
 current_input_column += yyleng; \
 lexer_flags.quote_is_transpose = false; \
-lexer_flags.cant_be_identifier = false; \
 lexer_flags.convert_spaces_to_comma = true; \
 COUNT_TOK_AND_RETURN (tok); \
 } \
 while (0)
 { \
 yylval.tok_val = new token (input_line_number, current_input_column); \
 token_stack.push (yylval.tok_val); \
 current_input_column += yyleng; \
 lexer_flags.quote_is_transpose = false; \
-lexer_flags.cant_be_identifier = true; \
 lexer_flags.convert_spaces_to_comma = convert; \
 COUNT_TOK_AND_RETURN (tok); \
 } \
 while (0)
 // Forward declarations for functions defined at the bottom of this
 // file.
 static void fixup_column_count (char *s);
 static void do_comma_insert_check (void);
-static int is_plot_keyword (const std::string& s);
 static int is_keyword_token (const std::string& s);
 static void prep_for_function (void);
 static void prep_for_nested_function (void);
-static std::string plot_style_token (const std::string& s);
 static symbol_record *lookup_identifier (const std::string& s);
 static std::string grab_help_text (void);
 static bool match_any (char c, const char *s);
 static bool next_token_is_sep_op (void);
 static bool next_token_is_bin_op (bool spc_prev);
 <COMMAND_START>{NL} {
 BEGIN (INITIAL);
 current_input_column = 1;
 lexer_flags.quote_is_transpose = false;
-lexer_flags.cant_be_identifier = false;
 lexer_flags.convert_spaces_to_comma = true;
 COUNT_TOK_AND_RETURN ('\n');
 }
 <COMMAND_START>[\;\,] {
-if (lexer_flags.doing_set && strcmp (yytext, ",") == 0)
+if (lexer_flags.doing_rawcommand)
-{
+TOK_PUSH_AND_RETURN (yytext, STRING);
-	TOK_PUSH_AND_RETURN (yytext, STRING);
-}
+BEGIN (INITIAL);
+if (strcmp (yytext, ",") == 0)
+TOK_RETURN (',');
 else
-{
+TOK_RETURN (';');
-	BEGIN (INITIAL);
-	if (strcmp (yytext, ",") == 0)
-	  TOK_RETURN (',');
-	else
-	  TOK_RETURN (';');
-}
 }
 <COMMAND_START>[\"\'] {
 current_input_column++;
 COUNT_TOK_AND_RETURN (handle_string (yytext[0], true));
 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 ((tmp & ATE_NEWLINE) == ATE_NEWLINE)
 {
 	maybe_warn_separator_insert (';');
 	    yyunput (';', yytext);
 	  }
 	lexer_flags.quote_is_transpose = false;
-	lexer_flags.cant_be_identifier = false;
 	lexer_flags.convert_spaces_to_comma = true;
 	maybe_warn_separator_insert (',');
 	COUNT_TOK_AND_RETURN (',');
 <MATRIX_START>{SNLCMT}*;{SNLCMT}* {
 scan_for_comments (yytext);
 fixup_column_count (yytext);
 eat_whitespace ();
 lexer_flags.quote_is_transpose = false;
-lexer_flags.cant_be_identifier = false;
 lexer_flags.convert_spaces_to_comma = true;
 COUNT_TOK_AND_RETURN (';');
 }
 %{
 scan_for_comments (yytext);
 fixup_column_count (yytext);
 eat_whitespace ();
 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;
 	COUNT_TOK_AND_RETURN (';');
 }
 }
-%{
-// Open and close bracket are handled differently if we are in the range
-// part of a plot command.
-//
-%}
 \[{S}* {
 nesting_level.bracket ();
 current_input_column += yyleng;
 lexer_flags.quote_is_transpose = false;
-lexer_flags.cant_be_identifier = false;
 lexer_flags.convert_spaces_to_comma = true;
 promptflag--;
 eat_whitespace ();
-if (lexer_flags.plotting && ! lexer_flags.past_plot_range)
+lexer_flags.bracketflag++;
-{
+BEGIN (MATRIX_START);
-	lexer_flags.in_plot_range = true;
+COUNT_TOK_AND_RETURN ('[');
-	COUNT_TOK_AND_RETURN (OPEN_BRACE);
-}
-else
-{
-	lexer_flags.bracketflag++;
-	BEGIN (MATRIX_START);
-	COUNT_TOK_AND_RETURN ('[');
-}
 }
 \] {
 nesting_level.remove ();
-if (lexer_flags.plotting && ! lexer_flags.past_plot_range)
+TOK_RETURN (']');
-{
-	lexer_flags.in_plot_range = false;
-	TOK_RETURN (CLOSE_BRACE);
-}
-else
-TOK_RETURN (']');
 }
 %{
 // Imaginary numbers.
 %}
 %}
 "@" {
 current_input_column++;
 lexer_flags.quote_is_transpose = false;
-lexer_flags.cant_be_identifier = false;
 lexer_flags.convert_spaces_to_comma = false;
 lexer_flags.looking_at_function_handle++;
 COUNT_TOK_AND_RETURN ('@');
 }
 %}
 {NL} {
 current_input_column = 1;
 lexer_flags.quote_is_transpose = false;
-lexer_flags.cant_be_identifier = false;
 lexer_flags.convert_spaces_to_comma = true;
 if (nesting_level.none ())
 COUNT_TOK_AND_RETURN ('\n');
 else if (nesting_level.is_paren ())
 \" {
 current_input_column++;
 COUNT_TOK_AND_RETURN (handle_string ('"'));
 }
-%{
-// The colon operator is handled differently if we are in the range
-// part of a plot command.
-%}
-":" {
-if (lexer_flags.plotting
-	&& (lexer_flags.in_plot_range || lexer_flags.in_plot_using))
-BIN_OP_RETURN (COLON, true);
-else
-BIN_OP_RETURN (':', false);
-}
 %{
 // Gobble comments.  If closest nesting is inside parentheses, don't
 // return a new line.
 %}
 	octave_comment_buffer::append (buf);
 }
 current_input_column = 1;
 lexer_flags.quote_is_transpose = false;
-lexer_flags.cant_be_identifier = false;
 lexer_flags.convert_spaces_to_comma = true;
 maybe_gripe_matlab_incompatible_comment (yytext[0]);
 if (YY_START == COMMAND_START)
 }
 %{
 // Other operators.
 %}
+":"     { BIN_OP_RETURN (':', false); }
 ".+"	{ XBIN_OP_RETURN (EPLUS, false); }
 ".-"	{ XBIN_OP_RETURN (EMINUS, false); }
 ".*"	{ BIN_OP_RETURN (EMUL, false); }
 "./"	{ BIN_OP_RETURN (EDIV, false); }
 ">="	{ BIN_OP_RETURN (EXPR_GE, false); }
 "&"	{ BIN_OP_RETURN (EXPR_AND, false); }
 "|"	{ BIN_OP_RETURN (EXPR_OR, false); }
 "<"	{ BIN_OP_RETURN (EXPR_LT, false); }
 ">"	{ BIN_OP_RETURN (EXPR_GT, false); }
+"+"     { BIN_OP_RETURN ('+', false); }
+"-"     { BIN_OP_RETURN ('-', false); }
 "*"	{ BIN_OP_RETURN ('*', false); }
 "/"	{ BIN_OP_RETURN ('/', false); }
 "\\"	{ BIN_OP_RETURN (LEFTDIV, false); }
 ";"	{ BIN_OP_RETURN (';', true); }
 ","	{ BIN_OP_RETURN (',', true); }
 "||"	{ BIN_OP_RETURN (EXPR_OR_OR, false); }
 "<<"	{ XBIN_OP_RETURN (LSHIFT, false); }
 ">>"	{ XBIN_OP_RETURN (RSHIFT, false); }
 {NOT} {
-if (lexer_flags.plotting && ! lexer_flags.in_plot_range)
-lexer_flags.past_plot_range = true;
 if (yytext[0] == '~')
 BIN_OP_RETURN (EXPR_NOT, false);
 else
 XBIN_OP_RETURN (EXPR_NOT, false);
 }
-"+" {
-if (lexer_flags.plotting && ! lexer_flags.in_plot_range)
-lexer_flags.past_plot_range = true;
-BIN_OP_RETURN ('+', false);
-}
-"-" {
-if (lexer_flags.plotting && ! lexer_flags.in_plot_range)
-lexer_flags.past_plot_range = true;
-BIN_OP_RETURN ('-', false);
-}
 "(" {
 lexer_flags.looking_at_indirect_ref = false;
-if (lexer_flags.plotting && ! lexer_flags.in_plot_range)
-lexer_flags.past_plot_range = true;
 nesting_level.paren ();
 promptflag--;
 TOK_RETURN ('(');
 }
 ")" {
 nesting_level.remove ();
 current_input_column++;
-lexer_flags.cant_be_identifier = true;
 lexer_flags.quote_is_transpose = true;
 lexer_flags.convert_spaces_to_comma = nesting_level.is_bracket_or_brace ();
 do_comma_insert_check ();
 COUNT_TOK_AND_RETURN (')');
 }
-"." {
+"."     { TOK_RETURN ('.'); }
-TOK_RETURN ('.');
-}
 "+="	{ XBIN_OP_RETURN (ADD_EQ, false); }
 "-="	{ XBIN_OP_RETURN (SUB_EQ, false); }
 "*="	{ XBIN_OP_RETURN (MUL_EQ, false); }
 "/="	{ XBIN_OP_RETURN (DIV_EQ, false); }
 \{{S}* {
 nesting_level.brace ();
 current_input_column += yyleng;
 lexer_flags.quote_is_transpose = false;
-lexer_flags.cant_be_identifier = false;
 lexer_flags.convert_spaces_to_comma = true;
 promptflag--;
 eat_whitespace ();
 delete_input_buffer (void *buf)
 {
 delete_buffer (static_cast<YY_BUFFER_STATE> (buf));
 }
-// Check to see if a character string matches any of the possible line
-// styles for plots.
-static std::string
-plot_style_token (const std::string& s)
-{
-std::string retval;
-// XXX FIXME XXX -- specify minimum match length for these.
-static const char *plot_styles[] =
-{
-"boxes",
-"boxerrorbars",
-"boxxyerrorbars",
-"candlesticks",
-"dots",
-"errorbars",
-"financebars",
-"fsteps",
-"histeps",
-"impulses",
-"lines",
-"linespoints",
-"points",
-"steps",
-"vector",
-"xerrorbars",
-"xyerrorbars",
-"yerrorbars",
-0,
-};
-const char * const *tmp = plot_styles;
-while (*tmp)
-{
-if (almost_match (*tmp, s.c_str ()))
-	{
-	  retval = *tmp;
-	  break;
-	}
-tmp++;
-}
-return retval;
-}
-// Check to see if a character string matches any of the possible axes
-// tags for plots.
-static std::string
-plot_axes_token (const std::string& s)
-{
-std::string retval;
-// XXX FIXME XXX -- specify minimum match length for these.
-static const char *plot_axes[] =
-{
-"x1y1",
-"x1y2",
-"x2y1",
-"x2y2",
-0,
-};
-const char **tmp = plot_axes;
-while (*tmp)
-{
-if (almost_match (*tmp, s.c_str ()))
-	{
-	  retval = *tmp;
-	  break;
-	}
-tmp++;
-}
-return retval;
-}
-// Check to see if a character string matches any one of the plot
-// option keywords.  Don't match abbreviations for clear, since that's
-// not a gnuplot keyword (users will probably only expect to be able
-// to abbreviate actual gnuplot keywords).
-static int
-is_plot_keyword (const std::string& s)
-{
-const char *t = s.c_str ();
-if (almost_match ("title", t, 1))
-{
-return TITLE;
-}
-else if (almost_match ("using", t, 1))
-{
-lexer_flags.in_plot_using = true;
-return USING;
-}
-else if (almost_match ("with", t, 1))
-{
-lexer_flags.in_plot_style = true;
-return WITH;
-}
-else if (almost_match ("axes", t, 2) || almost_match ("axis", t, 2))
-{
-lexer_flags.in_plot_axes = true;
-return AXES;
-}
-else if (strcmp ("clear", t) == 0)
-{
-return CLEAR;
-}
-else
-{
-return 0;
-}
-}
 static void
 prep_for_function (void)
 {
 end_tokens_expected++;
 static int
 is_keyword_token (const std::string& s)
 {
 int l = input_line_number;
 int c = current_input_column;
-if (lexer_flags.plotting)
-{
-if (lexer_flags.in_plot_style)
-	{
-	  std::string sty = plot_style_token (s);
-	  if (! sty.empty ())
-	    {
-	      lexer_flags.in_plot_style = false;
-	      yylval.tok_val = new token (sty, l, c);
-	      token_stack.push (yylval.tok_val);
-	      return STYLE;
-	    }
-	}
-else if (lexer_flags.in_plot_axes)
-	{
-	  std::string axes = plot_axes_token (s);
-	  if (! axes.empty ())
-	    {
-	      lexer_flags.in_plot_axes = false;
-	      yylval.tok_val = new token (axes, l, c);
-	      token_stack.push (yylval.tok_val);
-	      return AXES_TAG;
-	    }
-	}
-}
 int len = s.length ();
 const octave_kw *kw = octave_kw_hash::in_word_set (s.c_str (), len);
 	case unwind_protect_kw:
 	  end_tokens_expected++;
 	  promptflag--;
 	  break;
-	case gplot_kw:
-	  lexer_flags.plotting = true;
-	  yylval.tok_val = new token (token::two_dee, l, c);
-	  break;
-	case gsplot_kw:
-	  lexer_flags.plotting = true;
-	  yylval.tok_val = new token (token::three_dee, l, c);
-	  break;
-	case replot_kw:
-	  lexer_flags.plotting = true;
-	  yylval.tok_val = new token (token::replot, l, c);
-	  break;
 	case function_kw:
 	  {
 	    if (lexer_flags.defining_func)
 	      {
 		if (reading_fcn_file)
 // If yytext doesn't contain a valid number, we are in deep doo doo.
 assert (nread == 1);
 lexer_flags.quote_is_transpose = true;
-lexer_flags.cant_be_identifier = true;
 lexer_flags.convert_spaces_to_comma = true;
-if (lexer_flags.plotting && ! lexer_flags.in_plot_range)
-lexer_flags.past_plot_range = true;
 yylval.tok_val = new token (value, yytext, input_line_number,
 			      current_input_column);
 token_stack.push (yylval.tok_val);
 	    buf << static_cast<char> (c);
 	  else
 	    {
 	      c = yyinput ();
 	      if (c == delim)
-		buf << static_cast<char> (c);
+		{
+		  buf << static_cast<char> (c);
+		  if (lexer_flags.doing_rawcommand)
+		    buf << static_cast<char> (c);
+		}
 	      else
 		{
+		  std::string s;
 		  yyunput (c, yytext);
 		  buf << OSSTREAM_ENDS;
-		  std::string s = do_string_escapes (OSSTREAM_STR (buf));
+		  if (lexer_flags.doing_rawcommand)
+		    s = OSSTREAM_STR (buf);
+		  else
+		    s = do_string_escapes (OSSTREAM_STR(buf));
 		  OSSTREAM_FREEZE (buf);
-		  if (text_style && lexer_flags.doing_set)
+		  if (text_style && lexer_flags.doing_rawcommand)
-		    {
+		    s = std::string (1, delim) + s + std::string (1, delim);
-		      s = std::string (1, delim) + s + std::string (1, delim);
-		    }
 		  else
 		    {
 		      lexer_flags.quote_is_transpose = true;
-		      lexer_flags.cant_be_identifier = true;
 		      lexer_flags.convert_spaces_to_comma = true;
 		    }
 		  yylval.tok_val = new token (s, bos_line, bos_col);
 		  token_stack.push (yylval.tok_val);
 	    }
 	}
 }
 lexer_flags.quote_is_transpose = true;
-lexer_flags.cant_be_identifier = false;
 lexer_flags.convert_spaces_to_comma = true;
 return retval;
 }
 int c = yytext[yyleng-1];
 int cont_is_spc = eat_continuation ();
 int spc_gobbled = (cont_is_spc || c == ' ' || c == '\t');
-// It is almost always an error for an identifier to be followed
-// directly by another identifier.  Special cases are handled
-// below.
-lexer_flags.cant_be_identifier = true;
 // If we are expecting a structure element, avoid recognizing
 // keywords and other special names and return STRUCT_ELT, which is
 // a string that is also a valid identifier.  But first, we have to
 // decide whether to insert a comma.
 yylval.tok_val = new token (tok, input_line_number,
 				  current_input_column);
 token_stack.push (yylval.tok_val);
-lexer_flags.cant_be_identifier = false;
 lexer_flags.quote_is_transpose = true;
 lexer_flags.convert_spaces_to_comma = true;
 current_input_column += yyleng;
 	}
 else
 	TOK_PUSH_AND_RETURN (tok, FCN_HANDLE);
 }
-// If we have a regular keyword, or a plot STYLE, return it.
+// If we have a regular keyword, return it.
 // Keywords can be followed by identifiers (TOK_RETURN handles
 // that).
 if (kw_token)
 {
 if (kw_token < 0)
 	return kw_token;
-else if (kw_token == STYLE)
-	{
-	  current_input_column += yyleng;
-	  lexer_flags.quote_is_transpose = false;
-	  lexer_flags.convert_spaces_to_comma = true;
-	  return kw_token;
-	}
 else
 	TOK_RETURN (kw_token);
 }
 // See if we have a plot keyword (title, using, with, or clear).
-if (lexer_flags.plotting)
-{
-// Yes, we really do need both of these plot_range variables.
-// One is used to mark when we are past all possiblity of a plot
-// range, the other is used to mark when we are actually between
-// the square brackets that surround the range.
-if (! lexer_flags.in_plot_range)
-	lexer_flags.past_plot_range = true;
-// Option keywords can't appear in brackets, braces, or parentheses.
-int plot_option_kw = 0;
-if (nesting_level.none ())
-	plot_option_kw = is_plot_keyword (tok);
-if (lexer_flags.cant_be_identifier && plot_option_kw)
-	TOK_RETURN (plot_option_kw);
-}
 int c1 = yyinput ();
 bool next_tok_is_paren = (c1 == '(');
 	{
 	  force_local_variable (tok);
 	}
 else if (! next_tok_is_paren)
 	{
-	  if (tok == "gset")
+	  BEGIN (COMMAND_START);
-	    lexer_flags.doing_set = true;
+	}
+if (is_rawcommand_name (tok))
+	{
+	  lexer_flags.doing_rawcommand = true;
 	  BEGIN (COMMAND_START);
 	}
 }
 // Find the token in the symbol table.  Beware the magic
 looking_at_matrix_or_assign_lhs = false;
 // Not parsing an object index.
 looking_at_object_index = 0;
-// Next token can be identifier.
-cant_be_identifier = false;
 // No need to do comma insert or convert spaces to comma at
 // beginning of input.
 convert_spaces_to_comma = true;
 do_comma_insert = false;
 // Not initially doing any plotting or setting of plot attributes.
-doing_set = false;
+doing_rawcommand = false;
-in_plot_range = false;
-in_plot_style = false;
-in_plot_axes = false;
-in_plot_using = false;
-past_plot_range = false;
-plotting = false;
 // Not initially looking at indirect references.
 looking_at_indirect_ref = false;
 // Quote marks strings intially.

Mercurial > octave-nkf

comparison src/lex.l @ 5102:b04b30d30c66