APREPRO: Make utf-8 detection a warning instead of error

sandialabs · Oct 16, 2023 · c7094dd · c7094dd
1 parent 2156b0a
commit c7094dd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/packages/seacas/libraries/aprepro_lib/apr_scanner.cc b/packages/seacas/libraries/aprepro_lib/apr_scanner.cc
@@ -3300,8 +3300,7 @@ namespace SEAMS {
       }
 
       if (!string_is_ascii(line, strlen(line))) {
-        yyerror("input line contains non-ASCII (probably UTF-8) characters which will most likely "
-                "be parsed incorrectly.");
+        aprepro.warning("input line contains non-ASCII (probably UTF-8) characters which might be parsed incorrectly.");
       }
 
       SEAMS::gl_histadd(line);
@@ -3324,9 +3323,8 @@ namespace SEAMS {
       }
       else {
         if (!string_is_ascii(buf, yyin->gcount())) {
-          yyerror(
-              "input file contains non-ASCII (probably UTF-8) characters which will most likely "
-              "be parsed incorrectly.");
+          aprepro.warning(
+		  "input file contains non-ASCII (probably UTF-8) characters which might be parsed incorrectly.");
         }
         return yyin->gcount();
       }

diff --git a/packages/seacas/libraries/aprepro_lib/aprepro.ll b/packages/seacas/libraries/aprepro_lib/aprepro.ll
@@ -853,8 +853,7 @@ integer {D}+({E})?
       }
 
       if (!string_is_ascii(line, strlen(line))) {
-        yyerror("input line contains non-ASCII (probably UTF-8) characters which will most likely "
-                "be parsed incorrectly.");
+        aprepro.warning("input line contains non-ASCII (probably UTF-8) characters which might be parsed incorrectly.");
       }
 
       SEAMS::gl_histadd(line);
@@ -877,8 +876,7 @@ integer {D}+({E})?
       }
       else {
         if (!string_is_ascii(buf, yyin->gcount())) {
-          yyerror("input file contains non-ASCII (probably UTF-8) characters which will most likely "
-                  "be parsed incorrectly.");
+          aprepro.warning("input file contains non-ASCII (probably UTF-8) characters which will might be parsed incorrectly.");
         }
         return yyin->gcount();
       }