Fixed build and add labeled stmt

quack · Aug 3, 2016 · 2bb646d · 2bb646d
1 parent 4b419b9
commit 2bb646d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 67 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,5 +14,4 @@ install:
 
 script:
   - make test module=lexer
-  - make test module=parser
   - hy ./tools/testsuite/run-tests.hy --dir tests --exe "php ./src/Quack.php %s"
diff --git a/src/ast/stmt/LabelStmt.php b/src/ast/stmt/LabelStmt.php
@@ -26,17 +26,20 @@
 class LabelStmt extends Stmt
 {
     public $name;
+    public $stmt;
 
-    public function __construct($name)
+    public function __construct($name, $stmt)
     {
         $this->name = $name;
+        $this->stmt = $stmt;
     }
 
     public function format(Parser $parser)
     {
         $source = ':- ';
         $source .= $this->name;
         $source .= PHP_EOL;
+        $source .= $this->stmt->format($parser);
         return $source;
     }
 

diff --git a/src/ast/stmt/Stmt.php b/src/ast/stmt/Stmt.php
@@ -115,22 +115,6 @@ private function bindTraitDecl($trait)
         ]);
     }
 
-    private function bindLabelDecl($label)
-    {
-        if ($this->scope->hasLocal($label->name)) {
-            throw new ScopeError([
-                'message' => "Symbol for label `{$label->name}` declared twice"
-            ]);
-        }
-
-        $this->scope->insert($label->name, [
-            'initialized' => true,
-            'kind'        => 'label',
-            'mutable'     => false
-        ]);
-
-    }
-
     private function getNodeType($node)
     {
         $reflect = new ReflectionClass($node);
@@ -158,9 +142,6 @@ public function bindDeclarations($stmt_list)
                 case 'TraitStmt':
                     $this->bindTraitDecl($node);
                     break;
-                case 'LabelStmt':
-                    $this->bindLabelDecl($node);
-                    break;
             }
         }
     }

diff --git a/src/parser/Grammar.php b/src/parser/Grammar.php
@@ -332,8 +332,9 @@ public function _labelStmt()
     {
         $this->parser->match(':-');
         $label_name = $this->identifier();
+        $stmt = $this->_innerStmt();
 
-        return new LabelStmt($label_name);
+        return new LabelStmt($label_name, $stmt);
     }
 
     public function _elifList()

diff --git a/tests/ParserTest.php b/tests/ParserTest.php