* Fix issues in the Parser with access specifiers and casting of c…

…onst values by reference
bytedeco · Jun 28, 2014 · dd14511 · dd14511
1 parent 14c8b1c
commit dd14511
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,5 @@
 
- * Fix a few other minor issues in the `Parser`
+ * Fix a few other minor issues in the `Parser` with the `long double` type, floating-point numbers, macro redefinitions, access specifiers, casting of const values by reference
  * Allow users to instruct the `Parser` to skip the expansion of specific macro invocations
  * Let `Parser` concatenate tokens when expanding macros containing the `##` operator
  * Add some documentation for `Info`, `InfoMap`, `InfoMapper`, and `Parser`

diff --git a/src/main/java/org/bytedeco/javacpp/tools/Parser.java b/src/main/java/org/bytedeco/javacpp/tools/Parser.java
@@ -442,9 +442,6 @@ Declarator declarator(Context context, String defaultName, int infoNumber, boole
             }
             cast += token;
         }
-        if (dcl.indirections == 0 && dcl.reference) {
-            cast = cast.replace('&', '*');
-        }
 
         ArrayList<Attribute> attributes = new ArrayList<Attribute>();
         if (type.attributes != null) {
@@ -662,6 +659,14 @@ Declarator declarator(Context context, String defaultName, int infoNumber, boole
             }
         }
         if (needCast) {
+            if (dcl.indirections == 0 && dcl.reference) {
+                // consider as pointer type
+                cast = cast.replace('&', '*');
+            }
+            if (valueType && type.constValue && dcl.reference) {
+                // consider as value type
+                cast = cast.substring(0, cast.length() - 1);
+            }
             if (type.constValue) {
                 cast = "const " + cast;
             }
@@ -1881,9 +1886,10 @@ boolean extern(Context context, DeclarationList declList) throws ParserException
 
     void declarations(Context context, DeclarationList declList) throws ParserException {
         for (Token token = tokens.get(); !token.match(Token.EOF, '}'); token = tokens.get()) {
-            if (token.match(Token.PRIVATE, Token.PROTECTED, Token.PUBLIC) && tokens.next().match(':')) {
+            while (token.match(Token.PRIVATE, Token.PROTECTED, Token.PUBLIC) && tokens.get(1).match(':')) {
                 context.inaccessible = !token.match(Token.PUBLIC);
                 tokens.next();
+                tokens.next();
             }
             Context ctx = context;
             String comment = commentBefore();