Keep track of line numbers in regex parsers.

nielssp · Nov 14, 2015 · 7b7ebfe · 7b7ebfe
1 parent ff35d8b
commit 7b7ebfe
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 4 deletions.
diff --git a/examples/calculator.php b/examples/calculator.php
@@ -105,4 +105,5 @@ public function __invoke($input)
 
 $calculator = new Calculator();
 
-echo $calculator(' 2 + 4 / 2 - 3 * ( 6 + 2 ) ');
+echo 'Result: ';
+echo $calculator(' 2 + 4 / 2 - 3 * ( 6 - ( 5 + 3 ) ) ');
diff --git a/src/Combinator/Parsers.php b/src/Combinator/Parsers.php
@@ -70,7 +70,12 @@ public function elem($e)
             }
             $input = array_slice($input, 1);
             $nextPos = $pos;
-            $nextPos[1]++;
+            if ($e === "\n") {
+                $nextPos[0]++;
+                $nextPos[1] = 1;
+            } else {
+                $nextPos[1]++;
+            }
             return new Success($e, $pos, $input, $nextPos);
         });
     }

diff --git a/src/Combinator/RegexParsers.php b/src/Combinator/RegexParsers.php
@@ -142,6 +142,7 @@ public function string($s)
                 $pos = $r->nextPos;
             }
             $length = strlen($s);
+            $nextPos = $pos;
             for ($i = 0; $i < $length; $i++) {
                 if (! isset($input[$i])) {
                     return new Failure(
@@ -159,10 +160,14 @@ public function string($s)
                         $pos
                     );
                 }
+                if ($input[$i] === "\n") {
+                    $nextPos[0]++;
+                    $nextPos[1] = 1;
+                } else {
+                    $nextPos[1]++;
+                }
             }
             $input = array_slice($input, $length);
-            $nextPos = $pos;
-            $nextPos[1] += $length;
             return new Success($s, $pos, $input, $nextPos);
         });
     }

diff --git a/tests/Combinator/ParsersTest.php b/tests/Combinator/ParsersTest.php
@@ -56,6 +56,14 @@ public function testElem()
         $this->assertEquals(1, $result->get());
         $this->assertEquals(array(2), $result->nextInput);
         $this->assertEquals(array(1, 2), $result->nextPos);
+
+        $p2 = $this->elem("\n");
+
+        $result = $this->apply($p2, array("\n"));
+        $this->assertTrue($result->successful);
+        $this->assertEquals("\n", $result->get());
+        $this->assertEquals(array(), $result->nextInput);
+        $this->assertEquals(array(2, 1), $result->nextPos);
     }
 
     public function testPhrase()

diff --git a/tests/Combinator/RegexParsersTest.php b/tests/Combinator/RegexParsersTest.php
@@ -93,6 +93,14 @@ public function testChar()
         $this->assertEquals('a', $result->get());
         $this->assertEquals(array('b'), $result->nextInput);
         $this->assertEquals(array(1, 2), $result->nextPos);
+
+        $p2 = $this->char("\n");
+
+        $result = $this->apply($p2, array("\n"));
+        $this->assertTrue($result->successful);
+        $this->assertEquals("\n", $result->get());
+        $this->assertEquals(array(), $result->nextInput);
+        $this->assertEquals(array(2, 1), $result->nextPos);
     }
 
     public function testString()
@@ -112,6 +120,14 @@ public function testString()
         $this->assertEquals('aaa', $result->get());
         $this->assertEquals(array(), $result->nextInput);
         $this->assertEquals(array(1, 4), $result->nextPos);
+
+        $p2 = $this->string("aa\na");
+
+        $result = $this->parse($p2, "aa\na");
+        $this->assertTrue($result->successful);
+        $this->assertEquals("aa\na", $result->get());
+        $this->assertEquals(array(), $result->nextInput);
+        $this->assertEquals(array(2, 2), $result->nextPos);
     }
 
     public function testRegex()