You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by de...@apache.org on 2016/03/03 19:35:52 UTC
incubator-systemml git commit: Reference full Java class names in g4
files
Repository: incubator-systemml
Updated Branches:
refs/heads/master 8eee978ed -> dfdd774f6
Reference full Java class names in g4 files
Remove header imports for ExpressionInfo and StatementInfo.
This removes "The import ... is never used" warnings in Eclipse.
Closes #84.
Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/dfdd774f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/dfdd774f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/dfdd774f
Branch: refs/heads/master
Commit: dfdd774f6ea08354dedb5d772f561e2dc9841074
Parents: 8eee978
Author: Deron Eriksson <de...@us.ibm.com>
Authored: Thu Mar 3 10:32:56 2016 -0800
Committer: Deron Eriksson <de...@us.ibm.com>
Committed: Thu Mar 3 10:32:56 2016 -0800
----------------------------------------------------------------------
.../java/org/apache/sysml/parser/dml/Dml.g4 | 22 +++++++++-----------
.../java/org/apache/sysml/parser/pydml/Pydml.g4 | 22 +++++++++-----------
2 files changed, 20 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/dfdd774f/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 a07aece..e37b15c 100644
--- a/src/main/java/org/apache/sysml/parser/dml/Dml.g4
+++ b/src/main/java/org/apache/sysml/parser/dml/Dml.g4
@@ -39,18 +39,16 @@ grammar Dml;
* specific language governing permissions and limitations
* under the License.
*/
- import org.apache.sysml.parser.common.ExpressionInfo;
- import org.apache.sysml.parser.common.StatementInfo;
}
// DML Program is a list of expression
// For now, we only allow global function definitions (not nested or inside a while block)
programroot: (blocks+=statement | functionBlocks+=functionStatement)* EOF;
-statement returns [ StatementInfo info ]
+statement returns [ org.apache.sysml.parser.common.StatementInfo info ]
@init {
// This actions occurs regardless of how many alternatives in this rule
- $info = new StatementInfo();
+ $info = new org.apache.sysml.parser.common.StatementInfo();
} :
// ------------------------------------------
// ImportStatement
@@ -83,19 +81,19 @@ statement returns [ StatementInfo info ]
// ------------------------------------------
;
-iterablePredicate returns [ ExpressionInfo info ]
+iterablePredicate returns [ org.apache.sysml.parser.common.ExpressionInfo info ]
@init {
// This actions occurs regardless of how many alternatives in this rule
- $info = new ExpressionInfo();
+ $info = new org.apache.sysml.parser.common.ExpressionInfo();
} :
from=expression ':' to=expression #IterablePredicateColonExpression
| ID '(' from=expression ',' to=expression ',' increment=expression ')' #IterablePredicateSeqExpression
;
-functionStatement returns [ StatementInfo info ]
+functionStatement returns [ org.apache.sysml.parser.common.StatementInfo info ]
@init {
// This actions occurs regardless of how many alternatives in this rule
- $info = new StatementInfo();
+ $info = new org.apache.sysml.parser.common.StatementInfo();
} :
// ------------------------------------------
// FunctionStatement & ExternalFunctionStatement
@@ -107,10 +105,10 @@ functionStatement returns [ StatementInfo info ]
// Other data identifiers are typedArgNoAssign, parameterizedExpression and strictParameterizedExpression
-dataIdentifier returns [ ExpressionInfo dataInfo ]
+dataIdentifier returns [ org.apache.sysml.parser.common.ExpressionInfo dataInfo ]
@init {
// This actions occurs regardless of how many alternatives in this rule
- $dataInfo = new ExpressionInfo();
+ $dataInfo = new org.apache.sysml.parser.common.ExpressionInfo();
// $dataInfo.expr = new org.apache.sysml.parser.DataIdentifier();
} :
// ------------------------------------------
@@ -121,10 +119,10 @@ dataIdentifier returns [ ExpressionInfo dataInfo ]
| COMMANDLINE_NAMED_ID # CommandlineParamExpression
| COMMANDLINE_POSITION_ID # CommandlinePositionExpression
;
-expression returns [ ExpressionInfo info ]
+expression returns [ org.apache.sysml.parser.common.ExpressionInfo info ]
@init {
// This actions occurs regardless of how many alternatives in this rule
- $info = new ExpressionInfo();
+ $info = new org.apache.sysml.parser.common.ExpressionInfo();
// $info.expr = new org.apache.sysml.parser.BinaryExpression(org.apache.sysml.parser.Expression.BinaryOp.INVALID);
} :
// ------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/dfdd774f/src/main/java/org/apache/sysml/parser/pydml/Pydml.g4
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/pydml/Pydml.g4 b/src/main/java/org/apache/sysml/parser/pydml/Pydml.g4
index 10063c0..9072f74 100644
--- a/src/main/java/org/apache/sysml/parser/pydml/Pydml.g4
+++ b/src/main/java/org/apache/sysml/parser/pydml/Pydml.g4
@@ -39,8 +39,6 @@ grammar Pydml;
* specific language governing permissions and limitations
* under the License.
*/
- import org.apache.sysml.parser.common.ExpressionInfo;
- import org.apache.sysml.parser.common.StatementInfo;
}
// This antlr grammar is based on Python 3.3 language reference: https://docs.python.org/3.3/reference/grammar.html
@@ -154,10 +152,10 @@ programroot: (blocks+=statement | functionBlocks+=functionStatement)* NEWLINE*
-statement returns [ StatementInfo info ]
+statement returns [ org.apache.sysml.parser.common.StatementInfo info ]
@init {
// This actions occurs regardless of how many alternatives in this rule
- $info = new StatementInfo();
+ $info = new org.apache.sysml.parser.common.StatementInfo();
} :
// ------------------------------------------
// ImportStatement
@@ -191,19 +189,19 @@ statement returns [ StatementInfo info ]
| NEWLINE #IgnoreNewLine
;
-iterablePredicate returns [ ExpressionInfo info ]
+iterablePredicate returns [ org.apache.sysml.parser.common.ExpressionInfo info ]
@init {
// This actions occurs regardless of how many alternatives in this rule
- $info = new ExpressionInfo();
+ $info = new org.apache.sysml.parser.common.ExpressionInfo();
} :
from=expression ':' to=expression #IterablePredicateColonExpression
| ID OPEN_PAREN from=expression ',' to=expression ',' increment=expression CLOSE_PAREN #IterablePredicateSeqExpression
;
-functionStatement returns [ StatementInfo info ]
+functionStatement returns [ org.apache.sysml.parser.common.StatementInfo info ]
@init {
// This actions occurs regardless of how many alternatives in this rule
- $info = new StatementInfo();
+ $info = new org.apache.sysml.parser.common.StatementInfo();
} :
// ------------------------------------------
// FunctionStatement & ExternalFunctionStatement
@@ -215,10 +213,10 @@ functionStatement returns [ StatementInfo info ]
// Other data identifiers are typedArgNoAssign, parameterizedExpression and strictParameterizedExpression
-dataIdentifier returns [ ExpressionInfo dataInfo ]
+dataIdentifier returns [ org.apache.sysml.parser.common.ExpressionInfo dataInfo ]
@init {
// This actions occurs regardless of how many alternatives in this rule
- $dataInfo = new ExpressionInfo();
+ $dataInfo = new org.apache.sysml.parser.common.ExpressionInfo();
// $dataInfo.expr = new org.apache.sysml.parser.DataIdentifier();
} :
// ------------------------------------------
@@ -229,10 +227,10 @@ dataIdentifier returns [ ExpressionInfo dataInfo ]
| COMMANDLINE_NAMED_ID # CommandlineParamExpression
| COMMANDLINE_POSITION_ID # CommandlinePositionExpression
;
-expression returns [ ExpressionInfo info ]
+expression returns [ org.apache.sysml.parser.common.ExpressionInfo info ]
@init {
// This actions occurs regardless of how many alternatives in this rule
- $info = new ExpressionInfo();
+ $info = new org.apache.sysml.parser.common.ExpressionInfo();
// $info.expr = new org.apache.sysml.parser.BinaryExpression(org.apache.sysml.parser.Expression.BinaryOp.INVALID);
} :
// ------------------------------------------