You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by jo...@apache.org on 2017/12/05 13:18:24 UTC

[1/2] tinkerpop git commit: Gremlin.Net: fix generation of Constant() and Fold() steps

Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 7e17d4fa0 -> b3adadc32


Gremlin.Net: fix generation of Constant() and Fold() steps


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/aa149282
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/aa149282
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/aa149282

Branch: refs/heads/tp32
Commit: aa14928245ed98565dcd4e7f6d21b1a573d76a56
Parents: bc515bb
Author: Jorge Bay Gondra <jo...@gmail.com>
Authored: Fri Dec 1 12:52:15 2017 +0100
Committer: Jorge Bay Gondra <jo...@gmail.com>
Committed: Fri Dec 1 12:54:46 2017 +0100

----------------------------------------------------------------------
 .travis.yml                                     |  2 +-
 gremlin-dotnet/glv/generate.groovy              | 58 +++++++++++++-------
 .../Process/Traversal/GraphTraversal.cs         |  4 +-
 .../src/Gremlin.Net/Process/Traversal/__.cs     |  4 +-
 4 files changed, 44 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aa149282/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index b626b17..9b7029c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,4 +15,4 @@ before_install:
 jobs:
   include:
     - script: "mvn clean install -Dci"
-    - script: "touch gremlin-dotnet/src/.glv && touch gremlin-dotnet/test/.glv && mvn clean install -pl :gremlin-dotnet-tests -P gremlin-dotnet -DskipIntegrationTests=false"
\ No newline at end of file
+    - script: "touch gremlin-dotnet/src/.glv && touch gremlin-dotnet/test/.glv && mvn clean install -pl :gremlin-dotnet,:gremlin-dotnet-tests -P gremlin-dotnet -DskipIntegrationTests=false"
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aa149282/gremlin-dotnet/glv/generate.groovy
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/glv/generate.groovy b/gremlin-dotnet/glv/generate.groovy
index ad22116..52ca165 100644
--- a/gremlin-dotnet/glv/generate.groovy
+++ b/gremlin-dotnet/glv/generate.groovy
@@ -25,6 +25,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.P
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
 import org.apache.tinkerpop.gremlin.structure.Direction
 import java.lang.reflect.Modifier
+import java.lang.reflect.TypeVariable
 
 def toCSharpTypeMap = ["Long": "long",
                        "Integer": "int",
@@ -115,8 +116,17 @@ def getJavaParameterTypeNames = { method ->
             } 
 }
 
-def toCSharpParamString = { param ->
-    csharpParamTypeName = toCSharpType(param.type.simpleName)
+def toCSharpParamString = { param, genTypeName ->
+    String csharpParamTypeName = genTypeName;
+    if (csharpParamTypeName == null){
+        csharpParamTypeName = toCSharpType(param.type.simpleName)
+    }
+    else if (csharpParamTypeName == "M") {
+        csharpParamTypeName = "object";
+    }
+    else if (csharpParamTypeName == "A" || csharpParamTypeName == "B") {
+        csharpParamTypeName = "E2";
+    }
     "${csharpParamTypeName} ${param.name}"
     }
 
@@ -131,22 +141,32 @@ def getCSharpParamTypeString = { method ->
             }.join(",")
 }
 
