55b3d39 · elk · git.iko.soy

Correct the associativity of (::) and ensure that JS is generated properly for (::).

commit55b3d3910d47e1109e34bed0d236e66b96b9af8d authorevancz <info@elm-lang.org> dateTue 5 Feb 2013, 22:26 (14 years ago) parent6b2b19d

2 files changed+2−2

unifiedsplit

elm/src/Gen/CompileToJS.hs+1−1

@@ -307,7 +307,7 @@ binop (o:p) e1 e2

307307 | otherwise =

308308 let ops = ["+","-","*","/","&&","||"] in

309309 case o:p of

310− ":" -> jsCons e1 e2

310+ "::" -> jsCons e1 e2

311311 "++" -> append e1 e2

312312 "$" -> e1 ++ parens e2

313313 "." -> jsFunc "x" . ret $ e1 ++ parens (e2 ++ parens "x")

elm/src/Parse/Binops.hs+1−1

@@ -21,7 +21,7 @@ table = [ (9, R, ".")

2121 , (8, R, "^")

2222 , (7, L, "*"), (7, L, "/"), (7, L, "mod"), (7, L, "div"), (7, L, "rem")

2323 , (6, L, "+"), (6, L, "-")

24− , (5, R, ":" ), (5, R, "++")

24+ , (5, R, "::"), (5, R, "++")

2525 , (4, N, "<="), (4, N, ">="), (4, N, "<")

2626 , (4, N, "=="), (4, N, "/="), (4, N, ">")

2727 , (4, L, "~"), (4, L, "<~")