Mercurial > octave-nkf

changeset 8448:d6c0d5f208de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
parse.y: avoid storing null statements in statement lists
author John W. Eaton <jwe@octave.org>
date Fri, 09 Jan 2009 06:52:45 -0500
parents adab48231a03
children 448188853722
files src/ChangeLog src/parse.y
diffstat 2 files changed, 58 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Fri Jan 09 06:11:54 2009 -0500
+++ b/src/ChangeLog	Fri Jan 09 06:52:45 2009 -0500
@@ -19,6 +19,11 @@
 	(eval_string): Unwind-protect input_line_number and
 	current_input_column.
 
+	* parse.y (make_statement): New function.
+	(statement): Use it.
+	(make_statement_list, append_statement_list): New functions.
+	(simple_list1, list1): Use them.
+
 2009-01-08  Jaroslav Hajek  <highegg@gmail.com>
 
 	* ov-cell.cc (octave_cell::subsasgn): Erase duplicate lhs value 
--- a/src/parse.y	Fri Jan 09 06:11:54 2009 -0500
+++ b/src/parse.y	Fri Jan 09 06:52:45 2009 -0500
@@ -314,6 +314,31 @@
 static void
 set_stmt_print_flag (tree_statement_list *, char, bool);
 
+// Create a statement list.
+static tree_statement_list *make_statement_list (tree_statement *stmt);
+
+// Append a statement to an existing statement list.
+static tree_statement_list *
+append_statement_list (tree_statement_list *list, char sep,
+		       tree_statement *stmt, bool warn_missing_semi);
+
+// Finish building a statement.
+template <class T>
+static tree_statement *
+make_statement (T *arg)
+{
+  tree_statement *retval = 0;
+
+  if (arg)
+    {
+      octave_comment_list *comment = octave_comment_buffer::get_comment ();
+
+      retval = new tree_statement (arg, comment);
+    }
+
+  return retval;
+}
+
 #define ABORT_PARSE \
   do \
     { \
@@ -503,13 +528,9 @@
 		;
 
 simple_list1	: statement
-		  { $$ = new tree_statement_list ($1); }
+		  { $$ = make_statement_list ($1); }
 		| simple_list1 sep_no_nl statement
-		  {
-		    set_stmt_print_flag ($1, $2, false);
-		    $1->append ($3);
-		    $$ = $1;
-		  }
+		  { $$ = append_statement_list ($1, $2, $3, false); }
 		;
 
 opt_list	: // empty
@@ -526,29 +547,15 @@
 		;
 
 list1		: statement
-		  { $$ = new tree_statement_list ($1); }
+		  { $$ = make_statement_list ($1); }
 		| list1 sep statement
-		  {
-		    set_stmt_print_flag ($1, $2, true);
-		    $1->append ($3);
-		    $$ = $1;
-		  }
+		  { $$ = append_statement_list ($1, $2, $3, true); }
 		;
 
 statement	: expression
-		  {
-		    octave_comment_list *comment
-		      = octave_comment_buffer::get_comment ();
-
-		    $$ = new tree_statement ($1, comment);
-		  }
+		  { $$ = make_statement ($1); }
 		| command
-		  {
-		    octave_comment_list *comment
-		      = octave_comment_buffer::get_comment ();
-
-		    $$ = new tree_statement ($1, comment);
-		  }
+		  { $$ = make_statement ($1); }
 		;
 
 // ===========
@@ -2853,6 +2860,28 @@
     }
 }
 
+static tree_statement_list *
+make_statement_list (tree_statement *stmt)
+{
+  return stmt ? new tree_statement_list (stmt) : new tree_statement_list ();
+}
+
+static tree_statement_list *
+append_statement_list (tree_statement_list *list, char sep,
+		       tree_statement *stmt, bool warn_missing_semi)
+{
+  tree_statement_list *retval = list;
+
+  if (stmt)
+    {
+      set_stmt_print_flag (list, sep, warn_missing_semi);
+
+      list->append (stmt);
+    }
+
+  return retval;
+}
+
 static void
 safe_fclose (void *f)
 {