You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by fl...@apache.org on 2018/10/09 14:30:33 UTC
[tinkerpop] 01/01: Merge branch 'TINKERPOP-1972' into
TINKERPOP-1972-tp33
This is an automated email from the ASF dual-hosted git repository.
florianhockmann pushed a commit to branch TINKERPOP-1972-tp33
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit e4765ea40c68f52ef09b3167760da8742450548a
Merge: 87b1524 dee155e
Author: Florian Hockmann <fh...@florian-hockmann.de>
AuthorDate: Tue Oct 9 16:29:05 2018 +0200
Merge branch 'TINKERPOP-1972' into TINKERPOP-1972-tp33
gremlin-dotnet/glv/GraphTraversal.template | 5 +++--
gremlin-dotnet/glv/GraphTraversalSource.template | 5 +++--
gremlin-dotnet/glv/generate.groovy | 16 +++++++---------
.../Gremlin.Net/Process/Traversal/GraphTraversal.cs | 5 +++--
.../Process/Traversal/GraphTraversalSource.cs | 5 +++--
.../Gherkin/GherkinTestRunner.cs | 6 +++---
.../Gherkin/TraversalEvaluation/TraversalParser.cs | 21 +++++++++++++++++++--
.../BytecodeGeneration/BytecodeGenerationTests.cs | 12 ++++++++++++
8 files changed, 53 insertions(+), 22 deletions(-)
diff --cc gremlin-dotnet/glv/generate.groovy
index e542471,2d8b005..f39680c
--- a/gremlin-dotnet/glv/generate.groovy
+++ b/gremlin-dotnet/glv/generate.groovy
@@@ -270,15 -282,10 +268,15 @@@ def binding = ["pmethods": P.class.getM
def t1 = toCSharpType(typeNames[0])
def t2 = toCSharpType(typeNames[1])
def tParam = getCSharpGenericTypeParam(t2)
+ def specificTypes = methodsWithSpecificTypes.get(javaMethod.name)
+ if (specificTypes) {
+ t2 = specificTypes[0]
+ tParam = specificTypes.size() > 1 ? "<" + specificTypes[1] + ">" : ""
+ }
def parameters = getCSharpParamString(javaMethod, true)
def paramNames = getParamNames(javaMethod.parameters)
- def argsListType = getArgsListType(parameters)
- return ["methodName": javaMethod.name, "t1":t1, "t2":t2, "tParam":tParam, "parameters":parameters, "paramNames":paramNames, "argsListType":argsListType]
+ def isArgsCastNecessary = isParamsArgCastNecessary(parameters)
+ return ["methodName": javaMethod.name, "t1":t1, "t2":t2, "tParam":tParam, "parameters":parameters, "paramNames":paramNames, "isArgsCastNecessary":isArgsCastNecessary]
},
"anonStepMethods": __.class.getMethods().
findAll { GraphTraversal.class.equals(it.returnType) }.