Write parser conflict error to stderr, not the debug stream

ircmaxell · Oct 25, 2019 · 31ee165 · 31ee165
1 parent 153f4f6
commit 31ee165
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 13 deletions.
diff --git a/bin/phpyacc b/bin/phpyacc
@@ -28,7 +28,6 @@ if (!defined('COMPOSER_INSTALL')) {
 require COMPOSER_INSTALL;
 
 $grammarFile = end($argv);
-
 $resultFile = substr($grammarFile, 0, -1);
 
 if ($grammarFile === '-') {
@@ -41,7 +40,8 @@ if ($argc < 2 || !file_exists($grammarFile)) {
     exit(4);
 }
 
-$context = new Context($grammarFile);
+$errorFile = fopen('php://stderr', 'w');
+$context = new Context($grammarFile, $errorFile);
 
 $skeleton = '';
 

diff --git a/examples/rebuild.php b/examples/rebuild.php
@@ -44,8 +44,9 @@ function buildFolder(CliOptions $options, Generator $generator, string $dir) {
         rename("$dir/grammar.php", "$dir/parser.kmyacc.php");
     }
 
+    $errorFile = fopen("php://stderr", "w");
     $debugFile = DEBUG ? fopen("$dir/y.phpyacc.output", 'w') : null;
-    $context = new Context($grammar, $debugFile, VERBOSE_DEBUG);
+    $context = new Context($grammar, $errorFile, $debugFile, VERBOSE_DEBUG);
     $context->tflag = true;
     $generator->generate(
         $context,

diff --git a/lib/Grammar/Context.php b/lib/Grammar/Context.php
@@ -50,7 +50,7 @@ class Context
     public $filename = 'YY';
     public $pureFlag = false;
     public $startSymbol = null;
-    public $expected = null;
+    public $expected = 0;
     public $unioned = false;
     public $eofToken = null;
     public $errorToken = null;
@@ -76,15 +76,24 @@ class Context
     public $naux = 0;
 
     public $debugFile;
+    public $errorFile;
 
     public function __construct(
-        string $filename = 'YY', $debugFile = null, bool $verboseDebug = false)
+        string $filename = 'YY', $errorFile = null, $debugFile = null, bool $verboseDebug = false)
     {
         $this->filename = $filename;
+        $this->errorFile = $errorFile;
         $this->debugFile = $debugFile;
         $this->verboseDebug = $verboseDebug;
     }
 
+    public function error(string $data)
+    {
+        if ($this->errorFile) {
+            fwrite($this->errorFile, $data);
+        }
+    }
+
     public function debug(string $data)
     {
         if ($this->debugFile) {

diff --git a/lib/Lalr/Generator.php b/lib/Lalr/Generator.php
@@ -704,19 +704,18 @@ protected function printState(State $state)
     protected function printDiagnostics()
     {
         // TODO check expected_srconf
-        $expected_srconf = 0;
-        if ($this->nsrerr !== $expected_srconf || $this->nrrerr !== 0) {
-            $this->context->debug("{$this->context->filename}: there are ");
-            if ($this->nsrerr !== $expected_srconf) {
-                $this->context->debug(" $this->nsrerr shift/reduce");
+        if ($this->nsrerr !== $this->context->expected || $this->nrrerr !== 0) {
+            $this->context->error("{$this->context->filename}: there are ");
+            if ($this->nsrerr !== $this->context->expected) {
+                $this->context->error(" $this->nsrerr shift/reduce");
                 if ($this->nrrerr !== 0) {
-                    $this->context->debug(" and");
+                    $this->context->error(" and");
                 }
             }
             if ($this->nrrerr !== 0) {
-                $this->context->debug(" $this->nrrerr reduce/reduce");
+                $this->context->error(" $this->nrrerr reduce/reduce");
             }
-            $this->context->debug(" conflicts\n");
+            $this->context->error(" conflicts\n");
         }
     }