-def getCSharpParamString = { method ->
+def getCSharpParamString = { method, useGenericParams ->
     def parameters = method.parameters;
     if (parameters.length == 0)
-        return ""        
+        return ""
+
+    def genericTypes = method.getGenericParameterTypes();
     def csharpParameters = parameters.
-            init().
-            collect { param ->
-                toCSharpParamString(param)
-            };
-    def lastCSharpParam = "";
-    if (method.isVarArgs())
-        lastCSharpParam += "params ";
-    lastCSharpParam += toCSharpParamString(parameters.last())
-    csharpParameters += lastCSharpParam
-    csharpParamString = csharpParameters.join(", ")
-    csharpParamString
+            toList().indexed().
+            collect { index, param ->
+                String genTypeName = null
+                if (useGenericParams) {
+                    def genType = genericTypes[index]
+                    if (genType instanceof TypeVariable<?>) {
+                        genTypeName = ((TypeVariable<?>)genType).name
+                    }
+                }
+                toCSharpParamString(param, genTypeName)
+            }.
+            toArray();
+
+    if (method.isVarArgs()) {
+        def lastIndex = csharpParameters.length-1;
+        csharpParameters[lastIndex] = "params " + csharpParameters[lastIndex];
+    }
+
+    csharpParameters.join(", ")
 }
 
 def getParamNames = { parameters ->
@@ -209,7 +229,7 @@ def binding = ["pmethods": P.class.getMethods().
                         sort { a, b -> a.name <=> b.name ?: getJavaParamTypeString(a) <=> getJavaParamTypeString(b) }.
                         unique { a,b -> a.name <=> b.name ?: getCSharpParamTypeString(a) <=> getCSharpParamTypeString(b) }.
                         collect { javaMethod ->
-                            def parameters = getCSharpParamString(javaMethod)
+                            def parameters = getCSharpParamString(javaMethod, false)
                             def paramNames = getParamNames(javaMethod.parameters)
                             return ["methodName": javaMethod.name, "parameters":parameters, "paramNames":paramNames]
                         },
@@ -220,7 +240,7 @@ def binding = ["pmethods": P.class.getMethods().
                         unique { a,b -> a.name <=> b.name ?: getCSharpParamTypeString(a) <=> getCSharpParamTypeString(b) }.
                         collect { javaMethod ->
                             def typeArguments = javaMethod.genericReturnType.actualTypeArguments.collect{t -> ((java.lang.Class)t).simpleName}
-                            def parameters = getCSharpParamString(javaMethod)
+                            def parameters = getCSharpParamString(javaMethod, false)
                             def paramNames = getParamNames(javaMethod.parameters)
                             return ["methodName": javaMethod.name, "typeArguments": typeArguments, "parameters":parameters, "paramNames":paramNames]
                         },
@@ -235,7 +255,7 @@ def binding = ["pmethods": P.class.getMethods().
                             def t1 = toCSharpType(typeNames[0])
                             def t2 = toCSharpType(typeNames[1])
                             def tParam = getCSharpGenericTypeParam(t2)
-                            def parameters = getCSharpParamString(javaMethod)
+                            def parameters = getCSharpParamString(javaMethod, true)
                             def paramNames = getParamNames(javaMethod.parameters)
                             return ["methodName": javaMethod.name, "t1":t1, "t2":t2, "tParam":tParam, "parameters":parameters, "paramNames":paramNames]
                         },
@@ -255,7 +275,7 @@ def binding = ["pmethods": P.class.getMethods().
                                 t2 = specificTypes[0]
                                 tParam = specificTypes.size() > 1 ? "<" + specificTypes[1] + ">" : ""
                             }
-                            def parameters = getCSharpParamString(javaMethod)
+                            def parameters = getCSharpParamString(javaMethod, true)
                             def paramNames = getParamNames(javaMethod.parameters)
                             def callGenericTypeArg = hasMethodNoGenericCounterPartInGraphTraversal(javaMethod) ? "" : tParam
                             def graphTraversalT2 = getGraphTraversalT2ForT2(t2)

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aa149282/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 601e381..e3eb190 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
@@ -420,7 +420,7 @@ namespace Gremlin.Net.Process.Traversal
         /// <summary>
         ///     Adds the constant step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal< S , E2 > Constant<E2> (object e)
+        public GraphTraversal< S , E2 > Constant<E2> (E2 e)
         {
             Bytecode.AddStep("constant", e);
             return Wrap< S , E2 >(this);
@@ -559,7 +559,7 @@ namespace Gremlin.Net.Process.Traversal
         /// <summary>
         ///     Adds the fold step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal< S , E2 > Fold<E2> (object seed, object foldFunction)
+        public GraphTraversal< S , E2 > Fold<E2> (E2 seed, object foldFunction)
         {
             Bytecode.AddStep("fold", seed, foldFunction);
             return Wrap< S , E2 >(this);

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aa149282/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs
index c9ced7b..1788bad 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs
@@ -289,7 +289,7 @@ namespace Gremlin.Net.Process.Traversal
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the constant step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, E2> Constant<E2>(object a)
+        public static GraphTraversal<object, E2> Constant<E2>(E2 a)
         {
             return new GraphTraversal<object, E2>().Constant<E2>(a);            
         }
@@ -413,7 +413,7 @@ namespace Gremlin.Net.Process.Traversal
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the fold step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, E2> Fold<E2>(object seed, object foldFunction)
+        public static GraphTraversal<object, E2> Fold<E2>(E2 seed, object foldFunction)
         {
             return new GraphTraversal<object, E2>().Fold<E2>(seed, foldFunction);            
         }


[2/2] tinkerpop git commit: Merge branch 'TINKERPOP-1825' into tp32

Posted by jo...@apache.org.
Merge branch 'TINKERPOP-1825' into tp32


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b3adadc3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b3adadc3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b3adadc3

Branch: refs/heads/tp32
Commit: b3adadc321f96ce4645021af7b3a8b0c90df5610
Parents: 7e17d4f aa14928
Author: Jorge Bay Gondra <jo...@gmail.com>
Authored: Tue Dec 5 14:15:05 2017 +0100
Committer: Jorge Bay Gondra <jo...@gmail.com>
Committed: Tue Dec 5 14:15:05 2017 +0100

----------------------------------------------------------------------
 .travis.yml                                     |  2 +-
 gremlin-dotnet/glv/generate.groovy              | 58 +++++++++++++-------
 .../Process/Traversal/GraphTraversal.cs         |  4 +-
 .../src/Gremlin.Net/Process/Traversal/__.cs     |  4 +-
 4 files changed, 44 insertions(+), 24 deletions(-)
----------------------------------------------------------------------