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 2017/01/28 16:08:13 UTC
[05/10] groovy git commit: GROOVY-8066: protected fields should be
disallowed in traits (closes #482)
GROOVY-8066: protected fields should be disallowed in traits (closes #482)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/636ef871
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/636ef871
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/636ef871
Branch: refs/heads/parrot
Commit: 636ef871bc8f8d201d1571e7beb135ee28f3fa16
Parents: 11c3711
Author: paulk <pa...@asert.com.au>
Authored: Fri Jan 27 12:52:47 2017 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Fri Jan 27 17:21:06 2017 +1000
----------------------------------------------------------------------
.../transform/trait/TraitASTTransformation.java | 6 ++++
src/test/groovy/bugs/Groovy8066Bug.groovy | 33 ++++++++++++++++++++
2 files changed, 39 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/636ef871/src/main/org/codehaus/groovy/transform/trait/TraitASTTransformation.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/transform/trait/TraitASTTransformation.java b/src/main/org/codehaus/groovy/transform/trait/TraitASTTransformation.java
index 6e852ce..f91ab4e 100644
--- a/src/main/org/codehaus/groovy/transform/trait/TraitASTTransformation.java
+++ b/src/main/org/codehaus/groovy/transform/trait/TraitASTTransformation.java
@@ -386,6 +386,12 @@ public class TraitASTTransformation extends AbstractASTTransformation implements
private void processField(final FieldNode field, final MethodNode initializer, final MethodNode staticInitializer, final ClassNode fieldHelper, final ClassNode trait, final Set<String> knownFields) {
+ if (field.isProtected()) {
+ unit.addError(new SyntaxException("Cannot have protected field in a trait (" + trait.getName() + "#" + field.getName() + ")",
+ field.getLineNumber(), field.getColumnNumber()));
+ return;
+ }
+
Expression initialExpression = field.getInitialExpression();
MethodNode selectedMethod = field.isStatic()?staticInitializer:initializer;
if (initialExpression != null && !field.isFinal()) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/636ef871/src/test/groovy/bugs/Groovy8066Bug.groovy
----------------------------------------------------------------------
diff --git a/src/test/groovy/bugs/Groovy8066Bug.groovy b/src/test/groovy/bugs/Groovy8066Bug.groovy
new file mode 100644
index 0000000..3d5520f
--- /dev/null
+++ b/src/test/groovy/bugs/Groovy8066Bug.groovy
@@ -0,0 +1,33 @@
+/*
+ * 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 groovy.bugs
+
+import gls.CompilableTestSupport
+
+class Groovy8066Bug extends CompilableTestSupport {
+ void testTraitWithProtectedFieldShouldGiveCompileError() {
+ def message = shouldNotCompile """
+ trait Foo {
+ protected String bar
+ }
+ class Baz implements Foo { }
+ """
+ assert message.contains('Cannot have protected field in a trait')
+ }
+}