- Fixed #2038610 ebcdic problem.

diff --git a/re2c/CHANGELOG b/re2c/CHANGELOG
index f4011dad0dcfff60cae16cd4406a3640bf66ccbd..14569aa556e371e98db74d3000508aff03ef01a9 100644 (file)
--- a/re2c/CHANGELOG
+++ b/re2c/CHANGELOG
@@ -1,6 +1,7 @@
 Version 0.13.6 (2008-??-??)
 ---------------------------
 - Fixed #2088583 Compile problemon AIX.
+- Fixed #2038610 ebcdic problem.
 
 Version 0.13.5 (2008-05-25)
 ---------------------------

diff --git a/re2c/dfa.cc b/re2c/dfa.cc
index 7a8a2303012078104348cbf14384bd3415b30178..df6401d7e179e457dd0b570fd0bb5d0d3f64366e 100644 (file)
--- a/re2c/dfa.cc
+++ b/re2c/dfa.cc
@@ -10,7 +10,7 @@ namespace re2c
 
 void prtChOrHex(std::ostream& o, uint c, bool useTalx)
 {
-       int oc = (int)(re2c::wFlag || !useTalx ? c : re2c::talx[c]);
+       int oc = (int)((re2c::wFlag && !re2c::eFlag) || !useTalx ? c : re2c::talx[c]);
 
        if ((oc < 256) && (isprint(oc) || isspace(oc)))
        {
@@ -28,7 +28,7 @@ void prtChOrHex(std::ostream& o, uint c, bool useTalx)
 
 void prtHex(std::ostream& o, uint c, bool useTalx)
 {
-       int oc = (int)(re2c::wFlag || !useTalx ? c : re2c::talx[c]);
+       int oc = (int)((re2c::wFlag && !re2c::eFlag) || !useTalx ? c : re2c::talx[c]);
 
        if (re2c::uFlag)
        {
@@ -60,7 +60,7 @@ void prtHex(std::ostream& o, uint c, bool useTalx)
 
 void prtCh(std::ostream& o, uint c, bool useTalx)
 {
-       int oc = (int)(re2c::wFlag || !useTalx ? c : re2c::talx[c]);
+       int oc = (int)((re2c::wFlag && !re2c::eFlag) || !useTalx ? c : re2c::talx[c]);
 
        switch (oc)
        {

diff --git a/re2c/htdocs/index.html b/re2c/htdocs/index.html
index 109c93fc4f29dbdd7ba2fc11b59b9bab8ae5f4af..e5e4b013294151908a394b9c3ec3d9720f2a59af 100755 (executable)
--- a/re2c/htdocs/index.html
+++ b/re2c/htdocs/index.html
@@ -84,6 +84,7 @@ fixes which were incorporated. <a href=
 <h2>2008-??-??: 0.13.6</h2>
 <ul>
 <li>Fixed #2088583 Compile problemon AIX.</li>
+<li>Fixed #2038610 ebcdic problem.</li>
 </ul>
 <h2>2008-05-25: 0.13.5</h2>
 <ul>