Update to recent version of dep, fix lock files

This commit is contained in:
Andrey Smirnov
2018-04-05 16:25:39 +03:00
parent dc7bbf35eb
commit 181806a9a2
652 changed files with 287 additions and 138 deletions
+49 -49
View File
@@ -11,63 +11,63 @@ var lexingTests = []struct {
expression string
expected []token
}{
{"*", []token{token{tStar, "*", 0, 1}}},
{".", []token{token{tDot, ".", 0, 1}}},
{"[?", []token{token{tFilter, "[?", 0, 2}}},
{"[]", []token{token{tFlatten, "[]", 0, 2}}},
{"(", []token{token{tLparen, "(", 0, 1}}},
{")", []token{token{tRparen, ")", 0, 1}}},
{"[", []token{token{tLbracket, "[", 0, 1}}},
{"]", []token{token{tRbracket, "]", 0, 1}}},
{"{", []token{token{tLbrace, "{", 0, 1}}},
{"}", []token{token{tRbrace, "}", 0, 1}}},
{"||", []token{token{tOr, "||", 0, 2}}},
{"|", []token{token{tPipe, "|", 0, 1}}},
{"29", []token{token{tNumber, "29", 0, 2}}},
{"2", []token{token{tNumber, "2", 0, 1}}},
{"0", []token{token{tNumber, "0", 0, 1}}},
{"-20", []token{token{tNumber, "-20", 0, 3}}},
{"foo", []token{token{tUnquotedIdentifier, "foo", 0, 3}}},
{`"bar"`, []token{token{tQuotedIdentifier, "bar", 0, 3}}},
{"*", []token{{tStar, "*", 0, 1}}},
{".", []token{{tDot, ".", 0, 1}}},
{"[?", []token{{tFilter, "[?", 0, 2}}},
{"[]", []token{{tFlatten, "[]", 0, 2}}},
{"(", []token{{tLparen, "(", 0, 1}}},
{")", []token{{tRparen, ")", 0, 1}}},
{"[", []token{{tLbracket, "[", 0, 1}}},
{"]", []token{{tRbracket, "]", 0, 1}}},
{"{", []token{{tLbrace, "{", 0, 1}}},
{"}", []token{{tRbrace, "}", 0, 1}}},
{"||", []token{{tOr, "||", 0, 2}}},
{"|", []token{{tPipe, "|", 0, 1}}},
{"29", []token{{tNumber, "29", 0, 2}}},
{"2", []token{{tNumber, "2", 0, 1}}},
{"0", []token{{tNumber, "0", 0, 1}}},
{"-20", []token{{tNumber, "-20", 0, 3}}},
{"foo", []token{{tUnquotedIdentifier, "foo", 0, 3}}},
{`"bar"`, []token{{tQuotedIdentifier, "bar", 0, 3}}},
// Escaping the delimiter
{`"bar\"baz"`, []token{token{tQuotedIdentifier, `bar"baz`, 0, 7}}},
{",", []token{token{tComma, ",", 0, 1}}},
{":", []token{token{tColon, ":", 0, 1}}},
{"<", []token{token{tLT, "<", 0, 1}}},
{"<=", []token{token{tLTE, "<=", 0, 2}}},
{">", []token{token{tGT, ">", 0, 1}}},
{">=", []token{token{tGTE, ">=", 0, 2}}},
{"==", []token{token{tEQ, "==", 0, 2}}},
{"!=", []token{token{tNE, "!=", 0, 2}}},
{"`[0, 1, 2]`", []token{token{tJSONLiteral, "[0, 1, 2]", 1, 9}}},
{"'foo'", []token{token{tStringLiteral, "foo", 1, 3}}},
{"'a'", []token{token{tStringLiteral, "a", 1, 1}}},
{`'foo\'bar'`, []token{token{tStringLiteral, "foo'bar", 1, 7}}},
{"@", []token{token{tCurrent, "@", 0, 1}}},
{"&", []token{token{tExpref, "&", 0, 1}}},
{`"bar\"baz"`, []token{{tQuotedIdentifier, `bar"baz`, 0, 7}}},
{",", []token{{tComma, ",", 0, 1}}},
{":", []token{{tColon, ":", 0, 1}}},
{"<", []token{{tLT, "<", 0, 1}}},
{"<=", []token{{tLTE, "<=", 0, 2}}},
{">", []token{{tGT, ">", 0, 1}}},
{">=", []token{{tGTE, ">=", 0, 2}}},
{"==", []token{{tEQ, "==", 0, 2}}},
{"!=", []token{{tNE, "!=", 0, 2}}},
{"`[0, 1, 2]`", []token{{tJSONLiteral, "[0, 1, 2]", 1, 9}}},
{"'foo'", []token{{tStringLiteral, "foo", 1, 3}}},
{"'a'", []token{{tStringLiteral, "a", 1, 1}}},
{`'foo\'bar'`, []token{{tStringLiteral, "foo'bar", 1, 7}}},
{"@", []token{{tCurrent, "@", 0, 1}}},
{"&", []token{{tExpref, "&", 0, 1}}},
// Quoted identifier unicode escape sequences
{`"\u2713"`, []token{token{tQuotedIdentifier, "✓", 0, 3}}},
{`"\\"`, []token{token{tQuotedIdentifier, `\`, 0, 1}}},
{"`\"foo\"`", []token{token{tJSONLiteral, "\"foo\"", 1, 5}}},
{`"\u2713"`, []token{{tQuotedIdentifier, "✓", 0, 3}}},
{`"\\"`, []token{{tQuotedIdentifier, `\`, 0, 1}}},
{"`\"foo\"`", []token{{tJSONLiteral, "\"foo\"", 1, 5}}},
// Combinations of tokens.
{"foo.bar", []token{
token{tUnquotedIdentifier, "foo", 0, 3},
token{tDot, ".", 3, 1},
token{tUnquotedIdentifier, "bar", 4, 3},
{tUnquotedIdentifier, "foo", 0, 3},
{tDot, ".", 3, 1},
{tUnquotedIdentifier, "bar", 4, 3},
}},
{"foo[0]", []token{
token{tUnquotedIdentifier, "foo", 0, 3},
token{tLbracket, "[", 3, 1},
token{tNumber, "0", 4, 1},
token{tRbracket, "]", 5, 1},
{tUnquotedIdentifier, "foo", 0, 3},
{tLbracket, "[", 3, 1},
{tNumber, "0", 4, 1},
{tRbracket, "]", 5, 1},
}},
{"foo[?a<b]", []token{
token{tUnquotedIdentifier, "foo", 0, 3},
token{tFilter, "[?", 3, 2},
token{tUnquotedIdentifier, "a", 5, 1},
token{tLT, "<", 6, 1},
token{tUnquotedIdentifier, "b", 7, 1},
token{tRbracket, "]", 8, 1},
{tUnquotedIdentifier, "foo", 0, 3},
{tFilter, "[?", 3, 2},
{tUnquotedIdentifier, "a", 5, 1},
{tLT, "<", 6, 1},
{tUnquotedIdentifier, "b", 7, 1},
{tRbracket, "]", 8, 1},
}},
}