231467: fix: allow for a type signature like [ITE; - it means int[],E and not just E !

diff --git a/weaver/src/org/aspectj/weaver/TypeFactory.java b/weaver/src/org/aspectj/weaver/TypeFactory.java
index 699f07de7efbd899b1b8ba26807f3b5b440c5998..9db8e34891bf012169f0d632fac7d46eaf319b73 100644 (file)
--- a/weaver/src/org/aspectj/weaver/TypeFactory.java
+++ b/weaver/src/org/aspectj/weaver/TypeFactory.java
@@ -223,17 +223,30 @@ public class TypeFactory {
                while(!remainingToProcess.equals("")) {
                        int endOfSig = 0;
                        int anglies = 0;
-                       boolean sigFound = false;
+                       boolean sigFound = false; // OPTIMIZE can this be done better?
                        for (endOfSig = 0; (endOfSig < remainingToProcess.length()) && !sigFound; endOfSig++) {
                                char thisChar = remainingToProcess.charAt(endOfSig);
                                switch(thisChar) {
-                               case '<' : anglies++; break;
-                               case '>' : anglies--; break;
-                               case ';' : 
-                                       if (anglies == 0) {
-                                               sigFound = true;
+                                       case '<' : anglies++; break;
+                                       case '>' : anglies--; break;
+                                       case '[' : 
+                                               if (anglies == 0) {
+                                                       // the next char might be a [ or a primitive type ref (BCDFIJSZ)
+                                                       int nextChar = endOfSig+1;
+                                                       while (remainingToProcess.charAt(nextChar)=='[') { nextChar++; }
+                                                       if ("BCDFIJSZ".indexOf(remainingToProcess.charAt(nextChar))!=-1) {
+                                                               // it is something like [I or [[S
+                                                               sigFound = true;
+                                                               endOfSig = nextChar;
+                                                               break;
+                                                       }
+                                               }
                                                break;
-                                       }
+                                       case ';' : 
+                                               if (anglies == 0) {
+                                                       sigFound = true;
+                                                       break;
+                                               }
                                }
                        }
                        types.add(createTypeFromSignature(remainingToProcess.substring(0,endOfSig)));