* Have Parser wrap the erase() methods of basic containers with iterators to allow removing from maps

 * Let `Parser` output the content of `Info.javaText` in the case of basic containers as well

Author: saudet

CHANGELOG.md

@@ -1,4 +1,6 @@
 
+ * Have `Parser` wrap the `erase()` methods of basic containers with iterators to allow removing from maps
+ * Let `Parser` output the content of `Info.javaText` in the case of basic containers as well
  * Fix `Parser` failure on arguments containing multiple array accesses ending with `]]`
  * Fix `Parser` incorrectly considering some array definitions with expressions as multidimensional
  * Log loading errors of optional `jnijavacpp` as debug messages instead of warnings ([issue tensorflow/java#189](https://github.com/tensorflow/java/issues/189))

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2020 Samuel Audet
+ * Copyright (C) 2013-2021 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
@@ -140,6 +140,11 @@ void containers(Context context, DeclarationList declList) throws ParserExceptio
             for (Info info : infoSet) {
                 Declaration decl = new Declaration();
                 if (info == null || info.skip || !info.define) {
+                    if (info != null && info.javaText != null) {
+                        decl.type = new Type(info.pointerTypes[0]);
+                        decl.text = info.javaText;
+                        declList.add(decl);
+                    }
                     continue;
                 }
                 int dim = containerName.toLowerCase().endsWith("optional")
@@ -167,6 +172,7 @@ void containers(Context context, DeclarationList declList) throws ParserExceptio
                 String iteratorType = "iterator";
                 String keyVariable = "first";
                 String valueVariable = "second";
+                boolean dict = false;
                 boolean list = resizable; // also vector, etc
                 if (valueType.javaName == null || valueType.javaName.length() == 0
                         || containerName.toLowerCase().endsWith("bitset")) {
@@ -178,6 +184,7 @@ void containers(Context context, DeclarationList declList) throws ParserExceptio
                     iteratorType = "Iterator";
                     keyVariable = "key()";
                     valueVariable = "value()";
+                    dict = true;
                 } else if (containerName.toLowerCase().endsWith("list")
                         || containerName.toLowerCase().endsWith("optional")
                         || containerName.toLowerCase().endsWith("variant")
@@ -352,8 +359,10 @@ void containers(Context context, DeclarationList declList) throws ParserExceptio
                             } else if (indexType == null) {
                                 decl.text += "    public native void insert(" + valueType.annotations + valueType.javaName + " value);\n"
                                           +  "    public native void erase(" + valueType.annotations + valueType.javaName + " value);\n";
+                            } else if (!dict) {
+                                 // XXX: need to figure out something for insert() on maps
+                                decl.text += "    public native void erase(@ByVal Iterator pos);\n";
                             }
-                            // XXX: else need to figure out something for maps
                         }
                         if (indexType != null && !indexType.annotations.contains("@Const") && !indexType.annotations.contains("@Cast") && !indexType.value) {
                             indexType.annotations += "@Const ";
@@ -488,6 +497,11 @@ void containers(Context context, DeclarationList declList) throws ParserExceptio
                         first = false;
                     }
                 }
+                if (info != null && info.javaText != null) {
+                    declList.spacing = "\n    ";
+                    decl.text += declList.rescan(info.javaText) + "\n";
+                    declList.spacing = null;
+                }
                 decl.text += "}\n";
                 declList.add(decl);
             }