changeset 11217:521373e25613

correctly parse {1 2 {3 4}}
author John W. Eaton <jwe@octave.org>
date Tue, 09 Nov 2010 18:12:17 -0500
parents 5036b0ff9597
children 0910020c5ab6
files src/ChangeLog src/lex.ll test/ChangeLog test/Makefile.am
diffstat 4 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Tue Nov 09 12:03:21 2010 -0800
+++ b/src/ChangeLog	Tue Nov 09 18:12:17 2010 -0500
@@ -1,3 +1,8 @@
+2010-11-09  John W. Eaton  <jwe@octave.org>
+
+	* lex.ll (handle_number): Set lexer_flags.looking_for_object_index
+	to false here.  Fixes bug #31608.
+
 2010-11-09  John W. Eaton  <jwe@octave.org>
 
 	* gl-render.cc (make_marker_list): Call fmod instead of mod.
--- a/src/lex.ll	Tue Nov 09 12:03:21 2010 -0800
+++ b/src/lex.ll	Tue Nov 09 18:12:17 2010 -0500
@@ -2361,7 +2361,7 @@
 
   lexer_flags.quote_is_transpose = true;
   lexer_flags.convert_spaces_to_comma = true;
-  lexer_flags.looking_for_object_index = true;
+  lexer_flags.looking_for_object_index = false;
   lexer_flags.at_beginning_of_statement = false;
 
   yylval.tok_val = new token (value, yytext, input_line_number,
--- a/test/ChangeLog	Tue Nov 09 12:03:21 2010 -0800
+++ b/test/ChangeLog	Tue Nov 09 18:12:17 2010 -0500
@@ -1,3 +1,8 @@
+2010-11-09  John W. Eaton  <jwe@octave.org>
+
+	* test_parser.m: New file.
+	* Makefile.am (FCN_FILES): Add it to the list.
+
 2010-09-29  Rik  <octave@nomad.inbox5.com>
 
 	* fntests.m: Break output text differently for better readability.
--- a/test/Makefile.am	Tue Nov 09 12:03:21 2010 -0800
+++ b/test/Makefile.am	Tue Nov 09 18:12:17 2010 -0500
@@ -39,6 +39,7 @@
   test_logical-wfi-f.m \
   test_logical-wfi-t.m \
   test_null_assign.m \
+  test_parser.m \
   test_prefer.m \
   test_range.m \
   test_recursion.m \