Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds imports and some dead code cleanup #77

Merged
merged 17 commits into from
Jul 10, 2016
Merged

Adds imports and some dead code cleanup #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c5a1ca9
Delete lots of unused classes
psocha May 17, 2016
8002806
Handle line ending problems in buildErrors
psocha May 17, 2016
3fea395
Merge pull request #20 from m-lyons/line-endings
psocha May 20, 2016
e27ac35
Allow for simple import of other files
nikklassen May 20, 2016
23447e7
Merge pull request #19 from m-lyons/dead-code
psocha May 21, 2016
5ed9ea8
Restructuring of the README
psocha May 22, 2016
2403a85
Error messages for missing includes and some more tests
nikklassen May 27, 2016
bf5b0e6
Create new statement rule in the grammar
nikklassen May 29, 2016
2f5f0e1
Merge pull request #22 from m-lyons/readme-cleanup
nikklassen May 30, 2016
785e31b
Support public and private variables in manifold file
nikklassen Jun 4, 2016
9f54df6
Add system libraries
nikklassen Jun 4, 2016
ef3bfd1
Merge pull request #21 from m-lyons/import
nikklassen Jun 8, 2016
91824e9
Convert imports to expressions
nikklassen Jun 13, 2016
0bf3a7f
Fix build error
nikklassen Jun 13, 2016
cede96a
Make file parsing lazier
nikklassen Jun 15, 2016
d273ea0
Merge pull request #29 from m-lyons/import
nikklassen Jun 16, 2016
95e8cae
Merge pull request #28 from m-lyons/develop
nikklassen Jun 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
441 changes: 182 additions & 259 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ checkstyle {
configFile = new File(rootDir, "checkstyle.xml")
ignoreFailures = false
showViolations = true
toolVersion = "5.9"
toolVersion = "6.18"
}

antlr4 {
Expand Down
14 changes: 11 additions & 3 deletions src/main/antlr4/Manifold.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)* ')';
Expand Down Expand Up @@ -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:
Expand All @@ -89,10 +93,14 @@ lvalue:
;

// TODO: declarations as expressions
expression: /* declaration | */ rvalue;
expression:
rvalue
// | declaration
;

EXPRESSION_TERMINATOR: ';';


////////////////////////////////////////////////////////
// //
// Schematic //
Expand Down
Loading