You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu> on 2022/06/22 01:13:00 UTC
Change in asterixdb-graph[master]: [NO-ISSUE][GRAPHIX] Fixing definition-body offset in grammar.
From Glenn Galvizo <gg...@uci.edu>:
Glenn Galvizo has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb-graph/+/16644 )
Change subject: [NO-ISSUE][GRAPHIX] Fixing definition-body offset in grammar.
......................................................................
[NO-ISSUE][GRAPHIX] Fixing definition-body offset in grammar.
Details:
- Definition body should be offset differently with and without parentheses.
Change-Id: I81c21e2029e7269d891249c9253b4ad69788a1cf
---
M asterix-graphix/src/main/resources/lang-extension/lang.txt
1 file changed, 8 insertions(+), 4 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb-graph refs/changes/44/16644/1
diff --git a/asterix-graphix/src/main/resources/lang-extension/lang.txt b/asterix-graphix/src/main/resources/lang-extension/lang.txt
index 5338219..99952bf 100644
--- a/asterix-graphix/src/main/resources/lang-extension/lang.txt
+++ b/asterix-graphix/src/main/resources/lang-extension/lang.txt
@@ -387,6 +387,7 @@
{
Pair<List<Integer>, List<List<String>>> primaryKeyFields;
Token beginPos = null, endPos = null;
+ int positionOffset = 0;
Expression vertexDefinitionExpr;
ElementLabel vertexLabel;
}
@@ -400,11 +401,12 @@
createNewScope();
}
(
- vertexDefinitionExpr = ViewBody() { endPos = token; }
+ vertexDefinitionExpr = ViewBody() { endPos = token; positionOffset++; }
| <LEFTPAREN> { beginPos = token; } vertexDefinitionExpr = ViewBody() { endPos = token; } <RIGHTPAREN>
)
{
- String vDef = extractFragment(beginPos.beginLine, beginPos.beginColumn + 1, endPos.endLine, endPos.endColumn + 1);
+ String vDef = extractFragment(beginPos.beginLine, beginPos.beginColumn + positionOffset, endPos.endLine,
+ endPos.endColumn + 1);
removeCurrentScope();
GraphConstructor.VertexConstructor vertexConstructor = new GraphConstructor.VertexConstructor(vertexLabel,
primaryKeyFields.second, primaryKeyFields.first, vertexDefinitionExpr, vDef);
@@ -431,6 +433,7 @@
Pair<List<Integer>, List<List<String>>> keyFields;
Token beginPos = null, endPos = null;
Expression edgeDefinitionExpr = null;
+ int positionOffset = 0;
List<Integer> destinationKeySourceIndicators = null;
List<Integer> sourceKeySourceIndicators = null;
@@ -457,7 +460,7 @@
createNewScope();
}
(
- edgeDefinitionExpr = SelectExpression(true) { endPos = token; }
+ edgeDefinitionExpr = SelectExpression(true) { endPos = token; positionOffset++; }
| <LEFTPAREN> { beginPos = token; } edgeDefinitionExpr = SelectExpression(true) { endPos = token; } <RIGHTPAREN>
)
)
@@ -476,7 +479,8 @@
String eDef = null;
if (edgeDefinitionExpr != null) {
- eDef = extractFragment(beginPos.beginLine, beginPos.beginColumn + 1, endPos.endLine, endPos.endColumn + 1);
+ eDef = extractFragment(beginPos.beginLine, beginPos.beginColumn + positionOffset, endPos.endLine,
+ endPos.endColumn + 1);
removeCurrentScope();
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb-graph/+/16644
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb-graph
Gerrit-Branch: master
Gerrit-Change-Id: I81c21e2029e7269d891249c9253b4ad69788a1cf
Gerrit-Change-Number: 16644
Gerrit-PatchSet: 1
Gerrit-Owner: Glenn Galvizo <gg...@uci.edu>
Gerrit-MessageType: newchange
Change in asterixdb-graph[master]: [NO-ISSUE][GRAPHIX] Fixing definition-body offset in grammar.
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Glenn Galvizo <gg...@uci.edu>:
Glenn Galvizo has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb-graph/+/16644 )
Change subject: [NO-ISSUE][GRAPHIX] Fixing definition-body offset in grammar.
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb-graph/+/16644
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb-graph
Gerrit-Branch: master
Gerrit-Change-Id: I81c21e2029e7269d891249c9253b4ad69788a1cf
Gerrit-Change-Number: 16644
Gerrit-PatchSet: 1
Gerrit-Owner: Glenn Galvizo <gg...@uci.edu>
Gerrit-Reviewer: Glenn Galvizo <gg...@uci.edu>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Comment-Date: Wed, 22 Jun 2022 02:01:25 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in asterixdb-graph[master]: [NO-ISSUE][GRAPHIX] Fixing definition-body offset in grammar.
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Glenn Galvizo <gg...@uci.edu>:
Glenn Galvizo has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb-graph/+/16644 )
Change subject: [NO-ISSUE][GRAPHIX] Fixing definition-body offset in grammar.
......................................................................
[NO-ISSUE][GRAPHIX] Fixing definition-body offset in grammar.
Details:
- Definition body should be offset differently with and without parentheses.
Change-Id: I81c21e2029e7269d891249c9253b4ad69788a1cf
---
M asterix-graphix/src/main/resources/lang-extension/lang.txt
1 file changed, 8 insertions(+), 4 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb-graph refs/changes/44/16644/1
diff --git a/asterix-graphix/src/main/resources/lang-extension/lang.txt b/asterix-graphix/src/main/resources/lang-extension/lang.txt
index 5338219..99952bf 100644
--- a/asterix-graphix/src/main/resources/lang-extension/lang.txt
+++ b/asterix-graphix/src/main/resources/lang-extension/lang.txt
@@ -387,6 +387,7 @@
{
Pair<List<Integer>, List<List<String>>> primaryKeyFields;
Token beginPos = null, endPos = null;
+ int positionOffset = 0;
Expression vertexDefinitionExpr;
ElementLabel vertexLabel;
}
@@ -400,11 +401,12 @@
createNewScope();
}
(
- vertexDefinitionExpr = ViewBody() { endPos = token; }
+ vertexDefinitionExpr = ViewBody() { endPos = token; positionOffset++; }
| <LEFTPAREN> { beginPos = token; } vertexDefinitionExpr = ViewBody() { endPos = token; } <RIGHTPAREN>
)
{
- String vDef = extractFragment(beginPos.beginLine, beginPos.beginColumn + 1, endPos.endLine, endPos.endColumn + 1);
+ String vDef = extractFragment(beginPos.beginLine, beginPos.beginColumn + positionOffset, endPos.endLine,
+ endPos.endColumn + 1);
removeCurrentScope();
GraphConstructor.VertexConstructor vertexConstructor = new GraphConstructor.VertexConstructor(vertexLabel,
primaryKeyFields.second, primaryKeyFields.first, vertexDefinitionExpr, vDef);
@@ -431,6 +433,7 @@
Pair<List<Integer>, List<List<String>>> keyFields;
Token beginPos = null, endPos = null;
Expression edgeDefinitionExpr = null;
+ int positionOffset = 0;
List<Integer> destinationKeySourceIndicators = null;
List<Integer> sourceKeySourceIndicators = null;
@@ -457,7 +460,7 @@
createNewScope();
}
(
- edgeDefinitionExpr = SelectExpression(true) { endPos = token; }
+ edgeDefinitionExpr = SelectExpression(true) { endPos = token; positionOffset++; }
| <LEFTPAREN> { beginPos = token; } edgeDefinitionExpr = SelectExpression(true) { endPos = token; } <RIGHTPAREN>
)
)
@@ -476,7 +479,8 @@
String eDef = null;
if (edgeDefinitionExpr != null) {
- eDef = extractFragment(beginPos.beginLine, beginPos.beginColumn + 1, endPos.endLine, endPos.endColumn + 1);
+ eDef = extractFragment(beginPos.beginLine, beginPos.beginColumn + positionOffset, endPos.endLine,
+ endPos.endColumn + 1);
removeCurrentScope();
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb-graph/+/16644
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb-graph
Gerrit-Branch: master
Gerrit-Change-Id: I81c21e2029e7269d891249c9253b4ad69788a1cf
Gerrit-Change-Number: 16644
Gerrit-PatchSet: 1
Gerrit-Owner: Glenn Galvizo <gg...@uci.edu>
Gerrit-MessageType: newchange