Repository: incubator-systemml Updated Branches: refs/heads/master 36a0f68f9 -> b20533b5e
[SYSTEMML-639] Fix dml.g4 to use semicolon after user-defined function Closes #166. Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/b20533b5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/b20533b5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/b20533b5 Branch: refs/heads/master Commit: b20533b5e4bfda5db867a944d16fd12bfc1621a7 Parents: 36a0f68 Author: Tatsuya.Nishiyama <[email protected]> Authored: Wed May 18 11:31:17 2016 -0700 Committer: Deron Eriksson <[email protected]> Committed: Wed May 18 11:31:17 2016 -0700 ---------------------------------------------------------------------- src/main/java/org/apache/sysml/parser/dml/Dml.g4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b20533b5/src/main/java/org/apache/sysml/parser/dml/Dml.g4 ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/parser/dml/Dml.g4 b/src/main/java/org/apache/sysml/parser/dml/Dml.g4 index 5fc63b8..f2d0f4e 100644 --- a/src/main/java/org/apache/sysml/parser/dml/Dml.g4 +++ b/src/main/java/org/apache/sysml/parser/dml/Dml.g4 @@ -98,7 +98,7 @@ functionStatement returns [ org.apache.sysml.parser.common.StatementInfo info ] // ------------------------------------------ // FunctionStatement & ExternalFunctionStatement // small change: only allow typed arguments here ... instead of data identifier - name=ID ('<-'|'=') 'function' '(' ( inputParams+=typedArgNoAssign (',' inputParams+=typedArgNoAssign)* )? ')' ( 'return' '(' ( outputParams+=typedArgNoAssign (',' outputParams+=typedArgNoAssign)* )? ')' )? '{' (body+=statement ';'*)* '}' # InternalFunctionDefExpression + name=ID ('<-'|'=') 'function' '(' ( inputParams+=typedArgNoAssign (',' inputParams+=typedArgNoAssign)* )? ')' ( 'return' '(' ( outputParams+=typedArgNoAssign (',' outputParams+=typedArgNoAssign)* )? ')' )? '{' (body+=statement ';'*)* '}' ';'* # InternalFunctionDefExpression | name=ID ('<-'|'=') 'externalFunction' '(' ( inputParams+=typedArgNoAssign (',' inputParams+=typedArgNoAssign)* )? ')' ( 'return' '(' ( outputParams+=typedArgNoAssign (',' outputParams+=typedArgNoAssign)* )? ')' )? 'implemented' 'in' '(' ( otherParams+=strictParameterizedKeyValueString (',' otherParams+=strictParameterizedKeyValueString)* )? ')' ';'* # ExternalFunctionDefExpression // ------------------------------------------ ;
