You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/02/26 20:36:25 UTC
[3/4] incubator-tinkerpop git commit: With the bump to groovy 2.4.6
this class is no longer needed.
With the bump to groovy 2.4.6 this class is no longer needed.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/3447b02d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/3447b02d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/3447b02d
Branch: refs/heads/tp31
Commit: 3447b02dc2220161bd191b482e95ad709d6571e5
Parents: 73489b3
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Feb 25 09:05:36 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Feb 25 09:05:36 2016 -0500
----------------------------------------------------------------------
.../jsr223/GremlinVariableAnalyzer.groovy | 104 -------------------
1 file changed, 104 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3447b02d/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinVariableAnalyzer.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinVariableAnalyzer.groovy b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinVariableAnalyzer.groovy
deleted file mode 100644
index 1d1bcbe..0000000
--- a/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinVariableAnalyzer.groovy
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.groovy.jsr223
-
-import org.codehaus.groovy.ast.DynamicVariable
-import org.codehaus.groovy.ast.GroovyClassVisitor
-import org.codehaus.groovy.ast.expr.VariableExpression
-import org.codehaus.groovy.control.CompilationUnit
-import org.codehaus.groovy.control.CompilerConfiguration
-import org.codehaus.groovy.control.Phases
-import org.codehaus.groovy.tools.shell.util.ScriptVariableAnalyzer
-
-import java.security.CodeSource
-
-/**
- * An extension of Groovy's {@code VariableVisitor} that exposes the bound and unbound variables publicly. This
- * class can likely be removed with the next update of Groovy (after 2.4.5) as the {code ScriptVariableAnalyzer} ends
- * up exposing {@code getBoundVars() in such a way as to allow for the {@code ClassLoader} to be supplied.
- */
-class GremlinVariableAnalyzer {
- public static class GremlinVariableVisitor extends ScriptVariableAnalyzer.VariableVisitor {
- String lastBound
-
- @Override
- void visitVariableExpression(VariableExpression expression) {
- if (!(expression.variable in ['args', 'context', 'this', 'super'])) {
- if (expression.accessedVariable instanceof DynamicVariable) {
- unbound << expression.variable
- } else {
- bound << expression.variable
- lastBound = bound
- }
- }
- super.visitVariableExpression(expression)
- }
-
- @Override
- public Set<String> getBound() {
- return super.getBound()
- }
-
- @Override
- public Set<String> getUnbound() {
- return super.getUnbound()
- }
- }
-
- public static class GremlinVisitorClassLoader extends GroovyClassLoader {
- private final GroovyClassVisitor visitor
-
- public GremlinVisitorClassLoader(final GroovyClassVisitor visitor, ClassLoader parent) {
- super(parent == null ? Thread.currentThread().getContextClassLoader() : parent)
- this.visitor = visitor
- }
-
- @Override
- protected CompilationUnit createCompilationUnit(final CompilerConfiguration config, final CodeSource source) {
- CompilationUnit cu = super.createCompilationUnit(config, source)
- cu.addPhaseOperation(new ScriptVariableAnalyzer.VisitorSourceOperation(visitor), Phases.CLASS_GENERATION)
- return cu
- }
- }
-
- public static BoundVars getBoundVars(final String scriptText, ClassLoader parent) {
- assert scriptText != null
- final GroovyClassVisitor visitor = new GremlinVariableVisitor()
- new GremlinVisitorClassLoader(visitor, parent).parseClass(scriptText)
- return new BoundVars(visitor.getLastBound(), visitor.getBound())
- }
-
- public static class BoundVars {
- private String lastBound;
- private Set<String> bound;
-
- BoundVars(String lastBound, Set<String> bound) {
- this.lastBound = lastBound
- this.bound = bound
- }
-
- String getLastBound() {
- return lastBound
- }
-
- Set<String> getBound() {
- return bound
- }
- }
-}