Skip to content

Cleanup: convert caml_format and js_math to .res. #6834

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

Merged
merged 6 commits into from
Jul 2, 2024
Merged

Conversation

cristianoc
Copy link
Collaborator

No description provided.

@cknitt
Copy link
Member

cknitt commented Jun 27, 2024

Great to have this converted to .res!

But GitHub recognizes the caml_format.res as binary. Maybe because of this?

  if (c >= 'A' && c <= 'Z') || ((c >= 'À' && c <= 'Ö') || c >= 'Ø' && c <= 'Þ') {

?

The original OCaml code had

let lowercase (c : char) : char =
  if (c >= 'A' && c <= 'Z')
  || (c >= '\192' && c <= '\214')
  || (c >= '\216' && c <= '\222')
  then Caml_char.unsafe_chr(Caml_char.code c + 32)
  else c

There is also this line in OCaml

  let c = if i < len then s.!(i) else '\000' in

Can't we use escape sequences in the ReScript code, too?

@cristianoc
Copy link
Collaborator Author

Great to have this converted to .res!

But GitHub recognizes the caml_format.res as binary. Maybe because of this?

  if (c >= 'A' && c <= 'Z') || ((c >= 'À' && c <= 'Ö') || c >= 'Ø' && c <= 'Þ') {

?

The original OCaml code had

let lowercase (c : char) : char =
  if (c >= 'A' && c <= 'Z')
  || (c >= '\192' && c <= '\214')
  || (c >= '\216' && c <= '\222')
  then Caml_char.unsafe_chr(Caml_char.code c + 32)
  else c

There is also this line in OCaml

  let c = if i < len then s.!(i) else '\000' in

Can't we use escape sequences in the ReScript code, too?

Thanks. Should be OK now.

@cristianoc cristianoc changed the title Cleanup: convert caml_format to .res. Cleanup: convert caml_format and js_math to .res. Jun 27, 2024
@@ -75,7 +75,7 @@ o others/jsxPPXReactSupportC.cmi others/jsxPPXReactSupportC.cmj : cc others/jsxP
o others/jsxPPXReactSupportU.cmi others/jsxPPXReactSupportU.cmj : cc others/jsxPPXReactSupportU.res | others/belt_internals.cmi others/js.cmi others/jsxU.cmj $bsc
o others/jsxU.cmi others/jsxU.cmj : cc others/jsxU.res | others/belt_internals.cmi others/js.cmi $bsc
o js_pkg : phony others/js_OO.cmi others/js_OO.cmj others/js_array.cmi others/js_array.cmj others/js_array2.cmi others/js_array2.cmj others/js_bigint.cmi others/js_bigint.cmj others/js_blob.cmi others/js_blob.cmj others/js_cast.cmi others/js_cast.cmj others/js_console.cmi others/js_console.cmj others/js_date.cmi others/js_date.cmj others/js_dict.cmi others/js_dict.cmj others/js_exn.cmi others/js_exn.cmj others/js_file.cmi others/js_file.cmj others/js_float.cmi others/js_float.cmj others/js_global.cmi others/js_global.cmj others/js_int.cmi others/js_int.cmj others/js_json.cmi others/js_json.cmj others/js_list.cmi others/js_list.cmj others/js_map.cmi others/js_map.cmj others/js_mapperRt.cmi others/js_mapperRt.cmj others/js_math.cmi others/js_math.cmj others/js_null.cmi others/js_null.cmj others/js_null_undefined.cmi others/js_null_undefined.cmj others/js_obj.cmi others/js_obj.cmj others/js_option.cmi others/js_option.cmj others/js_promise.cmi others/js_promise.cmj others/js_promise2.cmi others/js_promise2.cmj others/js_re.cmi others/js_re.cmj others/js_result.cmi others/js_result.cmj others/js_set.cmi others/js_set.cmj others/js_string.cmi others/js_string.cmj others/js_string2.cmi others/js_string2.cmj others/js_typed_array.cmi others/js_typed_array.cmj others/js_typed_array2.cmi others/js_typed_array2.cmj others/js_types.cmi others/js_types.cmj others/js_undefined.cmi others/js_undefined.cmj others/js_vector.cmi others/js_vector.cmj others/js_weakmap.cmi others/js_weakmap.cmj others/js_weakset.cmi others/js_weakset.cmj others/jsxC.cmi others/jsxC.cmj others/jsxDOMC.cmi others/jsxDOMC.cmj others/jsxDOMStyle.cmi others/jsxDOMStyle.cmj others/jsxDOMU.cmi others/jsxDOMU.cmj others/jsxEventC.cmi others/jsxEventC.cmj others/jsxEventU.cmi others/jsxEventU.cmj others/jsxPPXReactSupportC.cmi others/jsxPPXReactSupportC.cmj others/jsxPPXReactSupportU.cmi others/jsxPPXReactSupportU.cmj others/jsxU.cmi others/jsxU.cmj
o others/belt_Array.cmj : cc_cmi others/belt_Array.res | others/belt.cmi others/belt_Array.cmi others/belt_internals.cmi others/js.cmi others/js.cmj others/js_math.cmj $bsc js_pkg
o others/belt_Array.cmj : cc_cmi others/belt_Array.res | others/belt.cmi others/belt_Array.cmi others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
Copy link
Member

@cknitt cknitt Jun 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reason I didn't convert js_math.res before was that it caused this change in release.ninja that I couldn't explain.

The dependency of belt_Array on js_math is gone now.
This might cause problems depending on the compilation order.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps we can remove the dependency:

@val @scope("Math") external random : unit => float = "random"
@val @scope("Math") external floor : float => int = "floor"
external toFloat: int => float = "%floatofint"

let shuffleInPlace = xs => {
  let len = length(xs)
  let random_int = (min, max) => floor(random() *. toFloat(max - min)) + min
  for i in 0 to len - 1 {
    swapUnsafe(xs, i, random_int(i, len)) /* [i,len) */
  }
}

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dependency removed now.

@cristianoc
Copy link
Collaborator Author

@cknitt this should be good to go, unless there are other potential issues.

@cristianoc cristianoc enabled auto-merge (squash) July 2, 2024 11:54
@cristianoc cristianoc merged commit 743b236 into master Jul 2, 2024
19 checks passed
@cristianoc cristianoc deleted the caml_format branch July 2, 2024 12:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants