Fix for 53999

	  	"can't bind type" message has $ for . in type name for declare soft

diff --git a/tests/ajcTests.xml b/tests/ajcTests.xml
index 08d856f20b879dad05137399336aa57161c28c0c..a74b3d915bd21959c85ab76b06de28abf5b93f2c 100644 (file)
--- a/tests/ajcTests.xml
+++ b/tests/ajcTests.xml
@@ -7770,4 +7770,10 @@
         </compile>
     </ajc-test>
  
+    <ajc-test dir="bugs"
+               pr="53999" title="'can't bind type' message has $ for . in type name for declare soft">
+        <compile files="Cosmetic.java">
+        <message kind="error" line="9" text="can't bind type name 'unknown.Error'"/>
+        </compile>
+    </ajc-test> 
 </suite>

diff --git a/tests/bugs/Cosmetic.java b/tests/bugs/Cosmetic.java
new file mode 100644 (file)
index 0000000..bc87430
--- /dev/null
+++ b/tests/bugs/Cosmetic.java
@@ -0,0 +1,11 @@
+ class Test {
+       public static void main(String[] args) {
+               test();
+       }
+       static void test() {
+               throw new Error("hello");
+       }
+       static aspect A {
+               declare soft : unknown.Error : call(void test()); // CE  should be a message saying cant bind type 'unknown.Error' and not 'unknown$Error'
+       }
+}
\ No newline at end of file

diff --git a/weaver/src/org/aspectj/weaver/patterns/WildTypePattern.java b/weaver/src/org/aspectj/weaver/patterns/WildTypePattern.java
index f710c5aaacf10e066db6695b624f1303381bc765..01324e36b8412aa011bb8b9ff396d3d5e88e958e 100644 (file)
--- a/weaver/src/org/aspectj/weaver/patterns/WildTypePattern.java
+++ b/weaver/src/org/aspectj/weaver/patterns/WildTypePattern.java
@@ -333,6 +333,7 @@ public class WildTypePattern extends TypePattern {
                }
                
                String cleanName = maybeGetCleanName();
+               String originalName = cleanName;
                if (cleanName != null) {
                        TypeX type;
                        
@@ -347,14 +348,14 @@ public class WildTypePattern extends TypePattern {
                                if (requireExactType) {
                                        if (!allowBinding) {
                                                scope.getWorld().getMessageHandler().handleMessage(
-                                                       MessageUtil.error("can't bind type name '" + cleanName + "'",
+                                                       MessageUtil.error("can't bind type name '" + originalName + "'",
                                                                                        getSourceLocation()));
                                        } else if (scope.getWorld().getLint().invalidAbsoluteTypeName.isEnabled()) {
-                                               scope.getWorld().getLint().invalidAbsoluteTypeName.signal(cleanName, getSourceLocation());
+                                               scope.getWorld().getLint().invalidAbsoluteTypeName.signal(originalName, getSourceLocation());
                                        }
                                        return NO;
                                } else if (scope.getWorld().getLint().invalidAbsoluteTypeName.isEnabled()) {
-                                       scope.getWorld().getLint().invalidAbsoluteTypeName.signal(cleanName, getSourceLocation());
+                                       scope.getWorld().getLint().invalidAbsoluteTypeName.signal(originalName, getSourceLocation());
                                }
                        } else {
                                if (dim != 0) type = TypeX.makeArray(type, dim);