Fixed bugs in Conveyor

Author: ProgMiner

Test.php-data

@@ -1,4 +1,8 @@
-class Test {
+namespace fjdjb98\988hhgg;
+
+use 6847\fufu9gyfug;
+
+class 9Test {
 
     val A;
     val A1: string;
@@ -17,7 +21,7 @@ class Test {
     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

@@ -47,14 +47,14 @@ class Conveyor {
     protected $length = 0;
 
     /**
-     * @var int Current cursor line
+     * @var int Current cursor row
      */
-    protected $line = 0;
+    protected $row = 0;
 
     /**
-     * @var int Current cursor row
+     * @var int Current cursor column
      */
-    protected $row = 0;
+    protected $column = 0;
 
     /**
      * @param string $source Source of conveyor
@@ -75,7 +75,7 @@ public function length(): int {
         return $this->length;
     }
 
-    public function makeException(string $description, int $code = 0, \Throwable $previous): ParsingException {
+    public function makeException(string $description, int $code = 0, \Throwable $previous = null): ParsingException {
         $offset = strlen($this->source) - $this->length;
 
         for (; $offset > 0; --$offset) {
@@ -84,7 +84,6 @@ public function makeException(string $description, int $code = 0, \Throwable $pr
                 break;
             }
         }
-        ++$offset;
 
         $line = substr($this->source, $offset);
         $line = substr($line, 0, strpos($line, "\n"));
@@ -105,10 +104,10 @@ public function move(int $offset) {
 
         for ($i = 0; $i < $offset; ++$i) {
             if ($this->next[$i] == "\n") {
-                $this->row = 0;
-                ++$this->line;
-            } else {
+                $this->column = 0;
                 ++$this->row;
+            } else {
+                ++$this->column;
             }
         }