Added ParsingException. Renamed Conveyor::readClassname to readName

Author: ProgMiner

app/Exception/ParsingException.php

@@ -0,0 +1,82 @@
+<?php
+
+/* MIT License
+
+Copyright (c) 2018 Eridan Domoratskiy
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE. */
+
+namespace PHPDataGen\Exception;
+
+/**
+ * Parsing exception
+ */
+class ParsingException extends \Exception {
+
+    /**
+     * @var string Description of caused exception
+     */
+    protected $description = null;
+
+    /**
+     * @var string Line that caused exception
+     */
+    protected $line = 0;
+
+    /**
+     * @var int Column number of line that caused exception
+     */
+    protected $column = 0;
+
+    /**
+     * @var int Row number of line that caused exception
+     */
+    protected $row = 0;
+
+    /**
+     * @param string     $description Description of caused exception
+     * @param string     $line        Line that caused exception
+     * @param int        $row         Row number of line that caused exception
+     * @param int        $column      Column number of line that caused exception
+     * @param int        $code        Exception code
+     * @param \Throwable $previous    Previous exception
+     */
+    public function __construct(
+        string     $description,
+        string     $line,
+        int        $row,
+        int        $column,
+        int        $code     = 0,
+        \Throwable $previous = null
+    ) {
+        $this->description = $description;
+        $this->line = $line;
+
+        $this->column = $column;
+        $this->row = $row;
+
+        $msg = "$description at row $row, column $column:\n$line\n";
+        for ($i = 0; $i < $column; ++$i) {
+            $msg .= ' ';
+        }
+        $msg .= '^';
+
+        parent::__construct($msg, $code, $previous);
+    }
+}

app/Parsing/ClassState.php

@@ -75,7 +75,7 @@ public function getBuilder(): ClassBuilder {
     public function step(Conveyor $conveyor): State {
         switch ($this->state) {
         case 0:
-            $this->builder->setName($conveyor->readClassname());
+            $this->builder->setName($conveyor->readName());
 
             $this->state = 1;
             return $this;

app/Parsing/Conveyor.php

@@ -24,11 +24,18 @@
 
 namespace PHPDataGen\Parsing;
 
+use PHPDataGen\Exception\ParsingException;
+
 /**
  * Parsing conveyor
  */
 class Conveyor {
 
+    /**
+     * @var string Source string
+     */
+    protected $source = null;
+
     /**
      * @var string Next string
      */
@@ -53,7 +60,9 @@ class Conveyor {
      * @param string $source Source of conveyor
      */
     public function __construct(string $source) {
+        $this->source = $source;
         $this->next = $source;
+
         $this->length = strlen($source);
     }
 
@@ -66,6 +75,23 @@ public function length(): int {
         return $this->length;
     }
 
+    public function makeException(string $description, int $code = 0, \Throwable $previous): ParsingException {
+        $offset = strlen($this->source) - $this->length;
+
+        for (; $offset > 0; --$offset) {
+            // TODO Configurable newline symbol
+            if ($this->source[$offset] === '\n') {
+                break;
+            }
+        }
+        ++$offset;
+
+        $line = substr($this->source, $offset);
+        $line = substr($line, 0, strpos($line, "\n"));
+
+        return new ParsingException($description, $line, $this->row, $this->column, $code, $previous);
+    }
+
     /**
      * Moves conveyor on specified offset.
      * Offset must be pozitive (or null)
@@ -110,8 +136,7 @@ public function readOperator(string $operator, bool $skip = true, bool $required
         }
 
         if ($required) {
-            // TODO Parsing exception class
-            throw new \Exception("$operator not found at {$this->line} line {$this->row} row");
+            throw $this->makeException("\"$operator\" expected");
         }
 
         return false;
@@ -152,7 +177,7 @@ public function readNamespace(): string {
             return $matches[0];
         }
 
-        throw new \Exception('Namespace not found');
+        throw $this->makeException("Namespace expected");
     }
 
     /**
@@ -161,14 +186,14 @@ public function readNamespace(): string {
      *
      * @return string Class name
      */
-    public function readClassname(): string {
+    public function readName(): string {
         if (preg_match('/^[a-z_]\\w*/i', $this->next, $matches) === 1) {
             $this->move(strlen($matches[0]));
 
             return $matches[0];
         }
 
-        throw new \Exception('Class name not found');
+        throw $this->makeException("Name expected");
     }
 
     /**
@@ -184,7 +209,11 @@ public function readExtendedClassname(): string {
             return $matches[0];
         }
 
-        return $this->readClassname();
+        try {
+            return $this->readName();
+        } catch (ParseException $e) {
+            throw $this->makeException("Class name expected", 0, $e);
+        }
     }
 
     /**
@@ -196,7 +225,7 @@ public function readSemicolon() {
             return;
         }
 
-        throw new \Exception('Semicolon not found');
+        throw $this->makeException("Semicolon expected");
     }
 
     public function __toString() {

app/Parsing/FieldState.php

@@ -96,7 +96,7 @@ public function step(Conveyor $conveyor): State {
             throw new \Exception('Expected val/var operator');
 
         case 2:
-            $this->builder->setName($conveyor->readClassname());
+            $this->builder->setName($conveyor->readName());
 
             $this->state = 3;
             return $this;
@@ -140,7 +140,7 @@ public function step(Conveyor $conveyor): State {
             return $this;
 
         case 6:
-            $this->builder->addValidator($conveyor->readClassname());
+            $this->builder->addValidator($conveyor->readName());
 
             $this->state = 5;
             return $this;

app/Parsing/FileState.php

@@ -111,7 +111,7 @@ public function step(Conveyor $conveyor): State {
             return $this;
 
         case 4:
-            $this->builder->addUse($this->useBuffer, $conveyor->readClassname());
+            $this->builder->addUse($this->useBuffer, $conveyor->readName());
             $this->useBuffer = null;
 
             $this->state = 5;

php-datagen

@@ -8,6 +8,8 @@ if (file_exists(__DIR__.'/../../autoload.php')) {
 }
 
 $app = new Symfony\Component\Console\Application('PHP-DataGen', '0.2-alpha');
+
+// TODO Build, config commands
  // $app->add(new PHPDataGen\Commands\);
 
 $app->run();