Commit 97d7bb66 authored by beoran's avatar beoran

Merge branch '210-fix-test' into 'master'

Fix failing test. Newlines are not alowed in identifiers between guillemets.

See merge request !212
parents 0c4dbb2a 98d90f8e
......@@ -4231,7 +4231,7 @@ yystate315:
switch {
default:
goto yyabort
case c == '\t' || c == '\n' || c == '\r' || c >= ' ' && c <= '~' || c >= '\u0080' && c <= '\u0083':
case c >= '\x01' && c <= '\t' || c == '\v' || c == '\f' || c >= '\x0e' && c <= '\u0084' || c >= '\u0086' && c <= 'ÿ':
goto yystate316
}
......@@ -4240,10 +4240,10 @@ yystate316:
switch {
default:
goto yyabort
case c == '\t' || c == '\n' || c == '\r' || c >= ' ' && c <= '~' || c >= '\u0080' && c <= '\u0083':
goto yystate316
case c == '\u0085':
goto yystate317
case c >= '\x01' && c <= '\t' || c == '\v' || c == '\f' || c >= '\x0e' && c <= '\u0084' || c >= '\u0086' && c <= 'ÿ':
goto yystate316
}
yystate317:
......@@ -4434,7 +4434,7 @@ yyrule14: // ([^`]|\n)*`
{
return l.str(lval, "`")
}
yyrule15: // {og}{dident}{cg}
yyrule15: // {og}[^\n\r\x85]+{cg}
{
return l.delimitedIdentifier(lval)
return identifier
......
......@@ -68,8 +68,8 @@ func TestScanner0(t *testing.T) {
{`«id with spaces»`, identifier, 1, 1, 1, 19, "«id with spaces»"},
{`«TRANSACTION»`, identifier, 1, 1, 1, 16, "«TRANSACTION»"},
{"«-+ \t\r\n!\"#$%&'()*,./:;<=>?@[\\]^{|}~=>`»", identifier,
1, 1, 2, 34, "«-+ \t\r\n!\"#$%&'()*,./:;<=>?@[\\]^{|}~=>`»"},
{"«-+ \t!\"#$%&'()*,./:;<=>?@[\\]^{|}~=>`»", identifier,
1, 1, 1, 40, "«-+ \t!\"#$%&'()*,./:;<=>?@[\\]^{|}~=>`»"},
{`«€/µg»`, identifier, 1, 1, 1, 12, "«€/µg»"},
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment