bison-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

d: tests: avoid mixing output from reportSyntaxError and getExpectedToke


From: Akim Demaille
Subject: d: tests: avoid mixing output from reportSyntaxError and getExpectedTokens
Date: Sun, 24 Jan 2021 10:28:47 +0100

commit 7a525fa06f799a9e681581a80ada477b41daaedb
Author: Adela Vais <adela.vais99@gmail.com>
Date:   Sun Jan 3 16:05:57 2021 +0200

    d: tests: avoid mixing output from reportSyntaxError and getExpectedTokens
    
    Function reportSyntaxError buffers and prints the message at the end.
    
    * tests/local.at: Here.

diff --git a/tests/local.at b/tests/local.at
index e08855410..77112b5e6 100644
--- a/tests/local.at
+++ b/tests/local.at
@@ -902,10 +902,13 @@ public string 
transformToken(]AT_API_PREFIX[Parser.SymbolKind token)
 
 public void reportSyntaxError(]AT_API_PREFIX[Parser.Context ctx)
 {
-  stderr.write(]AT_LOCATION_IF([[ctx.getLocation(), ": ",]])["syntax error");
+  // Buffer and print the message at the end, to avoid being intertwined
+  // with debug traces from getExpectedTokens.
+  string msg;
+  msg ~=]AT_LOCATION_IF([[ ctx.getLocation().toString() ~ ": " ~]])[ "syntax 
error";
   {
     ]AT_API_PREFIX[Parser.SymbolKind token = ctx.getToken();
-    stderr.write(" on token @<:@", transformToken(token), "@:>@");
+    msg ~= " on token @<:@" ~ transformToken(token) ~ "@:>@";
   }
   {
     immutable int argmax = 7;
@@ -913,12 +916,13 @@ public void 
reportSyntaxError(]AT_API_PREFIX[Parser.Context ctx)
     int n = ctx.getExpectedTokens(arg, argmax);
     if (0 < n)
     {
-      stderr.write(" (expected:");
+      msg ~= " (expected:";
       for (int i = 0; i < n; ++i)
-        stderr.write(" @<:@", transformToken(arg[i]), "@:>@");
-      stderr.writeln(")");
+        msg ~= " @<:@" ~ transformToken(arg[i]) ~ "@:>@";
+      msg ~= ")";
     }
   }
+  stderr.writeln(msg);
 }
 ]])[]])
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]