[tinkerpop] 01/04: Added a "differences" section to GLVs to call out differences from Gremlin java CTR

[sp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 22bda83512645a7e0ea5ba5e91bea7ff0bc316e0
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Thu Jul 25 11:35:15 2019 -0400

    Added a "differences" section to GLVs to call out differences from Gremlin java CTR
---
 docs/src/reference/gremlin-variants.asciidoc | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/docs/src/reference/gremlin-variants.asciidoc b/docs/src/reference/gremlin-variants.asciidoc
index 67e89e3..e3581fc 100644
--- a/docs/src/reference/gremlin-variants.asciidoc
+++ b/docs/src/reference/gremlin-variants.asciidoc
@@ -598,9 +598,12 @@ Gremlin-Java constructs. Moreover, given its scripting nature, Gremlin-Groovy se
 ----
 compile group: 'org.apache.tinkerpop', name: 'gremlin-core', version: '3.3.4'
 compile group: 'org.apache.tinkerpop', name: 'gremlin-driver', version: '3.3.4'
-----
+---- 
+
+[[gremlin-groovy-differences]
+=== Differences
 
-WARNING: In Groovy, `as`, `in`, and `not` are reserved words. Gremlin-Groovy does not allow these steps to be called
+In Groovy, `as`, `in`, and `not` are reserved words. Gremlin-Groovy does not allow these steps to be called
 statically from the anonymous traversal `+__+` and therefore, must always be prefixed with `+__.+` For instance:
 `+g.V().as('a').in().as('b').where(__.not(__.as('a').out().as('b')))+`
 
@@ -951,6 +954,17 @@ g.V().both()[1].toList()
 g.V().both().name.toList()
 ----
 
+[[gremlin-python-differences]
+=== Differences
+
+In situations where Python reserved words and global functions overlap with standard Gremlin steps and tokens, those
+bits of conflicting Gremlin get an underscore appended as a suffix:
+
+*Steps* - <<and-step,and_()>>, <<as-step,as_()>>, <<from-step,from_()>>, <<is-step,is_()>>, <<in-step,in_()>>,
+<<not-step,not_()>>, <<or-step,or_()>>, <<with-step,with_()>>
+
+*Tokens* - <<a-note-on-scopes,Scope.global_>>
+
 === Limitations
 
 * Traversals that return a `Set` *might* be coerced to a `List` in Python. In the case of Python, number equality
@@ -1304,3 +1318,11 @@ const g = traversal(SocialTraversalSource).withRemote(connection);
 g.person('marko').aged(29).values('name').toList().
   then(names => console.log(names));
 ----
+
+[[gremlin-javascript-differences]
+=== Differences
+
+In situations where Javascript reserved words and global functions overlap with standard Gremlin steps and tokens, those
+bits of conflicting Gremlin get an underscore appended as a suffix:
+
+*Steps* - <<from-step,from_()>>, <<in-step,in_()>>, <<with-step,with_()>>