commit 2038b19334fb5234e24573f33d7c8a088d1f832d Author: Daniel Swanson Date: Thu Jun 17 13:24:22 2021 -0500 version bump + remove wchar_t diff --git a/configure.ac b/configure.ac index 59915ef..a7f149a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.61) -AC_INIT([lexd], [1.0.0], [awesomeevildudes@gmail.com]) +AC_INIT([lexd], [1.1.0], [awesomeevildudes@gmail.com]) AM_INIT_AUTOMAKE AC_CONFIG_MACRO_DIR([m4]) @@ -15,7 +15,7 @@ AC_ARG_ENABLE(debug, [ --enable-debug Enable "-g" compiler options], [CXXFLAGS="-g $CXXFLAGS";CFLAGS="-g $CFLAGS"]) -PKG_CHECK_MODULES([LTTOOLBOX], [lttoolbox >= 3.5.3]) +PKG_CHECK_MODULES([LTTOOLBOX], [lttoolbox >= 3.6.0]) PKG_CHECK_MODULES([ICU_UC], [icu-uc]) PKG_CHECK_MODULES([ICU_IO], [icu-io]) diff --git a/src/lexdcompiler.cc b/src/lexdcompiler.cc index 0ae67f2..68c4ba0 100644 --- a/src/lexdcompiler.cc +++ b/src/lexdcompiler.cc @@ -621,7 +621,7 @@ LexdCompiler::processNextLine() bool escape = false; bool comment = false; bool lastWasSpace = false; - while((c = u_fgetc(input)) != L'\n') + while((c = u_fgetc(input)) != '\n') { bool space = false; if(c == U_EOF) @@ -635,12 +635,12 @@ LexdCompiler::processNextLine() line += c; escape = false; } - else if(c == L'\\') + else if(c == '\\') { escape = true; line += c; } - else if(c == L'#') + else if(c == '#') { comment = true; } @@ -703,7 +703,7 @@ LexdCompiler::processNextLine() for(int i = name.length()-2; i > 0; i--) { if(u_isdigit(name[i])) num = name[i] + num; - else if(name[i] == L'(' && num.length() > 0) + else if(name[i] == '(' && num.length() > 0) { currentLexiconPartCount = (unsigned int)StringUtils::stoi(to_ustring(num)); name = name.retainBetween(0, i);