Fix parser helpers autoloading

Author: SerafimArts

.github/CONTRIBUTING.md

@@ -1,8 +1,9 @@
 .idea/
 vendor/
-composer.phar
 .DS_Store
 Thumbs.db
+composer.phar
+composer.lock
 *.phpt.out
 *.phpt.exp
 *.phpt.diff

.gitignore

@@ -3,8 +3,8 @@
 </p>
 
 <p align="center">
-    <a href="https://travis-ci.org/railt/parser"><img src="https://travis-ci.org/railt/parser.svg?branch=master" alt="Travis CI" /></a>
-    <a href="https://scrutinizer-ci.com/g/railt/parser/?branch=master"><img src="https://scrutinizer-ci.com/g/railt/parser/badges/quality-score.png?b=master" alt="Scrutinizer CI" /></a>
+    <a href="https://travis-ci.org/railt/parser"><img src="https://travis-ci.org/railt/parser.svg?branch=1.3.x" alt="Travis CI" /></a>
+    <a href="https://scrutinizer-ci.com/g/railt/parser/?branch=1.3.x"><img src="https://scrutinizer-ci.com/g/railt/parser/badges/quality-score.png?b=master" alt="Scrutinizer CI" /></a>
     <a href="https://packagist.org/packages/railt/parser"><img src="https://poser.pugx.org/railt/parser/version" alt="Latest Stable Version"></a>
     <a href="https://packagist.org/packages/railt/parser"><img src="https://poser.pugx.org/railt/parser/v/unstable" alt="Latest Unstable Version"></a>
     <a href="https://raw.githubusercontent.com/railt/parser/master/LICENSE.md"><img src="https://poser.pugx.org/railt/parser/license" alt="License MIT"></a>
@@ -295,8 +295,73 @@ And now, as an **operation** rule, we get the instance of `Operation` class:
 ```php
 $ast = (new Parser($lexer, $grammar))->parse(File::fromSources('2 + 2'));
 
-$operation = $ast->getChild(0); // Operation::class
+$operation = $ast->first('operation'); // Operation::class
 
 $operation->isPlus();   // true
 $operation->isMinus();  // false
 ```
+
+### Environment
+
+You can also cast data and the external environment (or context) 
+inside each rule using the environment class:
+
+```php
+$sources = File::fromSources('...');
+
+$parser->env(File::class, $source); // Share environment variable
+
+class DelegateExample extends Rule 
+{
+    public function getFile(): File
+    {
+        return $this->env(File::class);
+    }
+}
+```
+
+## Finder
+
+For a convenient search by AST structure, we can take 
+advantage of the capabilities of the `Finder`. This class provides a 
+quick lazy API for querying and finding the right data 
+inside an Abstract Syntax Tree.
+
+Each rule already has the ability to execute the requested 
+query using the `find` method:
+
+```php
+$ast = $parser->parse(File::fromSources('2 + (3 * 4 + (42 - 10))'));
+
+echo $ast->find('T_DIGIT')->first(); 
+// T_DIGIT "2"
+
+foreach ($ast->find('group T_DIGIT') as $digit) {
+    echo $digit;
+    // T_DIGIT "3"
+    // T_DIGIT "4"
+    // T_DIGIT "42"
+    // T_DIGIT "10"
+}
+
+
+echo $ast->find('group > group operation')->first(); 
+// T_MINUS "-"
+
+
+foreach ($ast->find('group > T_DIGIT') as $digit) {
+    echo $digit;
+    // T_DIGIT "3"
+    // T_DIGIT "4"
+}
+```
+
+Allowed expressions:
+
+- `name` - Defines any node with the specified name.
+- `:name` - Defines only tokens (`LeafInterface`) with the specified name.
+- `#name` - Defines only rules (`RuleInterface`) with the specified name.
+- `*` - Any rule
+- ` ` - Whitespace indicates that the next rule can be at any nested depth.
+- `>` - Indicates that the next rule can be strictly within the specified.
+- `(N)` - Indicates that the following rule may be strictly within the rule with the N (digit) nesting.

