Skip to content

Sync latest syntax #5884

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
merged 3 commits into from
Dec 7, 2022
Merged

Sync latest syntax #5884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e5cadd
sync latest syntax
mununki Dec 7, 2022
27da0cf
changelog
mununki Dec 7, 2022
44f62b9
Update CHANGELOG.md
cristianoc Dec 7, 2022
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

- Prevent inlining of async functions in additional cases https://github.com/rescript-lang/rescript-compiler/issues/5860
- Revert to ubuntu-18.04 in CI to support Linux versions with older glibc https://github.com/rescript-lang/rescript-compiler/issues/5868
- Fix build error where aliasing arguments to `_` in the make function with JSX V4. https://github.com/rescript-lang/syntax/pull/720
- Fix parsing of spread props as an expression in JSX V4 https://github.com/rescript-lang/syntax/pull/721

# 10.1.0

Expand Down
2 changes: 2 additions & 0 deletions jscomp/napkin/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
- Fix issue where the JSX fragment without children build error https://github.com/rescript-lang/syntax/pull/704
- Fix issue where async as an id cannot be used with application and labelled arguments https://github.com/rescript-lang/syntax/issues/707
- Treat await as almost-unary operator weaker than pipe so `await foo->bar` means `await (foo->bar)` https://github.com/rescript-lang/syntax/pull/711
- Fix build error where aliasing arguments to `_` in the make function with JSX V4. https://github.com/rescript-lang/syntax/pull/720
- Fix parsing of spread props as an expression in JSX V4 https://github.com/rescript-lang/syntax/pull/721

#### :eyeglasses: Spec Compliance

Expand Down
5 changes: 1 addition & 4 deletions lib/4.06.1/unstable/js_compiler.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275780,10 +275780,7 @@ let transformStructureItem ~config mapper item =
| Pexp_fun
( _arg_label,
_default,
{
ppat_desc =
Ppat_construct ({txt = Lident "()"}, _) | Ppat_any;
},
{ppat_desc = Ppat_construct ({txt = Lident "()"}, _)},
expr ) ->
(patternsWithLabel, patternsWithNolabel, expr)
| Pexp_fun
Expand Down
7 changes: 2 additions & 5 deletions lib/4.06.1/unstable/js_playground_compiler.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275780,10 +275780,7 @@ let transformStructureItem ~config mapper item =
| Pexp_fun
( _arg_label,
_default,
{
ppat_desc =
Ppat_construct ({txt = Lident "()"}, _) | Ppat_any;
},
{ppat_desc = Ppat_construct ({txt = Lident "()"}, _)},
expr ) ->
(patternsWithLabel, patternsWithNolabel, expr)
| Pexp_fun
Expand Down Expand Up @@ -285935,7 +285932,7 @@ and parseJsxProp p =
(Location.mkloc "ns.namedArgLoc" loc, Parsetree.PStr [])
in
let attrExpr =
let e = parsePrimaryExpr ~operand:(parseAtomicExpr p) p in
let e = parsePrimaryExpr ~operand:(parseExpr p) p in
{e with pexp_attributes = propLocAttr :: e.pexp_attributes}
in
(* using label "spreadProps" to distinguish from others *)
Expand Down
7 changes: 2 additions & 5 deletions lib/4.06.1/whole_compiler.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286164,10 +286164,7 @@ let transformStructureItem ~config mapper item =
| Pexp_fun
( _arg_label,
_default,
{
ppat_desc =
Ppat_construct ({txt = Lident "()"}, _) | Ppat_any;
},
{ppat_desc = Ppat_construct ({txt = Lident "()"}, _)},
expr ) ->
(patternsWithLabel, patternsWithNolabel, expr)
| Pexp_fun
Expand Down Expand Up @@ -299467,7 +299464,7 @@ and parseJsxProp p =
(Location.mkloc "ns.namedArgLoc" loc, Parsetree.PStr [])
in
let attrExpr =
let e = parsePrimaryExpr ~operand:(parseAtomicExpr p) p in
let e = parsePrimaryExpr ~operand:(parseExpr p) p in
{e with pexp_attributes = propLocAttr :: e.pexp_attributes}
in
(* using label "spreadProps" to distinguish from others *)
Expand Down
2 changes: 1 addition & 1 deletion syntax
Open in desktop
Submodule syntax updated 8 files
+2 −0 CHANGELOG.md
+16 −6 cli/JSXV4.md
+1 −4 cli/reactjs_jsx_v4.ml
+1 −1 src/res_core.ml
+11 −0 tests/ppx/react/aliasProps.res
+45 −0 tests/ppx/react/expected/aliasProps.res.txt
+14 −0 tests/ppx/react/expected/spreadProps.res.txt
+11 −1 tests/ppx/react/spreadProps.res