Merge branch 'mh/syntax-error-lines' of https://github.com/fingolfin/gap

into fingolfin-mh/syntax-error-lines
gap-system · Feb 18, 2016 · 804fb7a · 804fb7a
2 parents f8368cc + 17ca2a9
commit 804fb7a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/lib/test.gi b/lib/test.gi
@@ -329,20 +329,25 @@ InstallGlobalFunction("Test", function(arg)
              if d[1] <> '-' then
                d := Concatenation("+", d);
              fi;
-             Print("########> Time diff in ",
-                   fnam,", line ",line,":\n");
+             Print("########> Time diff in ");
+             if IsStream(fnam) then
+               Print("test stream, line ",line,"\n");
+             else
+               Print(fnam,":",line,"\n");
+             fi;
              Print("# Input:\n", inp);
              Print("# Old time: ", oldt,"   New time: ", newt,
              "    (", d, "%)\n");
            end,
            rewriteToFile := false,
            breakOnError := false,
            reportDiff := function(inp, expout, found, fnam, line, time)
+             Print("########> Diff in ");
              if IsStream(fnam) then
-               fnam := "test stream";
+               Print("test stream, line ",line,"\n");
+             else
+               Print(fnam,":",line,"\n");
              fi;
-             Print("########> Diff in ",
-                   fnam,", line ",line,":\n");
              Print("# Input is:\n", inp);
              Print("# Expected output:\n", expout);
              Print("# But found:\n", found);

diff --git a/src/scanner.c b/src/scanner.c
@@ -147,7 +147,7 @@ void            SyntaxError (
         /* print the message and the filename, unless it is '*stdin*'          */
         Pr( "Syntax error: %s", (Int)msg, 0L );
         if ( strcmp( "*stdin*", TLS(Input)->name ) != 0 )
-          Pr( " in %s line %d", (Int)TLS(Input)->name, (Int)TLS(Input)->number );
+          Pr( " in %s:%d", (Int)TLS(Input)->name, (Int)TLS(Input)->number );
         Pr( "\n", 0L, 0L );
 
         /* print the current line                                              */
@@ -188,7 +188,7 @@ void            SyntaxWarning (
         /* print the message and the filename, unless it is '*stdin*'          */
         Pr( "Syntax warning: %s", (Int)msg, 0L );
         if ( strcmp( "*stdin*", TLS(Input)->name ) != 0 )
-          Pr( " in %s line %d", (Int)TLS(Input)->name, (Int)TLS(Input)->number );
+          Pr( " in %s:%d", (Int)TLS(Input)->name, (Int)TLS(Input)->number );
         Pr( "\n", 0L, 0L );
 
         /* print the current line                                              */