Mercurial > octave

changeset 1515:d361954e95ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1995-10-03 13:18:11 by jwe]
author jwe
date Tue, 03 Oct 1995 13:18:11 +0000
parents 9e861d5519bd
children 14d8c0a838c1
files src/parse.y
diffstat 1 files changed, 12 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/parse.y	Tue Oct 03 12:12:24 1995 +0000
+++ b/src/parse.y	Tue Oct 03 13:18:11 1995 +0000
@@ -332,15 +332,9 @@
 		| comma_semi
 		  { $$ = 0; }
 		| simple_list1
-		  {
-		    maybe_warn_missing_semi ($1);
-		    $$ = $1;
-		  }
+		  { $$ = $1; }
 		| simple_list1 comma_semi
-		  {
-		    maybe_warn_missing_semi ($1);
-		    $$ = $1;
-		  }
+		  { $$ = $1; }
 		| simple_list1 semi_comma
 		  {
 		    tree_statement *tmp = $1->rear ();
@@ -419,8 +413,8 @@
 		  }
 		| list1 comma_nl_sep statement
 		  {
+		    maybe_warn_missing_semi ($1);
 		    $1->append ($3);
-		    maybe_warn_missing_semi ($1);
 		    $$ = $1;
 		  }
 		| list1 semi_sep statement
@@ -1695,8 +1689,15 @@
     {
       tree_statement *tmp = t->rear();
       if (tmp->is_expression ())
+	{
+	  char *fname = input_from_command_line_file
+	    ? curr_fcn_file_name : fcn_file_in_path (curr_fcn_file_name);
 
-	warning ("missing semicolon near line %d, column %d in file `%s.m'",
-		 tmp->line (), tmp->column (), curr_fcn_file_name);
+	  warning ("missing semicolon near line %d, column %d in file `%s'",
+		   tmp->line (), tmp->column (), fname);
+
+	  if (fname != curr_fcn_file_name)
+	    delete [] fname;
+	}
     }
 }