Make file parsing lazier

m-lyons · Jun 15, 2016 · cede96a · cede96a
1 parent 0bf3a7f
commit cede96a
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 22 deletions.
diff --git a/src/main/antlr4/Manifold.g4 b/src/main/antlr4/Manifold.g4
@@ -30,7 +30,7 @@ tupleValue:
   '(' ')';
 
 functionTypeValue: tupleTypeValue '->' tupleTypeValue;
-functionValue: functionTypeValue '{' (expression STATEMENT_TERMINATOR)* '}';
+functionValue: functionTypeValue '{' (expression EXPRESSION_TERMINATOR)* '}';
 
 ////////////////////////////////////////////////////////
 //                                                    //
@@ -98,7 +98,7 @@ expression:
   // | declaration
   ;
 
-STATEMENT_TERMINATOR: ';';
+EXPRESSION_TERMINATOR: ';';
 
 
 ////////////////////////////////////////////////////////
@@ -107,4 +107,4 @@ STATEMENT_TERMINATOR: ';';
 //                                                    //
 ////////////////////////////////////////////////////////
 
-schematic: (expression STATEMENT_TERMINATOR)*;
+schematic: (expression EXPRESSION_TERMINATOR)*;
diff --git a/src/main/java/org/manifold/compiler/front/ExpressionContextVisitor.java b/src/main/java/org/manifold/compiler/front/ExpressionContextVisitor.java
@@ -24,7 +24,6 @@
 
 class ExpressionContextVisitor extends ManifoldBaseVisitor<ExpressionVertex> {
 
-  private ExpressionGraphParser parser;
   private ExpressionGraph exprGraph;
   private File inputFile;
   private List<String> errors;
@@ -46,7 +45,6 @@ public ExpressionContextVisitor(File inputFile) {
 
   public ExpressionContextVisitor(ExpressionGraph exprGraph, File inputFile) {
     this.inputFile = inputFile;
-    this.parser = new ExpressionGraphParser();
     this.exprGraph = exprGraph;
     this.errors = new ArrayList<>();
   }
@@ -366,16 +364,7 @@ public ExpressionVertex visitImportExpr(ImportExprContext context) {
       return null;
     }
 
-    ExpressionGraph g;
-    try {
-      g = parser.parseFile(importedFile);
-    } catch (Exception e) {
-      errors.add(e.getMessage().trim());
-      errors.add("Error while parsing included file " + filePath);
-      return null;
-    }
-
-    ExpressionVertex v = new ImportVertex(exprGraph, g);
+    ExpressionVertex v = new ImportVertex(exprGraph, importedFile);
     exprGraph.addVertex(v);
     return v;
   }

diff --git a/src/main/java/org/manifold/compiler/front/ImportVertex.java b/src/main/java/org/manifold/compiler/front/ImportVertex.java
@@ -5,20 +5,21 @@
 import org.manifold.compiler.Value;
 
 import java.io.BufferedWriter;
+import java.io.File;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
 public class ImportVertex extends ExpressionVertex {
 
+  private File importedFile;
   private NamespaceIdentifier namespace;
-  private ExpressionGraph includedGraph;
   private TypeValue type;
   private Value value;
 
-  public ImportVertex(ExpressionGraph exprGraph, ExpressionGraph includedGraph) {
+  public ImportVertex(ExpressionGraph exprGraph, File importedFile) {
     super(exprGraph);
-    this.includedGraph = includedGraph;
+    this.importedFile = importedFile;
   }
 
   @Override
@@ -37,6 +38,16 @@ public void elaborate() throws Exception {
       return;
     }
 
+    ExpressionGraphParser parser = new ExpressionGraphParser();
+    ExpressionGraph importedGraph;
+    try {
+      importedGraph = parser.parseFile(importedFile);
+    } catch (FrontendBuildException e) {
+      throw new FrontendBuildException(
+          "Could not parse " + importedFile.getName() + "\n" +
+              e.getMessage());
+    }
+
     ExpressionGraph exprGraph = getExpressionGraph();
     List<ExpressionEdge> targets = exprGraph.getEdgesFromSource(this);
     if (targets.size() != 1) {
@@ -48,7 +59,7 @@ public void elaborate() throws Exception {
     }
     namespace = new NamespaceIdentifier(((VariableReferenceVertex) target).getId().getName());
 
-    exprGraph.addSubGraph(includedGraph, namespace);
+    exprGraph.addSubGraph(importedGraph, namespace);
     this.value = new ImportValue(getExpressionGraph(), namespace);
     this.type = this.value.getType();
   }
@@ -75,7 +86,7 @@ public void writeToDOTFile(BufferedWriter writer) throws IOException {
 
   @Override
   public ExpressionVertex copy(ExpressionGraph g, Map<ExpressionEdge, ExpressionEdge> edgeMap) {
-    ImportVertex v = new ImportVertex(g, includedGraph);
+    ImportVertex v = new ImportVertex(g, importedFile);
     v.namespace = namespace;
     return v;
   }

diff --git a/tests/buildErrors/importFileWithError.manifold b/tests/buildErrors/importFileWithError.manifold
@@ -1 +1,7 @@
-import "parseError.manifold";
+error = import "parseError.manifold";
+
+digitalIn = primitive port Bool;
+outputPin = primitive node (in: digitalIn) -> (Nil);
+
+// error isn't parsed until usage, so force the elaboration here
+outputPin(error.foo);
diff --git a/tests/buildErrors/importFileWithError.manifold.error b/tests/buildErrors/importFileWithError.manifold.error
@@ -1,2 +1,2 @@
+Could not parse parseError.manifold
 Error at line 2, char 0: no viable alternative at input 'compile.'
-Error while parsing included file parseError.manifold