BridJ: make C++ demanglers const-aware

Author: ochafik

src/main/java/org/bridj/demangling/Demangler.java

@@ -560,10 +560,14 @@ public String toString() {
     public static class PointerTypeRef extends TypeRef {
 
         public TypeRef pointedType;
+        public boolean isReference;
+        public boolean isConst;
 
-        public PointerTypeRef(TypeRef pointedType) {
+        public PointerTypeRef(TypeRef pointedType, boolean isConst, boolean isReference) {
             assert pointedType != null;
             this.pointedType = pointedType;
+            this.isReference = isReference;
+            this.isConst = isConst;
         }
 
         @Override
@@ -573,7 +577,7 @@ public StringBuilder getQualifiedName(StringBuilder b, boolean generic) {
 
         @Override
         public String toString() {
-            return pointedType + "*";
+            return (isConst ? "const " : "") + pointedType + (isReference ? "&" : "*");
         }
 
         @Override
@@ -600,8 +604,8 @@ public boolean matches(Type type, Annotations annotations) {
 
     }
 
-    protected static TypeRef pointerType(TypeRef tr) {
-        return new PointerTypeRef(tr);
+    protected static TypeRef pointerType(TypeRef tr, boolean isConst, boolean isReference) {
+        return new PointerTypeRef(tr, isConst, isReference);
     }
 
     protected static TypeRef classType(final Class<?> c, Class<? extends Annotation>... annotations) {

src/main/java/org/bridj/demangling/GCC4Demangler.java

@@ -96,12 +96,12 @@ private String nextShortcutId() {
         return n == -1 ? "_" : Integer.toString(n, 36).toUpperCase() + "_";
     }
 
-    private TypeRef parsePointerType(boolean memorizePointed) throws DemanglingException {
+    private TypeRef parsePointerType(boolean memorizePointed, boolean isConst, boolean isReference) throws DemanglingException {
         String subId = memorizePointed ? nextShortcutId() : null;
         TypeRef pointed = parseType();
         if (memorizePointed)
             typeShortcuts.put(subId, pointed);
-        TypeRef res = pointerType(pointed);
+        TypeRef res = pointerType(pointed, isConst, isReference);
         String id = nextShortcutId();
         typeShortcuts.put(id, res);
         return res;
@@ -180,9 +180,12 @@ public TypeRef parseType() throws DemanglingException {
                 }
                 return res;
             }
+            case 'R': // Reference: TODO: treat const ref as a value.
             case 'P': {
                 char nextChar = peekChar();
-                return parsePointerType(nextChar == 'K' || nextChar == 'N');
+                boolean isReference = c == 'R';
+                boolean isConst = nextChar == 'K';
+                return parsePointerType(isConst || nextChar == 'N', isConst, isReference);
             }
             case 'F': {
                 // TODO parse function type correctly !!!
@@ -196,7 +199,7 @@ public TypeRef parseType() throws DemanglingException {
                 expectChars('E');
                 return new FunctionTypeRef(mr);
             }
-            case 'K': 
+            case 'K': // const?
                 return parseType();
             case 'v': // char
                 return classType(Void.TYPE);

src/main/java/org/bridj/demangling/VC9Demangler.java

@@ -395,6 +395,8 @@ TypeRef parseType(boolean allowVoid) throws DemanglingException {
             case 'Q': // const pointer
             case 'R': // volatile pointer
             case 'S': // const volatile pointer
+                boolean isReference = c == 'A' || c == 'B';
+                boolean isConst = c == 'Q' || c == 'S';
                 if (!consumeCharsIf('$', 'A')) // __gc
                 {
                     consumeCharsIf('$', 'B');  // __pin
@@ -408,11 +410,11 @@ TypeRef parseType(boolean allowVoid) throws DemanglingException {
                             indices[i] = parseNumber(false);
                         }
                     }
-                    tr = pointerType(parseType(true));
+                    tr = pointerType(parseType(true), isConst, isReference);
                 } else {
                     MemberRef mr = new MemberRef();
                     parseFunctionProperty(mr);
-                    tr = pointerType(new FunctionTypeRef(mr));
+                    tr = pointerType(new FunctionTypeRef(mr), isConst, isReference);
                 }
                 addBackRef(tr);
                 return tr;

src/test/java/org/bridj/DemanglingTest.java

@@ -390,9 +390,9 @@ public void gccMemoryShortcuts() {
         demangle(null, "_Z15shortcutsSimplePPPPccS_S0_S1_S2_PS2_", "null shortcutsSimple(byte****, byte, byte*, byte**, byte***, byte****, byte*****)");
 
         demangle(null, "__Z1fPsS_", "null f(short*, short*)");
-        demangle(null, "__Z1fPKsS_", "null f(short*, short)");
-        demangle(null, "__Z1fPKsS0_", "null f(short*, short*)");
-        demangle(null, "__Z1fPKcS0_S0_PKsS2_PKdS4_", "null f(byte*, byte*, byte*, short*, short*, double*, double*)");
+        demangle(null, "__Z1fPKsS_", "null f(const short*, short)");
+        demangle(null, "__Z1fPKsS0_", "null f(const short*, const short*)");
+        demangle(null, "__Z1fPKcS0_S0_PKsS2_PKdS4_", "null f(const byte*, const byte*, const byte*, const short*, const short*, const double*, const double*)");
         demangle(null, "__ZN1AC2EPS_PS0_S1_", "null A.(A*, A**, A**)");
         /*
          *