commit f270a37c0559caddb4ecf232195563745cbcfd2c Author: Daniel Swanson Date: Thu Jun 17 12:59:18 2021 -0500 final elimination of wide strings diff --git a/src/anaphora.cc b/src/anaphora.cc index 86fb976..6c01b21 100644 --- a/src/anaphora.cc +++ b/src/anaphora.cc @@ -41,8 +41,8 @@ UFILE * open_output(string const &filename) UFILE *output = u_fopen(filename.c_str(), "w", NULL, NULL); if(!output) { - wcerr << "Error: can't open output file '"; - wcerr << filename.c_str() << "'." << endl; + cerr << "Error: can't open output file '"; + cerr << filename.c_str() << "'." << endl; exit(EXIT_FAILURE); } return output; @@ -50,11 +50,11 @@ UFILE * open_output(string const &filename) void help_message(char *progname) { - wcerr << "USAGE: " << basename(progname) << " arx_file [input [output]]" << endl; - wcerr << " " << basename(progname) << " -z arx_file [input [output]]" << endl; - wcerr << " arx_file Anaphora Resolution rules file (apertium-xxx-yyy.xxx-yyy.arx)" << endl; - wcerr << " -z null-flushing output on \\0" << endl; - wcerr << " -h shows this message" << endl; + cerr << "USAGE: " << basename(progname) << " arx_file [input [output]]" << endl; + cerr << " " << basename(progname) << " -z arx_file [input [output]]" << endl; + cerr << " arx_file Anaphora Resolution rules file (apertium-xxx-yyy.xxx-yyy.arx)" << endl; + cerr << " -z null-flushing output on \\0" << endl; + cerr << " -h shows this message" << endl; exit(EXIT_FAILURE); } diff --git a/src/parse_biltrans.cc b/src/parse_biltrans.cc index 567658e..41f54ed 100644 --- a/src/parse_biltrans.cc +++ b/src/parse_biltrans.cc @@ -33,7 +33,7 @@ ParseLexicalUnit::ParseLexicalUnit(UString input_LU) for (UString::iterator i = input_LU.begin(); i != input_LU.end(); ++i) { - if(*i == L'\\') + if(*i == '\\') { if(seenSlash == 0) { @@ -79,19 +79,19 @@ ParseLexicalUnit::ParseLexicalUnit(UString input_LU) } } - else if(*i == L'/') + else if(*i == '/') seenSlash++; else if(seenSlash == 0) { sl_form.push_back(*i); - if(*i == L'<') + if(*i == '<') seenTag++; else if(seenTag == 1) { - if(*i == L'>') + if(*i == '>') { seenTag--; sl_tags.push_back(temptag); @@ -114,12 +114,12 @@ ParseLexicalUnit::ParseLexicalUnit(UString input_LU) { tl_form.push_back(*i); - if(*i == L'<') + if(*i == '<') seenTag++; else if(seenTag == 1) { - if(*i == L'>') + if(*i == '>') { seenTag--; tl_tags.push_back(temptag);