Merge pull request #77 from m-lyons/master

Adds imports and some dead code cleanup
manifold-lang · Jul 10, 2016 · 75b1f72 · 75b1f72
2 parents 7c1dc08 + 95e8cae
commit 75b1f72
Show file tree

Hide file tree

Showing 47 changed files with 1,378 additions and 1,434 deletions.
diff --git a/README.md b/README.md
diff --git a/build.gradle b/build.gradle
@@ -102,7 +102,7 @@ checkstyle {
   configFile = new File(rootDir, "checkstyle.xml")
   ignoreFailures = false
   showViolations = true
-  toolVersion = "5.9"
+  toolVersion = "6.18"
 }
 
 antlr4 {

diff --git a/src/main/antlr4/Manifold.g4 b/src/main/antlr4/Manifold.g4
@@ -17,6 +17,9 @@ LINE_COMMENT: '//' ~[\r\n]* -> skip;
 INTEGER_VALUE: [0-9]+;
 BOOLEAN_VALUE: 'false' | 'true';
 TYPE_KEYWORD: 'Type';
+STRING_VALUE: '"' ( '\"' | ~["] )*? '"';
+
+VISIBILITY_PUBLIC: 'public';
 
 tupleTypeValueEntry: (IDENTIFIER ':')? typevalue ('=' expression)?;
 tupleTypeValue: '(' tupleTypeValueEntry (',' tupleTypeValueEntry)* ')';
@@ -76,10 +79,11 @@ rvalue:
   | INTEGER_VALUE # Integer
   | functionValue # Function
   | reference rvalue # FunctionInvocationExpression // TODO: function invocation needs to be 'reference arglist'
-  | reference # RValueExpression
-  | lvalue '=' rvalue # AssignmentExpression
+  | reference # ReferenceExpression
+  | VISIBILITY_PUBLIC? lvalue '=' rvalue # AssignmentExpression
   | 'primitive' 'port' typevalue (':' tupleTypeValue)? # PrimitivePortDefinitionExpression
   | 'primitive' 'node' functionTypeValue # PrimitiveNodeDefinitionExpression
+  | 'import' STRING_VALUE #ImportExpr
   ;
 
 lvalue:
@@ -89,10 +93,14 @@ lvalue:
   ;
 
 // TODO: declarations as expressions
-expression: /* declaration | */ rvalue;
+expression:
+  rvalue
+  // | declaration
+  ;
 
 EXPRESSION_TERMINATOR: ';';
 
+
 ////////////////////////////////////////////////////////
 //                                                    //
 //                      Schematic                     //