Use wcerr where necessary (fixes #42); Bump patch version; Also check…

… for WEOF (see issue #25)
apertium · Apr 17, 2020 · 12357e0 · 12357e0
1 parent 50ff9b2
commit 12357e0
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 23 deletions.
diff --git a/configure.ac b/configure.ac
@@ -4,7 +4,7 @@ m4_define([required_libxml_version], [2.6.17])
 m4_define([required_apertium_version], [3.6.1])
 m4_define([required_lttoolbox_version], [3.5.1])
 
-AC_INIT([apertium-lex-tools], [0.2.3], [[email protected]])
+AC_INIT([apertium-lex-tools], [0.2.4], [[email protected]])
 AM_INIT_AUTOMAKE
 AC_CONFIG_MACRO_DIR([m4])
 

diff --git a/src/lrx_comp.cc b/src/lrx_comp.cc
@@ -60,6 +60,4 @@ int main (int argc, char **argv)
     FILE *output = fopen(argv[3], "wb");
     compiler.write(output);
   }
-
-  return 0;
 }
diff --git a/src/lrx_compiler.cc b/src/lrx_compiler.cc
@@ -283,8 +283,8 @@ LRXCompiler::procRule()
     int ret = xmlTextReaderRead(reader);
     if(ret != 1)
     {
-      cerr << L"Error (" << xmlTextReaderGetParserLineNumber(reader);
-      cerr << L"): Parse error." << endl;
+      wcerr << L"Error (" << xmlTextReaderGetParserLineNumber(reader);
+      wcerr << L"): Parse error." << endl;
       exit(EXIT_FAILURE);
     }
 
@@ -348,8 +348,8 @@ LRXCompiler::procOr()
     int ret = xmlTextReaderRead(reader);
     if(ret != 1)
     {
-      cerr << L"Error (" << xmlTextReaderGetParserLineNumber(reader);
-      cerr << L"): Parse error." << endl;
+      wcerr << L"Error (" << xmlTextReaderGetParserLineNumber(reader);
+      wcerr << L"): Parse error." << endl;
       exit(EXIT_FAILURE);
     }
 
@@ -411,8 +411,8 @@ LRXCompiler::procDefSeq()
     int ret = xmlTextReaderRead(reader);
     if(ret != 1)
     {
-      cerr << L"Error (" << xmlTextReaderGetParserLineNumber(reader);
-      cerr << L"): Parse error." << endl;
+      wcerr << L"Error (" << xmlTextReaderGetParserLineNumber(reader);
+      wcerr << L"): Parse error." << endl;
       exit(EXIT_FAILURE);
     }
 
@@ -573,8 +573,8 @@ LRXCompiler::procMatch()
     int ret = xmlTextReaderRead(reader);
     if(ret != 1)
     {
-      cerr << L"Error (" << xmlTextReaderGetParserLineNumber(reader);
-      cerr << L"): Parse error." << endl;
+      wcerr << L"Error (" << xmlTextReaderGetParserLineNumber(reader);
+      wcerr << L"): Parse error." << endl;
       exit(EXIT_FAILURE);
     }
 
@@ -585,8 +585,8 @@ LRXCompiler::procMatch()
     {
       if(!canSelect)
       {
-        cerr << L"Error (" << xmlTextReaderGetParserLineNumber(reader);
-        cerr << L"): <select> is not permitted inside <repeat>." << endl;
+        wcerr << L"Error (" << xmlTextReaderGetParserLineNumber(reader);
+        wcerr << L"): <select> is not permitted inside <repeat>." << endl;
         exit(EXIT_FAILURE);
       }
       procSelect();
@@ -595,8 +595,8 @@ LRXCompiler::procMatch()
     {
       if(!canSelect)
       {
-        cerr << L"Error (" << xmlTextReaderGetParserLineNumber(reader);
-        cerr << L"): <remove> is not permitted inside <repeat>." << endl;
+        wcerr << L"Error (" << xmlTextReaderGetParserLineNumber(reader);
+        wcerr << L"): <remove> is not permitted inside <repeat>." << endl;
         exit(EXIT_FAILURE);
       }
       procRemove();
@@ -878,14 +878,14 @@ LRXCompiler::procRepeat()
   int upto = stoi(xupto);
   if(from < 0 || upto < 0)
   {
-    cerr << L"Error (" << xmlTextReaderGetParserLineNumber(reader);
-    cerr << L"): Number of repetitions cannot be negative." << endl;
+    wcerr << L"Error (" << xmlTextReaderGetParserLineNumber(reader);
+    wcerr << L"): Number of repetitions cannot be negative." << endl;
     exit(EXIT_FAILURE);
   }
   else if(from > upto)
   {
-    cerr << L"Error (" << xmlTextReaderGetParserLineNumber(reader);
-    cerr << L"): Lower bound on number of repetitions cannot be larger than upper bound." << endl;
+    wcerr << L"Error (" << xmlTextReaderGetParserLineNumber(reader);
+    wcerr << L"): Lower bound on number of repetitions cannot be larger than upper bound." << endl;
     exit(EXIT_FAILURE);
   }
   int count = upto - from;
@@ -899,8 +899,8 @@ LRXCompiler::procRepeat()
     int ret = xmlTextReaderRead(reader);
     if(ret != 1)
     {
-      cerr << L"Error (" << xmlTextReaderGetParserLineNumber(reader);
-      cerr << L"): Parse error." << endl;
+      wcerr << L"Error (" << xmlTextReaderGetParserLineNumber(reader);
+      wcerr << L"): Parse error." << endl;
       exit(EXIT_FAILURE);
     }
 

diff --git a/src/lrx_processor.cc b/src/lrx_processor.cc
@@ -794,7 +794,7 @@ LRXProcessor::processME(FILE *input, FILE *output)
   alive_states.push_back(new State(*initial_state));
 
   int val = 0;
-  while((val = fgetwc_unlocked(input)) != EOF)
+  while((val = fgetwc_unlocked(input)) != EOF && val != WEOF)
   {
 
     if(nullFlush && val == L'\0')
@@ -824,7 +824,7 @@ LRXProcessor::processME(FILE *input, FILE *output)
       // Read in target equivalences
       wstring trad = L"";
       val = fgetwc_unlocked(input);
-      while(val != L'$' && val != EOF)
+      while(val != L'$' && val != EOF && val != WEOF)
       {
         if(val != L'$')
         {