Skip to content

Update urlchar to handle character escaping. #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kisielk merged 2 commits into from
Jan 15, 2017
Merged

Update urlchar to handle character escaping. #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d5d5e4
Update urlchar to handle character escaping.
daohoangson Jan 15, 2017
8934a2a
Add urlchar macro explanation
daohoangson Jan 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions scanner/scanner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,18 @@ var macros = map[string]string{
"num": `[0-9]*\.[0-9]+|[0-9]+`,
"string": `"(?:{stringchar}|')*"|'(?:{stringchar}|")*'`,
"stringchar": `{urlchar}|[ ]|\\{nl}`,
"urlchar": "[\u0009\u0021\u0023-\u0026\u0027-\u007E]|{nonascii}|{escape}",
"nl": `[\n\r\f]|\r\n`,
"w": `{wc}*`,
"wc": `[\t\n\f\r ]`,

// urlchar should accept [(ascii characters minus those that need escaping)|{nonascii}|{escape}]
// ASCII characters range = `[\u0020-\u007e]`
// Skip space \u0020 = `[\u0021-\u007e]`
// Skip quotation mark \0022 = `[\u0021\u0023-\u007e]`
// Skip apostrophe \u0027 = `[\u0021\u0023-\u0026\u0028-\u007e]`
// Skip reverse solidus \u005c = `[\u0021\u0023-\u0026\u0028-\u005b\u005d\u007e]`
// Finally, the left square bracket (\u005b) and right (\u005d) needs escaping themselves
"urlchar": "[\u0021\u0023-\u0026\u0028-\\\u005b\\\u005d-\u007E]|{nonascii}|{escape}",
}

// productions maps the list of tokens to patterns to be expanded.
Expand Down Expand Up @@ -254,10 +262,10 @@ func (s *Scanner) Next() *Token {
match := matchers[TokenString].FindString(input)
if match != "" {
return s.emitToken(TokenString, match)
} else {
s.err = &Token{TokenError, "unclosed quotation mark", s.row, s.col}
return s.err
}

s.err = &Token{TokenError, "unclosed quotation mark", s.row, s.col}
return s.err
case '/':
// Comment, error or Char.
if len(input) > 1 && input[1] == '*' {
Expand Down
6 changes: 6 additions & 0 deletions scanner/scanner_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,13 @@ func TestMatchers(t *testing.T) {

checkMatch("abcd", TokenIdent, "abcd")
checkMatch(`"abcd"`, TokenString, `"abcd"`)
checkMatch(`"ab'cd"`, TokenString, `"ab'cd"`)
checkMatch(`"ab\"cd"`, TokenString, `"ab\"cd"`)
checkMatch(`"ab\\cd"`, TokenString, `"ab\\cd"`)
checkMatch("'abcd'", TokenString, "'abcd'")
checkMatch(`'ab"cd'`, TokenString, `'ab"cd'`)
checkMatch(`'ab\'cd'`, TokenString, `'ab\'cd'`)
checkMatch(`'ab\\cd'`, TokenString, `'ab\\cd'`)
checkMatch("#name", TokenHash, "#name")
checkMatch("42''", TokenNumber, "42", TokenString, "''")
checkMatch("4.2", TokenNumber, "4.2")
Expand Down