You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2018/03/20 10:54:58 UTC
groovy git commit: Make `AstBuilder` and `AstStringCompiler` compile
static
Repository: groovy
Updated Branches:
refs/heads/master 73b094291 -> 560822ad5
Make `AstBuilder` and `AstStringCompiler` compile static
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/560822ad
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/560822ad
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/560822ad
Branch: refs/heads/master
Commit: 560822ad5b730487a9c9bfd9e960af27c266f695
Parents: 73b0942
Author: sunlan <su...@apache.org>
Authored: Tue Mar 20 18:54:00 2018 +0800
Committer: sunlan <su...@apache.org>
Committed: Tue Mar 20 18:54:00 2018 +0800
----------------------------------------------------------------------
src/main/groovy/groovy/lang/GroovyCodeSource.java | 2 +-
.../groovy/org/codehaus/groovy/ast/builder/AstBuilder.groovy | 5 +++--
.../org/codehaus/groovy/ast/builder/AstStringCompiler.groovy | 4 +++-
3 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/560822ad/src/main/groovy/groovy/lang/GroovyCodeSource.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/GroovyCodeSource.java b/src/main/groovy/groovy/lang/GroovyCodeSource.java
index a5a2bb1..18e84f1 100644
--- a/src/main/groovy/groovy/lang/GroovyCodeSource.java
+++ b/src/main/groovy/groovy/lang/GroovyCodeSource.java
@@ -210,7 +210,7 @@ public class GroovyCodeSource {
return encoding;
}
- CodeSource getCodeSource() {
+ public CodeSource getCodeSource() {
return codeSource;
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/560822ad/src/main/groovy/org/codehaus/groovy/ast/builder/AstBuilder.groovy
----------------------------------------------------------------------
diff --git a/src/main/groovy/org/codehaus/groovy/ast/builder/AstBuilder.groovy b/src/main/groovy/org/codehaus/groovy/ast/builder/AstBuilder.groovy
index 24dcdd6..3c5efc9 100644
--- a/src/main/groovy/org/codehaus/groovy/ast/builder/AstBuilder.groovy
+++ b/src/main/groovy/org/codehaus/groovy/ast/builder/AstBuilder.groovy
@@ -18,6 +18,7 @@
*/
package org.codehaus.groovy.ast.builder
+import groovy.transform.CompileStatic
import org.codehaus.groovy.ast.ASTNode
import org.codehaus.groovy.ast.stmt.BlockStatement
import org.codehaus.groovy.control.CompilePhase
@@ -33,7 +34,7 @@ import org.codehaus.groovy.control.CompilePhase
*
* @author Hamlet D'Arcy
*/
-
+@CompileStatic
public class AstBuilder {
/**
@@ -142,4 +143,4 @@ Are you sure you are using it correctly?
def properties = new AstSpecificationCompiler(specification)
return properties.expression
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/groovy/blob/560822ad/src/main/groovy/org/codehaus/groovy/ast/builder/AstStringCompiler.groovy
----------------------------------------------------------------------
diff --git a/src/main/groovy/org/codehaus/groovy/ast/builder/AstStringCompiler.groovy b/src/main/groovy/org/codehaus/groovy/ast/builder/AstStringCompiler.groovy
index 1ea3970..ec18993 100644
--- a/src/main/groovy/org/codehaus/groovy/ast/builder/AstStringCompiler.groovy
+++ b/src/main/groovy/org/codehaus/groovy/ast/builder/AstStringCompiler.groovy
@@ -18,6 +18,7 @@
*/
package org.codehaus.groovy.ast.builder
+import groovy.transform.CompileStatic
import groovy.transform.PackageScope
import org.codehaus.groovy.ast.ASTNode
import org.codehaus.groovy.ast.ModuleNode
@@ -30,6 +31,7 @@ import org.codehaus.groovy.control.CompilerConfiguration
*
* @author Hamlet D'Arcy
*/
+@CompileStatic
@PackageScope class AstStringCompiler {
/**
@@ -49,7 +51,7 @@ import org.codehaus.groovy.control.CompilerConfiguration
cu.addSource(codeSource.getName(), script);
cu.compile(compilePhase.getPhaseNumber())
// collect all the ASTNodes into the result, possibly ignoring the script body if desired
- return cu.ast.modules.inject([]) {List acc, ModuleNode node ->
+ return (List<ASTNode>) cu.getAST().modules.inject([]) {List acc, ModuleNode node ->
if (node.statementBlock) acc.add(node.statementBlock)
node.classes?.each {
if (!(it.name == scriptClassName && statementsOnly)) {