Skip to content

Commit e945742

Browse files
committed
Merge branch 'master' into feat-publish-diagnostics
2 parents 7519dce + 2665678 commit e945742

File tree

231 files changed

+56920
-25001
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

231 files changed

+56920
-25001
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
- Add configuration option for suppressing the "Do you want to start a build?" prompt.
1313
- Add configuration option for autostarting the Code Analyzer.
1414
- Sync with latest parser/printer.
15+
- Support paths to rescript executables in arm64 architectures.
1516

1617
## 1.3.0
1718

analysis/examples/larger-project/src/P.js

+114
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
exception Sys_error(string)
2+
let input = _ => assert false
3+
let output = _ => assert false
4+
let open_temp_file = _ => assert false
5+
let close_out = _ => assert false
6+
let output_char = _ => assert false
7+
let really_input = _ => assert false
8+
let pp_get_formatter_tag_functions = _ => assert false
9+
type ttt = Open_text
10+
type out_channel
11+
let stderr = assert false
12+
let print_char = _ => assert false
13+
14+
type nativeint

analysis/examples/larger-project/src/arg_helper.js

+2-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

analysis/examples/larger-project/src/asttypes.res

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
open P
2+
13
@@ocaml.text(
24
/* ************************************************************************ */
35
/* */

analysis/examples/larger-project/src/clflags.js

+6-65
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

analysis/examples/larger-project/src/clflags.res

+1-1
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ let color: ref<option<string>> = ref(None) /* -color */
301301
let unboxed_types = ref(false)
302302

303303
let arg_spec = ref(list{})
304-
let arg_names = ref(Misc.StringMap.empty)
304+
let arg_names : ref<Misc.StringMap.t<int>> = ref(Misc.StringMap.empty)
305305

306306
let reset_arguments = () => {
307307
arg_spec := list{}

analysis/examples/larger-project/src/config.js

+5-66
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

analysis/examples/larger-project/src/config.res

-1
Original file line numberDiff line numberDiff line change
@@ -219,5 +219,4 @@ let print_config = oc => {
219219
p("cmxs_magic_number", cmxs_magic_number)
220220
p("cmt_magic_number", cmt_magic_number)
221221

222-
flush(oc)
223222
}

0 commit comments

Comments
 (0)