octave-nkf: src/lex.l comparison

comparison src/lex.l @ 4608:22ca4cc02525

[project @ 2003-11-14 03:55:04 by jwe]

author	jwe
date	Fri, 14 Nov 2003 03:55:04 +0000
parents	b7360f8eb035
children	d44675070f1a

comparison

equal deleted inserted replaced

-:eb84ffc19e44
+:22ca4cc02525
 void paren (void) {  context.push (PAREN); }
 bool is_paren (void)
 { return ! context.empty () && context.top () == PAREN; }
+bool is_bracket_or_brace (void)
+{ return (! context.empty ()
+	      && (context.top () == BRACKET || context.top () == BRACE)); }
 bool none (void) { return context.empty (); }
 void remove (void) { if (! context.empty ()) context.pop (); }
 void clear (void) { while (! context.empty ()) context.pop (); }
 static bool next_token_is_bin_op (bool spc_prev);
 static bool next_token_is_postfix_unary_op (bool spc_prev);
 static std::string strip_trailing_whitespace (char *s);
 static void handle_number (void);
 static int handle_string (char delim, int text_style = 0);
-static int handle_close_bracket (int spc_gobbled);
+static char handle_close_bracket (bool spc_gobbled, char bracket_type);
 static int handle_identifier (void);
 static bool have_continuation (bool trailing_comments_ok = true);
 static bool have_ellipsis_continuation (bool trailing_comments_ok = true);
 static void scan_for_comments (const char *);
 static yum_yum eat_whitespace (void);
 <MATRIX_START>{SNLCMT}*\]{S}* {
 scan_for_comments (yytext);
 fixup_column_count (yytext);
 int c = yytext[yyleng-1];
 int cont_is_spc = eat_continuation ();
-int spc_gobbled = (cont_is_spc || c == ' ' || c == '\t');
+bool spc_gobbled = (cont_is_spc || c == ' ' || c == '\t');
-return handle_close_bracket (spc_gobbled);
+return handle_close_bracket (spc_gobbled, ']');
+}
+<MATRIX_START>{SNLCMT}*\}{S}* {
+scan_for_comments (yytext);
+fixup_column_count (yytext);
+int c = yytext[yyleng-1];
+int cont_is_spc = eat_continuation ();
+bool spc_gobbled = (cont_is_spc || c == ' ' || c == '\t');
+return handle_close_bracket (spc_gobbled, '}');
 }
 %{
 // Commas are element separators in matrix constants.  If we don't
 // check for continuations here we can end up inserting too many
 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 ()
+	&& nesting_level.is_bracket_or_brace ()
 	&& lexer_flags.convert_spaces_to_comma)
 {
 	if ((tmp & ATE_NEWLINE) == ATE_NEWLINE)
 	  {
 	    maybe_warn_separator_insert (';');
 lexer_flags.convert_spaces_to_comma = true;
 if (nesting_level.none ())
 return LEXICAL_ERROR;
-if (nesting_level.is_bracket ())
+if (nesting_level.is_bracket_or_brace ())
 {
 	maybe_warn_separator_insert (';');
 	return ';';
 }
 if (nesting_level.none ())
 return '\n';
 else if (nesting_level.is_paren ())
 gripe_matlab_incompatible ("bare newline inside parentheses");
-else if (nesting_level.is_bracket ())
+else if (nesting_level.is_bracket_or_brace ())
 return LEXICAL_ERROR;
 }
 %{
 // Single quote can either be the beginning of a string or a transpose
 if (YY_START == COMMAND_START)
 BEGIN (INITIAL);
 if (nesting_level.none ())
 return '\n';
-else if (nesting_level.is_bracket ())
+else if (nesting_level.is_bracket_or_brace ())
 return ';';
 }
 %{
 // Other operators.
 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 ();
+lexer_flags.convert_spaces_to_comma = nesting_level.is_bracket_or_brace ();
 do_comma_insert_check ();
 return ')';
 }
 "." {
 "&="	{ XBIN_OP_RETURN (AND_EQ, false); }
 "|="	{ XBIN_OP_RETURN (OR_EQ, false); }
 "<<="	{ XBIN_OP_RETURN (LSHIFT_EQ, false); }
 ">>="	{ XBIN_OP_RETURN (RSHIFT_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--;
-TOK_RETURN ('{');
+eat_whitespace ();
+lexer_flags.bracketflag++;
+BEGIN (MATRIX_START);
+return '{';
 }
 "}" {
 nesting_level.remove ();
-current_input_column++;
+TOK_RETURN ('}');
-lexer_flags.cant_be_identifier = true;
-lexer_flags.quote_is_transpose = true;
-lexer_flags.convert_spaces_to_comma = nesting_level.is_bracket ();
-do_comma_insert_check (); // Is this really necessary?
-return '}';
 }
 %{
 // Unrecognized input is a lexical error.
 %}
 yyunput (c0, yytext);
 return retval;
 }
-static int
+static char
-handle_close_bracket (int spc_gobbled)
+handle_close_bracket (bool spc_gobbled, char bracket_type)
 {
-int retval = ']';
+char retval = bracket_type;
 if (! nesting_level.none ())
 {
 nesting_level.remove ();
 lexer_flags.bracketflag--;
 }
 if (lexer_flags.bracketflag == 0)
 BEGIN (INITIAL);
-if (next_token_is_assign_op () && ! lexer_flags.looking_at_return_list)
+if (bracket_type == ']'
+&& next_token_is_assign_op ()
+&& ! lexer_flags.looking_at_return_list)
 {
 retval = CLOSE_BRACE;
 }
 else
 {
 	  int postfix_un_op = next_token_is_postfix_unary_op (spc_gobbled);
 	  int sep_op = next_token_is_sep_op ();
 	  if (! (postfix_un_op || bin_op || sep_op)
-	      && nesting_level.is_bracket ()
+	      && nesting_level.is_bracket_or_brace ()
 	      && lexer_flags.convert_spaces_to_comma)
 	    {
 	      maybe_warn_separator_insert (',');
 	      yyunput (',', yytext);
-	      return ']';
+	      return retval;
 	    }
 	}
 }
 lexer_flags.quote_is_transpose = true;
 }
 static void
 maybe_unput_comma (int spc_gobbled)
 {
-if (nesting_level.is_bracket ())
+if (nesting_level.is_bracket_or_brace ())
 {
 int bin_op = next_token_is_bin_op (spc_gobbled);
 int postfix_un_op = next_token_is_postfix_unary_op (spc_gobbled);

Mercurial > hg > octave-nkf

comparison src/lex.l @ 4608:22ca4cc02525