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 2017/04/11 01:38:05 UTC
[29/50] groovy git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/groovy into parrot
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/groovy into parrot
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/5392eb4f
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/5392eb4f
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/5392eb4f
Branch: refs/heads/master
Commit: 5392eb4fa0970fb7036fc2730ec5f177af278039
Parents: a033231 84462bb
Author: sunlan <su...@apache.org>
Authored: Sun Jan 29 00:07:35 2017 +0800
Committer: sunlan <su...@apache.org>
Committed: Sun Jan 29 00:07:35 2017 +0800
----------------------------------------------------------------------
src/main/groovy/lang/MetaClassImpl.java | 21 +++++----
.../groovy/antlr/AntlrParserPlugin.java | 19 +++++++-
src/main/org/codehaus/groovy/ast/ASTNode.java | 2 +-
.../asm/sc/StaticTypesCallSiteWriter.java | 2 +-
.../groovy/transform/LogASTTransformation.java | 24 ++++++----
.../trait/SuperCallTraitTransformer.java | 44 ++++++++++--------
.../transform/trait/TraitASTTransformation.java | 6 +++
.../codehaus/groovy/transform/trait/Traits.java | 2 +-
src/test/groovy/bugs/Groovy5318Bug.groovy | 30 ++++++++++++
src/test/groovy/bugs/Groovy8060Bug.groovy | 39 ++++++++++++++++
src/test/groovy/bugs/Groovy8065Bug.groovy | 48 ++++++++++++++++++++
src/test/groovy/bugs/Groovy8066Bug.groovy | 33 ++++++++++++++
12 files changed, 229 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/5392eb4f/src/main/groovy/lang/MetaClassImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/5392eb4f/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java
----------------------------------------------------------------------
diff --cc src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java
index a1d18bf,c34be18..37bfe88
--- a/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java
+++ b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java
@@@ -627,12 -626,12 +627,12 @@@ public class StaticTypesCallSiteWriter
ClassNode classNode = controller.getClassNode();
ClassNode rType = typeChooser.resolveType(receiver, classNode);
ClassNode aType = typeChooser.resolveType(arguments, classNode);
- if (trySubscript(receiver, message, arguments, rType, aType)) {
+ if (trySubscript(receiver, message, arguments, rType, aType, safe)) {
return;
}
- // new try with flow type instead of declaration type
+ // now try with flow type instead of declaration type
rType = receiver.getNodeMetaData(StaticTypesMarker.INFERRED_TYPE);
- if (rType!=null && trySubscript(receiver, message, arguments, rType, aType)) {
+ if (rType!=null && trySubscript(receiver, message, arguments, rType, aType, safe)) {
return;
}
// todo: more cases