Mercurial > hg > octave-nkf

changeset 341:4115f7713851

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1994-02-07 07:59:44 by jwe]
author jwe
date Mon, 07 Feb 1994 08:00:18 +0000
parents 57cdcf21c1df
children 073585d1d4fa
files src/lex.l src/parse.y src/utils.cc
diffstat 3 files changed, 7 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/lex.l
+++ b/src/lex.l
@@ -1022,9 +1022,8 @@
 
 	  if ((reading_fcn_file || reading_script_file)
 	      && curr_fcn_file_name != (char *) NULL)
-	    error ("defining new function near line %d of file `%s'",
-		   input_line_number,
-		   curr_fcn_file_name);
+	    error ("defining new function near line %d of file `%s.m'",
+		   input_line_number, curr_fcn_file_name);
 	  else
 	    error ("defining new function near line %d", input_line_number);
 
@@ -1499,7 +1498,7 @@
 	  else
 	    {
 	      warning ("ignoring trailing garbage after end of function\n\
-         near line %d of file `%s'", lineno, curr_fcn_file_name);
+         near line %d of file `%s.m'", lineno, curr_fcn_file_name);
 	      
 	      yyunput ('\n', yytext);
 	      return;
--- a/src/parse.y
+++ b/src/parse.y
@@ -907,7 +907,7 @@
 			if (strcmp (curr_fcn_file_name, id_name) != 0)
 			  {
 			    warning ("function name `%s' does not agree\
- with function file name `%s'", id_name, curr_fcn_file_name);
+ with function file name `%s.m'", id_name, curr_fcn_file_name);
 
 			    $1->rename (curr_fcn_file_name);
 			    id_name = $1->name ();
@@ -923,7 +923,7 @@
 			     && strcmp (curr_fcn_file_name, id_name) == 0)
 		      {
 			warning ("function `%s' defined within\
- script file `%s'", id_name, curr_fcn_file_name);
+ script file `%s.m'", id_name, curr_fcn_file_name);
 		      }
 
 		    top_level_sym_tab->clear (id_name);
@@ -1118,7 +1118,7 @@
 
 // Maybe print the line number and file name.
   if (reading_fcn_file || reading_script_file)
-    fprintf (stderr, " near line %d of file %s", input_line_number,
+    fprintf (stderr, " near line %d of file %s.m", input_line_number,
 	     curr_fcn_file_name);
 
   if (line != (char *) NULL)
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -598,8 +598,7 @@
 char *
 fcn_file_in_path (const char *name)
 {
-  char *fcn_file = file_in_path (name, (char *) NULL);
-  return (fcn_file) ? fcn_file : file_in_path (name, ".m");
+  return file_in_path (name, ".m");
 }
 
 /*