mirror/otto
1
0
Fork 0
mirror of https://github.com/robertkrimen/otto synced 2025-10-12 20:27:30 +08:00
Code Issues Releases Wiki Activity

Improve handling of \c

Browse Source
This commit is contained in:
Robert Krimen 2012-12-27 16:30:08 -08:00
parent ed1be716bd
commit de3300c23b
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -4,4 +4,5 @@
/.test262/test.otto
/.test262/digest.json
/.test262/.fail
/.test262/.fail.tmp
/.test262/panicking

8
panic_test.go
View File

@ -18,4 +18,12 @@ func Test_panic(t *testing.T) {
Object.defineProperty(abc, "0", { writable: false });
"0" in abc;
`, "false") // TODO Should be true, but we're really testing for a panic
// Test that a regular expression can contain \c0410 (CYRILLIC CAPITAL LETTER A)
// without panic
test(`
var abc = 0x0410;
var def = String.fromCharCode(abc)
new RegExp("\\c" + def).exec(def)
`, "null")
}

12
type_regexp.go
View File

@ -4,6 +4,7 @@ import (
"fmt"
"regexp"
"strings"
"bytes"
)
type _regExpObject struct {
@ -125,7 +126,8 @@ func execResultToArray(runtime *_runtime, target string, result []int) *_object
//\x{0031}-\x{0039}
var transformRegExp_matchSlashU = regexp.MustCompile(`\\u([[:xdigit:]]{1,4})`)
// ? Changing \\(c)([^A-Za-z]) to \\(c)([^A-Z]) causes ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A2.1_T3.js to panic
var transformRegExp_escape_c = regexp.MustCompile(`\\c([A-Za-z])`)
var transformRegExp_unescape_c = regexp.MustCompile(`\\c`)
var transformRegExp_unescape = regexp.MustCompile(strings.NewReplacer("\n", "", "\t", "", " ", "").Replace(`
(?:
@ -139,9 +141,6 @@ var transformRegExp_unescape = regexp.MustCompile(strings.NewReplacer("\n", "",
]
)()
) |
(?:
\\(c)([^A-Za-z])
) |
(?:
\\(u)([^[:xdigit:]])
) |
@ -175,6 +174,11 @@ func transformRegExp(ecmaRegExp string) (goRegExp string) {
// https://bugzilla.mozilla.org/show_bug.cgi/show_bug.cgi?id=334158
tmp := []byte(ecmaRegExp)
tmp = transformRegExp_unescape.ReplaceAll(tmp, []byte(`$1$2`))
tmp = transformRegExp_escape_c.ReplaceAllFunc(tmp, func(in []byte) []byte{
in = bytes.ToUpper(in)
return []byte(fmt.Sprintf("\\%o", in[0] - 64)) // \cA => \001 (A == 65)
})
tmp = transformRegExp_unescape_c.ReplaceAll(tmp, []byte(`c`))
tmp = transformRegExp_unescapeDollar.ReplaceAll(tmp, []byte(`$1`))
tmp = transformRegExp_matchSlashU.ReplaceAll(tmp, []byte(`\x{$1}`))
return string(tmp)