From c7094dd63f89a4dde9c4da81b47377b37ff73a5d Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Mon, 16 Oct 2023 16:35:03 -0600 Subject: [PATCH] APREPRO: Make utf-8 detection a warning instead of error --- packages/seacas/libraries/aprepro_lib/apr_scanner.cc | 8 +++----- packages/seacas/libraries/aprepro_lib/aprepro.ll | 6 ++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/packages/seacas/libraries/aprepro_lib/apr_scanner.cc b/packages/seacas/libraries/aprepro_lib/apr_scanner.cc index 5617a392b0..83aa675cec 100644 --- 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 index db559f6b4e..4c901f4921 100644 --- 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(); }