Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-1975-x e1cd83d0f -> 727941315
wip Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/72794131 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/72794131 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/72794131 Branch: refs/heads/TINKERPOP-1975-x Commit: 7279413157351a20ea46db9b48d87d58b9281875 Parents: e1cd83d Author: Stephen Mallette <[email protected]> Authored: Thu May 31 13:27:38 2018 -0400 Committer: Stephen Mallette <[email protected]> Committed: Thu May 31 13:27:38 2018 -0400 ---------------------------------------------------------------------- .../gremlin/process/traversal/dsl/graph/GraphTraversalTest.java | 2 +- .../src/Gremlin.Net/Process/Traversal/GraphTraversal.cs | 4 ++-- gremlin-javascript/glv/generate.groovy | 3 ++- .../javascript/gremlin-javascript/lib/process/graph-traversal.js | 2 +- gremlin-python/glv/generate.groovy | 1 + .../src/main/jython/gremlin_python/process/graph_traversal.py | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/72794131/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalTest.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalTest.java index 6decbe0..9009d0b 100644 --- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalTest.java +++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalTest.java @@ -42,7 +42,7 @@ import static org.junit.Assert.assertEquals; public class GraphTraversalTest { private static final Logger logger = LoggerFactory.getLogger(GraphTraversalTest.class); - private static Set<String> NO_GRAPH = new HashSet<>(Arrays.asList("asAdmin", "by", "option", "iterate", "to", "from", "profile", "pageRank", "peerPressure", "program", "none")); + private static Set<String> NO_GRAPH = new HashSet<>(Arrays.asList("asAdmin", "by", "with", "option", "iterate", "to", "from", "profile", "pageRank", "peerPressure", "program", "none")); private static Set<String> NO_ANONYMOUS = new HashSet<>(Arrays.asList("start", "__")); private static Set<String> IGNORES_BYTECODE = new HashSet<>(Arrays.asList("asAdmin", "iterate", "mapValues", "mapKeys")); http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/72794131/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs ---------------------------------------------------------------------- diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs index bb3d5d8..537cdbe 100644 --- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs +++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs @@ -1679,9 +1679,9 @@ namespace Gremlin.Net.Process.Traversal /// <summary> /// Adds the with step to this <see cref="GraphTraversal{SType, EType}" />. /// </summary> - public GraphTraversal<S, E> With (StepConfiguration modulation) + public GraphTraversal<S, E> With (string key, object value) { - Bytecode.AddStep("with", modulation); + Bytecode.AddStep("with", key, value); return Wrap<S, E>(this); } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/72794131/gremlin-javascript/glv/generate.groovy ---------------------------------------------------------------------- diff --git a/gremlin-javascript/glv/generate.groovy b/gremlin-javascript/glv/generate.groovy index 8fd22e3..8778e89 100644 --- a/gremlin-javascript/glv/generate.groovy +++ b/gremlin-javascript/glv/generate.groovy @@ -28,7 +28,8 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__ import java.lang.reflect.Modifier def toJsMap = ["in": "in_", - "from": "from_"] + "from": "from_", + "with": "with_"] def toJs = { symbol -> toJsMap.getOrDefault(symbol, symbol) } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/72794131/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.js ---------------------------------------------------------------------- diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.js index 901f9b0..f143542 100644 --- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.js +++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.js @@ -1137,7 +1137,7 @@ class GraphTraversal extends Traversal { * @param {...Object} args * @returns {GraphTraversal} */ - with(...args) { + with_(...args) { this.bytecode.addStep('with', args); return this; } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/72794131/gremlin-python/glv/generate.groovy ---------------------------------------------------------------------- diff --git a/gremlin-python/glv/generate.groovy b/gremlin-python/glv/generate.groovy index 58d0cd3..57cc9c9 100644 --- a/gremlin-python/glv/generate.groovy +++ b/gremlin-python/glv/generate.groovy @@ -30,6 +30,7 @@ def toPythonMap = ["global": "global_", "as": "as_", "in": "in_", "and": "and_", + "with": "with_", "or": "or_", "is": "is_", "not": "not_", http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/72794131/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py ---------------------------------------------------------------------- diff --git a/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py b/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py index a492f9c..bb81d87 100644 --- a/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py +++ b/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py @@ -505,7 +505,7 @@ class GraphTraversal(Traversal): self.bytecode.add_step("where", *args) return self - def with(self, *args): + def with_(self, *args): self.bytecode.add_step("with", *args) return self
