Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes in candy merge: inner classes are properly added & generic method signature are handled #77

Merged
merged 2 commits into from
Feb 21, 2016
Merged

fixes in candy merge: inner classes are properly added & generic method signature are handled #77

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fd6c30
fixed inner classes merge
lgrignon Feb 21, 2016
b62e6ef
fixed issue with generic signature in candy merge
lgrignon Feb 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 41 additions & 14 deletions src/main/java/org/jsweet/transpiler/candies/CandiesMerger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public Map<Class<?>, List<Class<?>>> merge() {

logger.debug("mixin classes: " + mixinsClasses);
Map<Class<?>, List<Class<?>>> toBeMerged = new HashMap<>();
// adds mixins from @Root annotation infos
// adds mixins from @Root annotation infos
for (Class<?> mixin : mixinsClasses) {
Class<?> target = getProperty(getAnnotation(mixin, ANNOTATION_MIXIN), "target");
List<Class<?>> mixins = toBeMerged.get(target);
Expand Down Expand Up @@ -225,21 +225,22 @@ private void findMixinClasses(File dir, List<Class<?>> mixinClasses) {
if (packageInfo != null) {
for (Map.Entry<File, ClassPool> candyClassPoolEntry : candyClassPools.entrySet()) {
try {
ClassPool candyClassPool = candyClassPoolEntry.getValue();
ClassPool candyClassPool = candyClassPoolEntry.getValue();
CtClass packageCtClass = candyClassPool.get(packageInfo.getName());

if (packageCtClass.hasAnnotation(getAnnotationClass(ANNOTATION_ROOT))) {
logger.debug("root package " + packageInfo.getName() + " found in candy" + candyClassPoolEntry.getKey());

Class<?> packageClass = candyClassPool.toClass(packageCtClass, new URLClassLoader(new URL[] { candyClassPoolEntry.getKey().toURI().toURL() }, candyClassLoader), null);

Class<?> packageClass = candyClassPool.toClass(packageCtClass,
new URLClassLoader(new URL[] { candyClassPoolEntry.getKey().toURI().toURL() }, candyClassLoader), null);
Annotation rootAnno = packageClass.getAnnotation(getAnnotationClass(ANNOTATION_ROOT));
mixinClasses.addAll(asList(getProperty(rootAnno, "mixins")));
}
} catch (NotFoundException e) {
// not found in candy, not a problem
} catch (Exception e) {
logger.error("cannot read mixins info for " + packageInfo+ " in " + candyClassPoolEntry.getKey(), e);
}
} catch (Exception e) {
logger.error("cannot read mixins info for " + packageInfo + " in " + candyClassPoolEntry.getKey(), e);
}
}
}
File[] children = dir.listFiles();
Expand Down Expand Up @@ -311,13 +312,37 @@ private void mergeMixin(CtClass ctTarget, CtClass ctMixin, boolean verbose) thro
int ignoredDuplicates = 0;
for (CtClass ctInnerClass : ctMixin.getDeclaredClasses()) {
try {
if (!ctTarget.getSimpleName().equals(JSweetConfig.STRING_TYPES_INTERFACE_NAME)
|| !hasField(ctTarget, ctInnerClass.getSimpleName().substring(ctInnerClass.getSimpleName().indexOf('$') + 1))) {
// TODO : ouch, not the good way
CtClass ctTargetInner = ctTarget.makeNestedClass(ctInnerClass.getSimpleName(), true);
String innerClassSimpleName = ctInnerClass.getSimpleName();
if (innerClassSimpleName.lastIndexOf('$') != -1) {
innerClassSimpleName = innerClassSimpleName.substring(innerClassSimpleName.lastIndexOf('$') + 1);
}

if (!ctTarget.getSimpleName().equals(JSweetConfig.STRING_TYPES_INTERFACE_NAME) || !hasField(ctTarget, innerClassSimpleName)) {
// classic inner class merge of string types field does not
// exist

String innerClassName = ctTarget.getName() + "$" + innerClassSimpleName;

boolean newInnerClass = false;
CtClass ctTargetInner;
try {
ctTargetInner = classPool.get(innerClassName);
} catch (NotFoundException e) {
newInnerClass = true;
logger.debug("adding " + innerClassName + " to pool");
ctTarget.makeNestedClass(innerClassSimpleName, true);
ctTargetInner = classPool.makeClass(innerClassName);
}

mergeMixin(ctTargetInner, ctInnerClass, false);

if (newInnerClass) {
ctTargetInner.writeFile(targetDir.getAbsolutePath());
logger.debug("inner class file written to " + targetDir.getAbsolutePath());
}

memberCount++;
logger.debug("merged inner class " + ctInnerClass.getSimpleName());
logger.debug("merged inner class " + ctInnerClass.getName());
}
} catch (Exception e) {
logger.warn("error merging inner class: " + ctInnerClass, e);
Expand All @@ -326,7 +351,9 @@ private void mergeMixin(CtClass ctTarget, CtClass ctMixin, boolean verbose) thro
for (CtMethod ctMethod : ctMixin.getDeclaredMethods()) {
try {
if (!hasMethod(ctTarget, ctMethod)) {
ctTarget.addMethod(CtNewMethod.copy(ctMethod, ctTarget, null));
CtMethod copy = CtNewMethod.copy(ctMethod, ctTarget, null);
copy.setGenericSignature(ctMethod.getGenericSignature());
ctTarget.addMethod(copy);
memberCount++;
} else {
// ignore duplicate members
Expand Down