You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2018/02/08 10:49:37 UTC
[1/2] groovy git commit: add @since version
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_5_X 9ca13563c -> 2e6997ae2
add @since version
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/a746a4f1
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/a746a4f1
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/a746a4f1
Branch: refs/heads/GROOVY_2_5_X
Commit: a746a4f1af73d3c1b3067eb7e2339e35b137c74b
Parents: 9ca1356
Author: paulk <pa...@asert.com.au>
Authored: Thu Feb 8 20:42:07 2018 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Thu Feb 8 20:49:24 2018 +1000
----------------------------------------------------------------------
src/main/java/org/codehaus/groovy/ast/FieldNode.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/a746a4f1/src/main/java/org/codehaus/groovy/ast/FieldNode.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/ast/FieldNode.java b/src/main/java/org/codehaus/groovy/ast/FieldNode.java
index 70068ff..6799a14 100644
--- a/src/main/java/org/codehaus/groovy/ast/FieldNode.java
+++ b/src/main/java/org/codehaus/groovy/ast/FieldNode.java
@@ -134,15 +134,16 @@ public class FieldNode extends AnnotatedNode implements Opcodes, Variable {
return (modifiers & ACC_PUBLIC) != 0;
}
- /**
+ /**
* @return true if the field is protected
*/
public boolean isProtected() {
return (modifiers & ACC_PROTECTED) != 0;
}
- /**
+ /**
* @return true if the field is private
+ * @since 2.5.0
*/
public boolean isPrivate() {
return (modifiers & ACC_PRIVATE) != 0;
[2/2] groovy git commit: tweak error messages
Posted by pa...@apache.org.
tweak error messages
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/2e6997ae
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/2e6997ae
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/2e6997ae
Branch: refs/heads/GROOVY_2_5_X
Commit: 2e6997ae225601d6a28b84240e669a5714595b4e
Parents: a746a4f
Author: paulk <pa...@asert.com.au>
Authored: Thu Feb 8 20:46:47 2018 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Thu Feb 8 20:49:25 2018 +1000
----------------------------------------------------------------------
.../java/org/codehaus/groovy/classgen/AsmClassGenerator.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/2e6997ae/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java b/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java
index 1144b6e..0977934 100644
--- a/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java
+++ b/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java
@@ -923,7 +923,7 @@ public class AsmClassGenerator extends ClassGenerator {
if (Modifier.isProtected(fn.getModifiers()) && (samePackages || accessingNode.isDerivedFrom(declaringClass))) {
return true;
}
- if (!Modifier.isPrivate(fn.getModifiers())) {
+ if (!fn.isPrivate()) {
// package private is the only modifier left. It means same package is allowed, subclass not, same class is
return samePackages;
}
@@ -973,7 +973,7 @@ public class AsmClassGenerator extends ClassGenerator {
while (outer!=null) {
outerClassField = outer.getDeclaredField(name);
if (outerClassField!=null && outerClassField.isStatic() && outerClassField.isFinal()) {
- if (outer!=classNode.getOuterClass() && Modifier.isPrivate(outerClassField.getModifiers())) {
+ if (outer!=classNode.getOuterClass() && outerClassField.isPrivate()) {
throw new GroovyBugError("Trying to access private constant field ["+outerClassField.getDeclaringClass()+"#"+outerClassField.getName()+"] from inner class");
}
PropertyExpression pexp = new PropertyExpression(
@@ -1094,13 +1094,13 @@ public class AsmClassGenerator extends ClassGenerator {
}
if (fieldNode.isFinal()) {
- throw new RuntimeParserException("Can not modify final field[" + fieldName + "] of " + classNode.getName() + "'s super class", expression);
+ throw new RuntimeParserException("Cannot modify final field[" + fieldName + "] of " + classNode.getName() + "'s super class", expression);
}
MethodNode setter = findSetter(classNode, fieldNode);
if (fieldNode.isPrivate() && null == setter) {
- throw new RuntimeParserException("Can not access private field[" + fieldName + "] of " + classNode.getName() + "'s super class", expression);
+ throw new RuntimeParserException("Cannot access private field[" + fieldName + "] of " + classNode.getName() + "'s super class", expression);
}
mv.visitVarInsn(ALOAD, 0);