Fixed bugs in Conveyor::readNamespace, FieldState::step

Author: ProgMiner

Test.php-data

@@ -1,8 +1,4 @@
-namespace fjdjb98\988hhgg;
-
-use 6847\fufu9gyfug;
-
-class 9Test {
+class Test {
 
     val A;
     val A1: string;
@@ -21,7 +17,7 @@ class 9Test {
     direct val C;
     direct val C1: string;
     direct val C2 = "Foo";
-    direct val C3 := "Fee"
+    direct val C3 := "Fee";
     direct val C4: string = "Bar";
     direct val C5: string := "Baz";
 

app/Parsing/Conveyor.php

@@ -171,7 +171,7 @@ public function skipComment() {
      * @return string Namespace
      */
     public function readNamespace(): string {
-        if (preg_match('/^[a-z_][\\w\\\\]*\\w/i', $this->next, $matches) === 1) {
+        if (preg_match('/^[a-z_]\\w*(\\\\[a-z_]\\w*)*/i', $this->next, $matches) === 1) {
             $this->move(strlen($matches[0]));
 
             return $matches[0];

app/Parsing/FieldState.php

@@ -148,20 +148,25 @@ public function step(Conveyor $conveyor): State {
         case 7:
             $matches = [];
 
+            $fail = false;
             if ($conveyor->readOperator('```')) {
                 if (preg_match('/^([\\s\\S]*?)```/', $conveyor, $matches) !== 1) {
-                    throw new \Exception('Error occured while default value parsing');
+                    $fail = true;
                 }
             } elseif ($conveyor->readOperator('`')) {
                 if (preg_match('/^(.*?)`/', $conveyor, $matches) !== 1) {
-                    throw new \Exception('Error occured while default value parsing');
+                    $fail = true;
                 }
             } else {
                 if (preg_match('/^(.*?);/', $conveyor, $matches) !== 1) {
-                    throw new \Exception('Error occured while default value parsing');
+                    $fail = true;
+                } else {
+                    $matches[0] = substr($matches[0], 0, strlen($matches[1]));
                 }
+            }
 
-                $matches[0] = substr($matches[0], 0, strlen($matches[1]));
+            if ($fail) {
+                throw $conveyor->makeException('Error occured while default value parsing');
             }
 
             $conveyor->move(strlen($matches[0]));