README.md

@@ -2,6 +2,7 @@
     "name": "railt/parser",
     "license": "MIT",
     "type": "library",
+    "version": "1.3",
     "homepage": "http://railt.org",
     "description": "Syntactic LL(k) parser-analyzer implementation",
     "keywords": [
@@ -37,13 +38,16 @@
         "ext-spl": "*",
         "ext-pcre": "*",
         "ext-mbstring": "*",
-        "railt/io": "1.4.*|1.4.x-dev",
-        "railt/lexer": "1.4.*|1.4.x-dev"
+        "railt/io": "1.3.*|dev-master",
+        "railt/lexer": "1.3.*|dev-master"
     },
     "autoload": {
         "psr-4": {
             "Railt\\": "src/"
-        }
+        },
+        "files": [
+            "src/Parser/helpers.php"
+        ]
     },
     "require-dev": {
         "phpunit/phpunit": "^6.5"

composer.json

@@ -7,7 +7,8 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false">
+         stopOnFailure="false"
+         syntaxCheck="true">
     <testsuites>
         <testsuite name="Test Suite">
             <directory suffix="TestCase.php">./tests</directory>

phpunit.xml

@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of compiler package.
+ * This file is part of Railt package.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -44,7 +44,6 @@ public function __construct(array $trace, GrammarInterface $grammar)
     /**
      * @return RuleInterface
      * @throws InternalException
-     * @throws \LogicException
      */
     public function build(): RuleInterface
     {
@@ -64,7 +63,6 @@ public function build(): RuleInterface
      * @param int $i Current trace index.
      * @param array &$children Collected children.
      * @return Node|int
-     * @throws \LogicException
      */
     protected function buildTree(int $i = 0, array &$children = [])
     {
@@ -137,7 +135,7 @@ protected function buildTree(int $i = 0, array &$children = [])
                     continue;
                 }
 
-                $children[] = new Leaf($trace->getToken());
+                $children[] = $this->leaf($trace);
                 ++$i;
             }
         }
@@ -149,18 +147,22 @@ protected function buildTree(int $i = 0, array &$children = [])
      * @param string $name
      * @param array $children
      * @param int $offset
-     * @return Rule|mixed
-     * @throws \LogicException
+     * @return RuleInterface
      */
-    protected function rule(string $name, array $children, int $offset)
+    private function rule(string $name, array $children, int $offset): RuleInterface
     {
-        $delegate = $this->grammar->delegate($name) ?? Rule::class;
+        /** @var Rule $class */
+        $class = $this->grammar->delegate($name) ?? Rule::class;
 
-        try {
-            return new $delegate($name, $children, $offset);
-        } catch (\TypeError $e) {
-            $error = \sprintf('Error while %s initialization: %s', $delegate, $e->getMessage());
-            throw new \LogicException($error);
-        }
+        return new $class($name, $children, $offset);
+    }
+
+    /**
+     * @param Token $token
+     * @return LeafInterface
+     */
+    private function leaf(Token $token): LeafInterface
+    {
+        return new Leaf($token->getToken());
     }
 }

src/Parser/Ast/Builder.php

@@ -7,7 +7,7 @@
  */
 declare(strict_types=1);
 
-namespace Railt\Parser\Dumper;
+namespace Railt\Parser\Ast\Dumper;
 
 use Railt\Parser\Ast\LeafInterface;
 use Railt\Parser\Ast\NodeInterface;

src/Parser/Dumper/HoaDumper.php src/Parser/Ast/Dumper/HoaDumper.phpsrc/Parser/Dumper/HoaDumper.php renamed to src/Parser/Ast/Dumper/HoaDumper.php

@@ -7,7 +7,7 @@
  */
 declare(strict_types=1);
 
-namespace Railt\Parser\Dumper;
+namespace Railt\Parser\Ast\Dumper;
 
 /**
  * Interface Dumper