* Let Parser output Info.javaText even for template declarations with no instances

 * Prevent `Tokenizer` from using `long` literals for unsigned integers of 16 bits or less

Author: saudet

CHANGELOG.md

@@ -1,4 +1,6 @@
 
+ * Let `Parser` output `Info.javaText` even for template declarations with no instances
+ * Prevent `Tokenizer` from using `long` literals for unsigned integers of 16 bits or less
  * Ensure `Parser` considers `>=` and `<=` as single tokens to prevent failures
  * Make `Parser` use `Info.cppTypes` to override the type of `enum` values
  * Fix `Parser` not using the correct `Info.pointerTypes` for `const&` declarations

src/main/java/org/bytedeco/javacpp/tools/Declaration.java

@@ -30,6 +30,6 @@ class Declaration {
     Type type = null;
     Declarator declarator = null;
     boolean abstractMember = false, constMember = false, inaccessible = false,
-            incomplete = false, function = false, variable = false, comment = false;
+            incomplete = false, function = false, variable = false, comment = false, custom = false;
     String signature = "", text = "";
 }

src/main/java/org/bytedeco/javacpp/tools/DeclarationList.java

@@ -61,7 +61,7 @@ String rescan(String lines) {
 
     @Override public boolean add(Declaration decl) {
         boolean add = true;
-        if (templateMap != null && templateMap.empty() && (decl.type != null || decl.declarator != null)) {
+        if (templateMap != null && templateMap.empty() && !decl.custom && (decl.type != null || decl.declarator != null)) {
             // method templates cannot be declared in Java, but make sure to make their
             // info available on request (when Info.javaNames is set) to be able to create instances
             if (infoIterator == null) {

src/main/java/org/bytedeco/javacpp/tools/Parser.java

@@ -2312,6 +2312,7 @@ boolean function(Context context, DeclarationList declList) throws ParserExcepti
             if (info != null && info.javaText != null) {
                 if (first) {
                     decl.signature = decl.text = info.javaText;
+                    decl.custom = true;
                 } else {
                     break;
                 }
@@ -2489,6 +2490,7 @@ boolean variable(Context context, DeclarationList declList) throws ParserExcepti
             if (info != null && info.javaText != null) {
                 decl.signature = decl.text = info.javaText;
                 decl.declarator = null;
+                decl.custom = true;
             }
             while (!tokens.get().match(Token.EOF, ';')) {
                 tokens.next();
@@ -2713,6 +2715,7 @@ boolean macro(Context context, DeclarationList declList) throws ParserException
                 }
                 if (info != null && info.javaText != null) {
                     decl.signature = decl.text = info.javaText;
+                    decl.custom = true;
                     break;
                 }
             }
@@ -2873,6 +2876,7 @@ boolean typedef(Context context, DeclarationList declList) throws ParserExceptio
 
             if (info != null && info.javaText != null) {
                 decl.signature = decl.text = info.javaText;
+                decl.custom = true;
             }
             String comment = commentAfter();
             decl.text = comment + decl.text;
@@ -2910,6 +2914,7 @@ boolean using(Context context, DeclarationList declList) throws ParserException
             // inherit constructors
             decl.signature = decl.text = info.javaText;
             decl.declarator = dcl;
+            decl.custom = true;
         }
         String comment = commentAfter();
         decl.text = comment + decl.text;
@@ -3296,6 +3301,7 @@ boolean group(Context context, DeclarationList declList) throws ParserException
                 }
                 int end = text.lastIndexOf('}');
                 decl.text += text.substring(start, end).replace(base2.javaName, type.javaName);
+                decl.custom = true;
             }
         }
         for (Declaration d : declList2) {
@@ -3334,6 +3340,7 @@ boolean group(Context context, DeclarationList declList) throws ParserException
         decl.type = type;
         if (info != null && info.javaText != null) {
             decl.signature = decl.text = info.javaText;
+            decl.custom = true;
         } else if (info != null && info.flatten) {
             info.javaText = decl.text;
         }

src/main/java/org/bytedeco/javacpp/tools/Tokenizer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2017 Samuel Audet
+ * Copyright (C) 2014-2020 Samuel Audet
  *
  * Licensed either under the Apache License, Version 2.0, or (at your option)
  * under the terms of the GNU General Public License as published by
@@ -180,7 +180,7 @@ public Token nextToken() throws IOException {
             token.type = c == '.' ? Token.FLOAT : Token.INTEGER;
             buffer.append((char)c);
             int prevc = 0;
-            boolean exp = false, large = false, unsigned = false, hex = false;
+            boolean exp = false, large = false, unsigned = false, hex = false, small = false;
             while ((c = readChar()) != -1 && (Character.isDigit(c) || c == '.' || c == '-' || c == '+' ||
                    (c >= 'a' && c <= 'f') || c == 'i' || c == 'l' || c == 'u' || c == 'x' ||
                    (c >= 'A' && c <= 'F') || c == 'I' || c == 'L' || c == 'U' || c == 'X')) {
@@ -201,7 +201,9 @@ public Token nextToken() throws IOException {
             }
             if (token.type == Token.INTEGER && !large) {
                 try {
-                    long high = Long.decode(buffer.toString()) >> 32;
+                    long high = Long.decode(buffer.toString()) >> 16L;
+                    small = high == 0 || high == -1;
+                    high >>= 16L;
                     large = high != 0 && high != -1;
                 } catch (NumberFormatException e) {
                     // set as large, for things like 0x8000000000000000L
@@ -214,7 +216,7 @@ public Token nextToken() throws IOException {
                 buffer.setLength(buffer.length() - 3);
                 large = true;
             }
-            if (token.type == Token.INTEGER && (large || (unsigned && !hex))) {
+            if (token.type == Token.INTEGER && (large || (unsigned && !hex && !small))) {
                 buffer.append('L');
             }
             token.value = buffer.toString();