Skip to content

Fix parse error when id == ... is used as an argument #151

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
lihaoyi-databricks merged 2 commits into from
May 30, 2023
Merged

Fix parse error when id == ... is used as an argument #151

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
05693c3
Fix parse error when `id == ...` is used as an argument
gilles-duboscq Jun 10, 2022
128a382
Merge branch 'master' into gd/127
lihaoyi-databricks May 30, 2023
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
3 changes: 2 additions & 1 deletion sjsonnet/bench/src-jvm-native/sjsonnet/SjsonnetTestMain.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ object SjsonnetTestMain {
"unicode",
"unix_line_endings",
"unparse",
"verbatim_strings"
"verbatim_strings",
"issue_127"
// disabled because it spams the console a lot
// "stdlib"
)
Expand Down
2 changes: 1 addition & 1 deletion sjsonnet/src/sjsonnet/Parser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ class Parser(val currentFile: Path) {
def bind[_: P] =
P( Pos ~~ id ~ ("(" ~/ params.? ~ ")").?.map(_.flatten).map(_.getOrElse(null)) ~ "=" ~ expr ).map(Expr.Bind.tupled)

def args[_: P] = P( ((id ~ "=").? ~ expr).rep(sep = ",") ~ ",".? ).flatMapX{ x =>
def args[_: P] = P( ((id ~ "=" ~ !"=").? ~ expr).rep(sep = ",") ~ ",".? ).flatMapX{ x =>
if (x.sliding(2).exists{case Seq(l, r) => l._1.isDefined && r._1.isEmpty case _ => false}) {
Fail.opaque("no positional params after named params")
} else {
Expand Down
6 changes: 6 additions & 0 deletions sjsonnet/test/resources/test_suite/issue_127.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
local myFunc = function(a)
if (a) then "a" else "b";

local b = "aaa";

std.assertEqual(myFunc(b == [] || b == ['e']), "b")
1 change: 1 addition & 0 deletions sjsonnet/test/src-jvm-native/sjsonnet/FileTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ object FileTests extends TestSuite{
test("unix_line_endings") - checkGolden()
test("unparse") - checkGolden()
test("verbatim_strings") - check()
test("issue_127") - check()
}
}