Skip to content

Turn on uncurried #6764

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.

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

Closed
wants to merge 34 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
4939d0a
turn on uncurried mode and fix a few issues
zth May 23, 2024
b25fed2
fix caml_obj
zth May 23, 2024
df2d2c1
uncurry Filename
bloodyowl May 23, 2024
c7a4feb
uncurry lexing
bloodyowl May 23, 2024
adb7172
Uncurry List
bloodyowl May 23, 2024
cfef95c
fix listlabels
zth May 23, 2024
5e4597f
fix arg
zth May 23, 2024
3d7f839
Uncurry Genlex
bloodyowl May 23, 2024
59135e6
fix a few more compile issues
zth May 23, 2024
6f98b25
make uncurried specific JSX files the default
zth May 23, 2024
4c8ad29
more fixes
zth May 23, 2024
4fede32
Uncurry Js module
bloodyowl May 23, 2024
8a8d6b2
more fix
zth May 23, 2024
5dc8bf5
Update output files
bloodyowl May 23, 2024
f1f7ab6
more fixes
zth May 23, 2024
98f7206
Update some tests
bloodyowl May 23, 2024
71aaee1
ari_regress
bloodyowl May 23, 2024
108527d
fix bs_list_test
zth May 23, 2024
6b3465a
uncurry print_alpha_test
bloodyowl May 23, 2024
14a0b35
digest_test
zth May 23, 2024
d9a7035
some of earger_curry_test
zth May 23, 2024
802e44f
caml_format_test
zth May 23, 2024
d3da135
for_loop_test and genlex_test
zth May 23, 2024
a216f0d
more
zth May 23, 2024
92ea1bd
more test fixes
zth May 23, 2024
9685119
update
bloodyowl May 23, 2024
5a5bf7f
Uncurry some test
bloodyowl May 23, 2024
02495f5
progress
bloodyowl May 23, 2024
8800a5e
remove t-last modules using bs.send.pipe
zth May 23, 2024
8c45248
more tests
zth May 24, 2024
cae770f
progress
bloodyowl May 24, 2024
d7fab6b
updates
bloodyowl May 24, 2024
40a0749
it compiles!
bloodyowl May 24, 2024
0439f82
Adapt tests to uncurried constraints
bloodyowl May 24, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion jscomp/build_tests/uncurried_printer/src/a.res
Original file line number Diff line number Diff line change
@@ -1 +1 @@
let a = (. b) => b
let a = b => b
2 changes: 1 addition & 1 deletion jscomp/core/res_compmisc.ml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ let initial_env ?(modulename) () =
let initial = Env.initial_safe_string in
let env =
if !Clflags.nopervasives then initial
else open_implicit_module (if !Config.uncurried = Uncurried then "PervasivesU" else "Pervasives") initial
else open_implicit_module ("Pervasives") initial
in
List.fold_left
(fun env m -> open_implicit_module m env)
Expand Down
2 changes: 1 addition & 1 deletion jscomp/ext/config.ml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ let bs_only = ref true
let unsafe_empty_array = ref false

type uncurried = Legacy | Uncurried | Swap
let uncurried = ref Legacy
let uncurried = ref Uncurried

and cmi_magic_number = "Caml1999I022"

Expand Down
3 changes: 1 addition & 2 deletions jscomp/ml/printtyp.ml
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,10 @@ let ident ppf id = pp_print_string ppf (ident_name id)
(* Print a path *)

let ident_pervasives = Ident.create_persistent "Pervasives"
let ident_pervasives_u = Ident.create_persistent "PervasivesU"
let printing_env = ref Env.empty
let non_shadowed_pervasive = function
| Pdot(Pident id, s, _pos) as path ->
(Ident.same id ident_pervasives || Ident.same id ident_pervasives_u) &&
(Ident.same id ident_pervasives) &&
(try Path.same path (Env.lookup_type (Lident s) !printing_env)
with Not_found -> true)
| _ -> false
Expand Down
290 changes: 0 additions & 290 deletions jscomp/others/js.ml

This file was deleted.

Loading
Loading