fix: display path when ParseError is encountered

fixes #7 fixes #9
SOF3 · Jul 5, 2023 · 203ff2d · 203ff2d
1 parent ef4c57a
commit 203ff2d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/src/Args.php b/src/Args.php
@@ -264,12 +264,12 @@ private function inferComposerArgs(string $vendorPath, string $path, ?string $na
 
         if (isset($cj["autoload"])) {
             foreach ($cj["autoload"]["psr-0"] ?? [] as $srcs) {
-                foreach((array) $srcs as $src) {
+                foreach ((array) $srcs as $src) {
                     $this->sourceRoots[] = $path . "/" . $src;
                 }
             }
             foreach ($cj["autoload"]["psr-4"] ?? [] as $srcs) {
-                foreach((array) $srcs as $src) {
+                foreach ((array) $srcs as $src) {
                     $this->sourceRoots[] = $path . "/" . $src;
                 }
             }

diff --git a/src/PhpFile.php b/src/PhpFile.php
@@ -4,11 +4,14 @@
 
 namespace SOFe\Pharynx;
 
+use ParseError;
+
 use function array_slice;
 use function assert;
 use function count;
 use function defined;
 use function is_array;
+use function realpath;
 use function substr_count;
 use function token_get_all;
 use function trim;
@@ -29,7 +32,12 @@ public static function parse(string $filePath, bool $verbose) : self {
         Terminal::print("Parsing $filePath", $verbose);
 
         $phpCode = Files::read($filePath);
-        $rawTokens = token_get_all($phpCode, TOKEN_PARSE);
+        try {
+            $rawTokens = token_get_all($phpCode, TOKEN_PARSE);
+        } catch(ParseError $e) {
+            $realpath = realpath($filePath);
+            throw Terminal::fatal("Syntax error: {$e->getMessage()} on {$realpath}:{$e->getLine()}");
+        }
 
         $tokens = [];
 

diff --git a/src/Virion/VirionProcessor.php b/src/Virion/VirionProcessor.php
@@ -4,8 +4,11 @@
 
 namespace SOFe\Pharynx\Virion;
 
+use ParseError;
 use RuntimeException;
 use SOFe\Pharynx\Processor;
+use SOFe\Pharynx\Terminal;
+
 use function is_string;
 use function preg_match;
 use function str_ends_with;
@@ -34,22 +37,27 @@ public function process(array &$files) : void {
                 $file->namespace = $this->epitope . "\\" . $file->namespace;
             }
 
-            $file->header = $this->replace($file->header);
+            $file->header = $this->replace($file->header, $file->originalPath);
 
             foreach ($file->items as $item) {
-                $item->code = $this->replace($item->code);
+                $item->code = $this->replace($item->code, $file->originalPath);
             }
         }
     }
 
-    private function replace(string &$code) : string {
+    private function replace(string &$code, string $originalPath) : string {
         $hasHeader = str_starts_with($code, "<?php");
         $parsedCode = $code;
         if (!$hasHeader) {
             $parsedCode = "<?php\n$code";
         }
 
-        $tokens = token_get_all($parsedCode, TOKEN_PARSE);
+        try {
+            $tokens = token_get_all($parsedCode, TOKEN_PARSE);
+        } catch(ParseError $e) {
+            throw Terminal::fatal("Syntax error: {$e->getMessage()} on {$originalPath}:{$e->getLine()}");
+        }
+
         $output = "";
         foreach ($tokens as $i => $token) {
             if (!$hasHeader && $i === 0 && $token[0] === T_OPEN_TAG) {