1.2.2

dumpAst/src/main/jastadd/ClassAnalysis.jrag

@@ -75,6 +75,18 @@ aspect ClassAnalysis {
               IntrinsicTokenMethod tokenMethod = new IntrinsicTokenMethod();
               tokenMethod.setMethod(method);
               tokenMethod.setName(tokenName);
+              TokenMethod previousTokenMethodWithSameName = result.getTokenMethodWithName(tokenName);
+              if (method.getName().startsWith("refined__")) {
+                tokenMethod.setRefined(true);
+                // check for previous non-refined method with same name
+                if (previousTokenMethodWithSameName != null) {
+                  // replace previous method instead of adding
+                  result.setOtherMethod(tokenMethod, previousTokenMethodWithSameName.myIndex());
+                  continue;
+                }
+              } else if (previousTokenMethodWithSameName != null && previousTokenMethodWithSameName.isIntrinsicTokenMethod() && previousTokenMethodWithSameName.asIntrinsicTokenMethod().getRefined()) {
+                continue;
+              }
               result.addOtherMethod(tokenMethod);
               break;
             case "Attribute":
@@ -140,6 +152,23 @@ aspect ClassAnalysis {
     return result;
   }
 
+  TokenMethod ClassAnalysisResult.getTokenMethodWithName(String tokenName) {
+    // this can not be an attribute, since ClassAnalysisResult changes, and we do not use incremental eval
+    for (AnalysedMethod otherMethod : getOtherMethodList()) {
+      if (otherMethod.isTokenMethod()) {
+        TokenMethod tokenMethod = otherMethod.asTokenMethod();
+        if (tokenMethod.getName().equals(tokenName)) {
+          return tokenMethod;
+        }
+      }
+    }
+    return null;
+  }
+
+  inh int AnalysedMethod.myIndex();
+  eq ClassAnalysisResult.getContainmentMethod(int index).myIndex() = index;
+  eq ClassAnalysisResult.getOtherMethod(int index).myIndex() = index;
+
   syn java.util.List<String> DumpAst.targetOrder(Class<?> clazz) {
     for (java.lang.reflect.Constructor<?> method : clazz.getConstructors()) {
       for (java.lang.annotation.Annotation annotation : method.getAnnotations()) {