diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-04-16 22:19:15 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-04-16 22:19:15 (GMT) |
| commit | 1045aefa35184677d8bede823e91e80cc17db5ee (patch) | |
| tree | 7b415ba75bc238576a5b9a4b233e6d24fe56eddd | |
| parent | 335f3c8fb761a9499b9df27bce308a6f631dc082 (diff) | |
| download | tcl-1045aefa35184677d8bede823e91e80cc17db5ee.zip tcl-1045aefa35184677d8bede823e91e80cc17db5ee.tar.gz tcl-1045aefa35184677d8bede823e91e80cc17db5ee.tar.bz2 | |
Fix build for TCL_UTF_MAX=4. Mark some failing tests with "knownBug". Those still need to be fixed!
| -rw-r--r-- | generic/tclUtf.c | 2 | ||||
| -rw-r--r-- | tests/utf.test | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/generic/tclUtf.c b/generic/tclUtf.c index b37d55a..0768992 100644 --- a/generic/tclUtf.c +++ b/generic/tclUtf.c @@ -972,7 +972,7 @@ Tcl_UtfAtIndex( #if TCL_UTF_MAX == 4 if ((ch >= 0xD800) && (len < 3)) { /* Index points at character following high Surrogate */ - src = TclUtfToUniChar(src, &ch); + src += TclUtfToUniChar(src, &ch); } #endif return src; diff --git a/tests/utf.test b/tests/utf.test index b5d1f5c..a730feb 100644 --- a/tests/utf.test +++ b/tests/utf.test @@ -415,7 +415,7 @@ test utf-6.85 {Tcl_UtfNext - overlong sequences} testutfnext { test utf-6.86 {Tcl_UtfNext - overlong sequences} testutfnext { testutfnext \xF0\x80\x80\x80 } 1 -test utf-6.87 {Tcl_UtfNext - overlong sequences} testutfnext { +test utf-6.87 {Tcl_UtfNext - overlong sequences} {testutfnext knownBug} { # Doesn't work with TCL_UTF_MAX>3 testutfnext \xF0\x90\x80\x80 } 1 test utf-6.88 {Tcl_UtfNext, pointing to 2th byte of 3-byte valid sequence} {testutfnext knownBug} { @@ -628,13 +628,13 @@ test utf-7.37 {Tcl_UtfPrev -- overlong sequence} testutfprev { test utf-7.38 {Tcl_UtfPrev -- overlong sequence} testutfprev { testutfprev A\xE0\xA0\x80 2 } 1 -test utf-7.39 {Tcl_UtfPrev -- overlong sequence} testutfprev { +test utf-7.39 {Tcl_UtfPrev -- overlong sequence} {testutfprev knownBug} { # Doesn't work with TCL_UTF_MAX>3 testutfprev A\xF0\x90\x80\x80 } 4 -test utf-7.40 {Tcl_UtfPrev -- overlong sequence} testutfprev { +test utf-7.40 {Tcl_UtfPrev -- overlong sequence} {testutfprev knownBug} { # Doesn't work with TCL_UTF_MAX>3 testutfprev A\xF0\x90\x80\x80 4 } 3 -test utf-7.41 {Tcl_UtfPrev -- overlong sequence} testutfprev { +test utf-7.41 {Tcl_UtfPrev -- overlong sequence} {testutfprev knownBug} { # Doesn't work with TCL_UTF_MAX>3 testutfprev A\xF0\x90\x80\x80 3 } 2 test utf-7.42 {Tcl_UtfPrev -- overlong sequence} testutfprev { |