Rename position line and column getters.

nielssp · Nov 14, 2015 · 06362e6 · 06362e6
1 parent e893b62
commit 06362e6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/examples/lexer.php b/examples/lexer.php
@@ -149,9 +149,9 @@ public function __invoke($input)
     foreach ($tokens as $token)
         echo ' ' . $token;
 } catch (\Parco\ParseException $e) {
-    echo 'Syntax Error: ' . $e->getMessage() . ' on line ' . $e->posLine() . ' column ' . $e->posColumn() . PHP_EOL;
+    echo 'Syntax Error: ' . $e->getMessage() . ' on line ' . $e->line() . ' column ' . $e->column() . PHP_EOL;
     echo $input . PHP_EOL;
-    echo str_repeat('-', $e->posColumn() - 1) . '^';
+    echo str_repeat('-', $e->column() - 1) . '^';
 }
 
 

diff --git a/examples/tokens.php b/examples/tokens.php
@@ -1,5 +1,4 @@
 <?php
-use Parco\Combinator\RegexParsers;
 use Parco\Positional;
 use Parco\Position;
 use Parco\Combinator\PositionalParsers;
@@ -243,7 +242,7 @@ public function __invoke($input)
     echo 'Abstract syntax tree:' . PHP_EOL;
     print_r($ast);
 } catch (\Parco\ParseException $e) {
-    echo 'Syntax Error: ' . $e->getMessage() . ' on line ' . $e->posLine() . ' column ' . $e->posColumn() . PHP_EOL;
+    echo 'Syntax Error: ' . $e->getMessage() . ' on line ' . $e->line() . ' column ' . $e->column() . PHP_EOL;
 }
 
 echo '</pre>';
diff --git a/src/Position.php b/src/Position.php
@@ -43,7 +43,7 @@ public function setPosition(array $pos)
      *
      * @return int Line number (starting from 1).
      */
-    public function posLine()
+    public function line()
     {
         return $this->pos[0];
     }
@@ -53,7 +53,7 @@ public function posLine()
      *
      * @return int Column number (starting from 1).
      */
-    public function posColumn()
+    public function column()
     {
         return $this->pos[1];
     }

diff --git a/tests/PositionTest.php b/tests/PositionTest.php
@@ -13,7 +13,7 @@ public function testPosition()
         $mock->setPosition(array(5, 17));
         $this->assertEquals(array(5, 17), $mock->getPosition());
 
-        $this->assertEquals(5, $mock->posLine());
-        $this->assertEquals(17, $mock->posColumn());
+        $this->assertEquals(5, $mock->line());
+        $this->assertEquals(17, $mock->column());
     }
 }