* Fix Parser translation of strings containing the "::" subsequenc…

…e (issue #184)
bytedeco · Jun 6, 2017 · 8c257c0 · 8c257c0
1 parent 997201f
commit 8c257c0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+ * Fix `Parser` translation of strings containing the "::" subsequence ([issue #184](https://github.com/bytedeco/javacpp/issues/184))
  * Prevent `Parser` from overwriting target classes when nothing was parsed
  * Fix `Parser` error on member variables with initializers plus `Info.skip()` ([issue #179](https://github.com/bytedeco/javacpp/issues/179))
  * Fix `Parser` incorrectly recognizing values as pointers when `const` is placed after type ([issue #173](https://github.com/bytedeco/javacpp/issues/173))

diff --git a/src/main/java/org/bytedeco/javacpp/tools/Parser.java b/src/main/java/org/bytedeco/javacpp/tools/Parser.java
@@ -90,9 +90,19 @@ String translate(String text) {
         int namespace = text.lastIndexOf("::");
         if (namespace >= 0) {
             Info info2 = infoMap.getFirst(text.substring(0, namespace));
-            text = text.substring(namespace + 2);
+            String localName = text.substring(namespace + 2);
             if (info2 != null && info2.pointerTypes != null) {
-                text = info2.pointerTypes[0] + "." + text;
+                text = info2.pointerTypes[0] + "." + localName;
+            } else if (localName.length() > 0 && Character.isJavaIdentifierStart(localName.charAt(0))) {
+                for (char c : localName.toCharArray()) {
+                    if (!Character.isJavaIdentifierPart(c)) {
+                        localName = null;
+                        break;
+                    }
+                }
+                if (localName != null) {
+                    text = localName;
+                }
             }
         }
         return text;