Merge pull request #16 from xp-framework/refactor/omit-start-token

Omit start token from stream

src/main/php/lang/ast/syntax/PHP.class.php

@@ -37,7 +37,6 @@
   ReturnStatement,
   ScopeExpression,
   Signature,
-  Start,
   StaticLocals,
   SwitchStatement,
   TernaryExpression,
@@ -520,8 +519,12 @@ public function __construct() {
 
     $this->stmt('<?', function($parse, $token) {
       $syntax= $parse->token->value;
+      if ('php' !== $syntax) {
+        $parse->raise('Unexpected syntax '.$syntax.', expecting php', $token->value);
+      }
+
       $parse->forward();
-      return new Start($syntax, $token->line);
+      return $this->statement($parse);
     });
 
     $this->stmt('{', function($parse, $token) {

src/test/php/lang/ast/unittest/parse/StartTokensTest.class.php

@@ -1,23 +1,21 @@
 <?php namespace lang\ast\unittest\parse;
 
-use lang\ast\nodes\{NamespaceDeclaration, Start};
+use lang\ast\Errors;
+use lang\ast\nodes\NamespaceDeclaration;
 use unittest\{Assert, Test};
 
 class StartTokensTest extends ParseTest {
 
   #[Test]
   public function php() {
     $this->assertParsed(
-      [new Start('php', self::LINE), new NamespaceDeclaration('test', self::LINE)],
+      [new NamespaceDeclaration('test', self::LINE)],
       '<?php namespace test;'
     );
   }
 
-  #[Test]
+  #[Test, Expect(class: Errors::class, withMessage: 'Unexpected syntax hh, expecting php in <?')]
   public function hack() {
-    $this->assertParsed(
-      [new Start('hh', self::LINE), new NamespaceDeclaration('test', self::LINE)],
-      '<?hh namespace test;'
-    );
+    $this->parse('<?hh namespace test;')->tree();
   }
 }