Mark functions from c includes with noexception

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

@@ -75,7 +75,7 @@ public Parser(Logger logger, Properties properties, String lineSeparator) {
         this.logger = p.logger;
         this.properties = p.properties;
         this.infoMap = p.infoMap;
-        this.tokens = new TokenIndexer(infoMap, new Tokenizer(text).tokenize());
+        this.tokens = new TokenIndexer(infoMap, new Tokenizer(text).tokenize(), false);
         this.lineSeparator = p.lineSeparator;
     }
 
@@ -1518,6 +1518,9 @@ boolean function(Context context, DeclarationList declList) throws ParserExcepti
             return true;
         } else if (type.staticMember || context.javaName == null) {
             modifiers = "public static native ";
+            if (tokens.isCFile) {
+                modifiers = "@NoException " + modifiers;
+            }
         }
 
         List<Declarator> prevDcl = new ArrayList<Declarator>();
@@ -2667,7 +2670,11 @@ void declarations(Context context, DeclarationList declList) throws ParserExcept
         }
     }
 
-    void parse(Context context, DeclarationList declList, String[] includePath, String include) throws IOException, ParserException {
+    void parse(Context context,
+               DeclarationList declList,
+               String[] includePath,
+               String include,
+               boolean isCFile) throws IOException, ParserException {
         List<Token> tokenList = new ArrayList<Token>();
         File file = null;
         String filename = include;
@@ -2717,7 +2724,7 @@ void parse(Context context, DeclarationList declList, String[] includePath, Stri
         token.type = Token.COMMENT;
         token.spacing = "\n";
         tokenList.add(token);
-        tokens = new TokenIndexer(infoMap, tokenList.toArray(new Token[tokenList.size()]));
+        tokens = new TokenIndexer(infoMap, tokenList.toArray(new Token[tokenList.size()]), isCFile);
         declarations(context, declList);
     }
 
@@ -2727,9 +2734,18 @@ public File parse(String outputDirectory, String[] classPath, Class cls) throws
     public File parse(File outputDirectory, String[] classPath, Class cls) throws IOException, ParserException {
         ClassProperties allProperties = Loader.loadProperties(cls, properties, true);
         ClassProperties clsProperties = Loader.loadProperties(cls, properties, false);
+
+        // Capture c-includes from "class" and "all" properties
+        List<String> cIncludes = new ArrayList<>();
+        cIncludes.addAll(clsProperties.get("platform.cinclude"));
+        cIncludes.addAll(allProperties.get("platform.cinclude"));
+
+        // Capture class includes
         List<String> clsIncludes = new ArrayList<String>();
         clsIncludes.addAll(clsProperties.get("platform.include"));
         clsIncludes.addAll(clsProperties.get("platform.cinclude"));
+
+        // Capture all includes
         List<String> allIncludes = new ArrayList<String>();
         allIncludes.addAll(allProperties.get("platform.include"));
         allIncludes.addAll(allProperties.get("platform.cinclude"));
@@ -2804,14 +2820,16 @@ public File parse(File outputDirectory, String[] classPath, Class cls) throws IO
         DeclarationList declList = new DeclarationList();
         for (String include : allIncludes) {
             if (!clsIncludes.contains(include)) {
-                parse(context, declList, includePaths, include);
+                boolean isCFile = cIncludes.contains(include);
+                parse(context, declList, includePaths, include, isCFile);
             }
         }
         declList = new DeclarationList(declList);
         containers(context, declList);
         for (String include : clsIncludes) {
             if (allIncludes.contains(include)) {
-                parse(context, declList, includePaths, include);
+                boolean isCFile = cIncludes.contains(include);
+                parse(context, declList, includePaths, include, isCFile);
             }
         }
 

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

@@ -32,9 +32,10 @@
  * @author Samuel Audet
  */
 class TokenIndexer {
-    TokenIndexer(InfoMap infoMap, Token[] array) {
+    TokenIndexer(InfoMap infoMap, Token[] array, boolean isCFile) {
         this.infoMap = infoMap;
         this.array = array;
+        this.isCFile = isCFile;
     }
 
     /** Set to true to disable temporarily the preprocessor. */
@@ -45,6 +46,8 @@ class TokenIndexer {
     Token[] array = null;
     /** The current index, in the array of tokens. Used by {@link #get(int)} and {@link #next()}. */
     int index = 0;
+    /** Whether the file came from the C-include path */
+    final boolean isCFile;
 
     Token[] filter(Token[] array, int index) {
         if (index + 1 < array.length && array[index].match('#') &&