diff options
| author | dgp <dgp@users.sourceforge.net> | 2020-04-24 20:54:48 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2020-04-24 20:54:48 (GMT) |
| commit | cecf0f737ff473a4a22c57beba6c63e3604782b6 (patch) | |
| tree | 2e021ba6b0d8d9f25705cc98f07688c938a43d85 | |
| parent | e41fff474338362ada285b42e9da856ba6502903 (diff) | |
| parent | 7d2cbe2aef563bac2e041eca4e8918de2bb66ccf (diff) | |
| download | tcl-cecf0f737ff473a4a22c57beba6c63e3604782b6.zip tcl-cecf0f737ff473a4a22c57beba6c63e3604782b6.tar.gz tcl-cecf0f737ff473a4a22c57beba6c63e3604782b6.tar.bz2 | |
merge 8.5
| -rw-r--r-- | generic/regc_lex.c | 2 | ||||
| -rw-r--r-- | tests/reg.test | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/generic/regc_lex.c b/generic/regc_lex.c index 2208c0e..dc7a012 100644 --- a/generic/regc_lex.c +++ b/generic/regc_lex.c @@ -832,7 +832,7 @@ lexescape( RETV(PLAIN, CHR('\t')); break; case CHR('u'): - c = (uchr) lexdigits(v, 16, 1, 4); + c = (uchr) lexdigits(v, 16, 4, 4); if (ISERR()) { FAILW(REG_EESCAPE); } diff --git a/tests/reg.test b/tests/reg.test index a95d1e2..12cea7e 100644 --- a/tests/reg.test +++ b/tests/reg.test @@ -625,8 +625,7 @@ expectMatch 13.13 P "a\\nb" "a\nb" "a\nb" expectMatch 13.14 P "a\\rb" "a\rb" "a\rb" expectMatch 13.15 P "a\\tb" "a\tb" "a\tb" expectMatch 13.16 P "a\\u0008x" "a\bx" "a\bx" -expectMatch 13.17 P {a\u008x} "a\bx" "a\bx" -expectError 13.17.1 - {a\ux} EESCAPE +expectError 13.17 - {a\u008x} EESCAPE expectMatch 13.18 P "a\\u00088x" "a\b8x" "a\b8x" expectMatch 13.19 P "a\\U00000008x" "a\bx" "a\bx" expectMatch 13.20 P {a\U0000008x} "a\bx" "a\bx" |