Adapt to rename

Author: cknitt

.github/workflows/ci.yml

@@ -131,7 +131,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          fetch-depth: 2 # to be able to check for changes in subfolder jscomp/syntax later
+          fetch-depth: 2 # to be able to check for changes in subfolder compiler/syntax later
 
       - name: Use Node.js
         uses: actions/setup-node@v4
@@ -301,7 +301,7 @@ jobs:
         id: syntax-diff
         shell: bash
         run: |
-          if git diff --name-only --exit-code HEAD^ HEAD -- jscomp/syntax; then
+          if git diff --name-only --exit-code HEAD^ HEAD -- compiler/syntax; then
             echo "syntax_status=unchanged" >> $GITHUB_ENV
           else
             echo "syntax_status=changed" >> $GITHUB_ENV
@@ -337,7 +337,7 @@ jobs:
         run: |
           opam exec -- node packages/playground-bundling/scripts/generate_cmijs.js
           opam exec -- dune build --profile browser
-          cp ./_build/default/jscomp/jsoo/jsoo_playground_main.bc.js playground/compiler.js
+          cp ./_build/default/compiler/jsoo/jsoo_playground_main.bc.js playground/compiler.js
 
       - name: Test playground compiler
         if: matrix.build_playground

.gitignore

@@ -58,7 +58,6 @@ tests/build_tests/*/lib/
 *.jsoo.js
 *.so
 tmp/
-jscomp/.lsp
 tracing*.json
 .nyc_output
 .vscode/launch.json

CONTRIBUTING.md

@@ -162,17 +162,17 @@ node scripts/test.js -bsb
 
 **Run ounit tests:**
 
-This will run unit tests for compiler related modules. The tests can be found in `jscomp/ounit_tests`.
+This will run unit tests for compiler related modules. The tests can be found in `compiler/ounit_tests`.
 
 ```
 node scripts/test.js -ounit
 ```
 
 ## Contributing to the Runtime
 
-The runtime implementation is written in OCaml with some raw JS code embedded (`jscomp/runtime` directory).
+The runtime implementation is written in ReScript with some raw JS code embedded (`runtime` directory).
 
-The goal is to implement the runtime **purely in OCaml**. This includes removing all existing occurrences of embedded raw JS code as well whenever possible, and you can help!
+The goal is to implement the runtime **purely in ReScript**. This includes removing all existing occurrences of embedded raw JS code as well whenever possible, and you can help!
 
 Each new PR should include appropriate testing.
 
@@ -226,7 +226,7 @@ opam install js_of_ocaml.4.0.0
 
 ### Building the Bundle
 
-The entry point of the JSOO bundle is located in `jscomp/jsoo/jsoo_playground_main.ml`, the compiler and its relevant runtime cmij files can be built via make:
+The entry point of the JSOO bundle is located in `compiler/jsoo/jsoo_playground_main.ml`, the compiler and its relevant runtime cmij files can be built via make:
 
 ```sh
 make playground

CREDITS.md

@@ -20,35 +20,28 @@ Thanks to the [OCaml](https://ocaml.org) team, obviously, without such a beautif
 
 ReScript builds on these parts of OCaml:
 
-- [`jscomp/core/lam_pass_exits.ml`](jscomp/core/lam_pass_exits.ml)
-- [`jscomp/core/lam_pass_lets_dce.ml`](jscomp/core/lam_pass_lets_dce.ml)
+- [`compiler/core/lam_pass_exits.ml`](compiler/core/lam_pass_exits.ml)
+- [`compiler/core/lam_pass_lets_dce.ml`](compiler/core/lam_pass_lets_dce.ml)
 
 These modules were adapted from [`ocaml/bytecomp/simplif.ml`](ocaml/bytecomp/simplif.ml) for
 JavaScript specific optimization purposes.
 
-- [`jscomp/main/rescript_compiler_main.ml`](jscomp/main/rescript_compiler_main.ml)
+- [`compiler/main/rescript_compiler_main.ml`](compiler/main/rescript_compiler_main.ml)
 
-`jscomp/main/rescript_compiler_main.ml` is adapted from [`ocaml/driver/main.ml`](ocaml/driver/main.ml). It is the main entry
+`compiler/main/rescript_compiler_main.ml` is adapted from [`ocaml/driver/main.ml`](ocaml/driver/main.ml). It is the main entry
 point of the underlying compiler.
 
-- [`jscomp/stdlib-406`](jscomp/stdlib-406)
-
-`jscomp/stdlib-*` is copied from [`ocaml/stdlib`](ocaml/stdlib). It is compiled to JavaScript and included with ReScript.
-
 ReScript imported one file from [jsoo](https://github.com/ocsigen/js_of_ocaml)
 
-- [`jscomp/core/js_dump.ml`](jscomp/core/js_dump.ml) (pretty printer)
+- [`compiler/core/js_dump.ml`](compiler/core/js_dump.ml) (pretty printer)
 
 This file was imported but changed significantly in iterations later.
 
 - [`tests/tests`](tests/tests)
 
 `tests/tests` is based on [`ocaml/testsuite`](ocaml/testsuite).
 
-ReScript unit test builds on parts of [OUnit](http://ounit.forge.ocamlcore.org/)
-
-- [`jscomp/ounit`](jscomp/ounit) is adapted from ounit, the unit test
-  utilities are only used for dev purpose, they are not required for distribution
+ReScript compiler unit test builds on [OUnit](http://ounit.forge.ocamlcore.org/)
 
 ## Ninja
 

Makefile

@@ -13,7 +13,7 @@ bench:
 	$(DUNE_BIN_DIR)/syntax_benchmarks
 
 dce:
-	reanalyze.exe -dce-cmt _build/default/jscomp
+	reanalyze.exe -dce-cmt _build/default/compiler
 
 rewatch:
 	cargo build --manifest-path rewatch/Cargo.toml
@@ -48,7 +48,7 @@ test-gentype:
 test-all: test test-gentype
 
 reanalyze:
-	reanalyze.exe -set-exit-code -all-cmt _build/default/jscomp -suppress jscomp/syntax/testrunner -exclude-paths jscomp/outcome_printer,jscomp/ounit_tests,jscomp/ml,jscomp/js_parser,jscomp/frontend,jscomp/ext,jscomp/depends,jscomp/core,jscomp/common,jscomp/cmij,jscomp/bsb_helper,jscomp/bsb
+	reanalyze.exe -set-exit-code -all-cmt _build/default/compiler -suppress compiler/syntax/testrunner -exclude-paths compiler/outcome_printer,compiler/ounit_tests,compiler/ml,compiler/js_parser,compiler/frontend,compiler/ext,compiler/depends,compiler/core,compiler/common,compiler/cmij,compiler/bsb_helper,compiler/bsb
 
 lib: build node_modules/.bin/semver
 	./scripts/buildRuntime.sh
@@ -60,7 +60,7 @@ artifacts: lib
 # Builds the core playground bundle (without the relevant cmijs files for the runtime)
 playground:
 	dune build --profile browser
-	cp ./_build/default/jscomp/jsoo/jsoo_playground_main.bc.js playground/compiler.js
+	cp ./_build/default/compiler/jsoo/jsoo_playground_main.bc.js playground/compiler.js
 
 # Creates all the relevant core and third party cmij files to side-load together with the playground bundle
 playground-cmijs: artifacts

README.md

@@ -101,7 +101,7 @@ For discussions on ongoing development, see the [Development](https://forum.resc
 
 ReScript is licensed under LGPL version 3, with relaxed rules about creating and distributing combined work. See the [LICENSE](LICENSE) file for details.
 
-The ReScript parser (subdirectory `jscomp/syntax`) is licensed under the [MIT License](jscomp/syntax/LICENSE).
+The ReScript parser (subdirectory `compiler/syntax`) is licensed under the [MIT License](compiler/syntax/LICENSE).
 
 The `ninja` subdirectory contains the vendored [ninja](https://github.com/ninja-build/ninja) build system.
 Refer to its copyright and license notices for information about its licensing.

compiler/bsb/bsb_build_util.mli

@@ -56,7 +56,7 @@ val include_dirs_by : 'a list -> ('a -> string) -> string
 
 val mkp : string -> unit
 
-(* The path of [bsc] and [bsdep] is normalized so that the invokation of [./jscomp/bin/bsb.exe]
+(* The path of [bsc] and [bsdep] is normalized so that the invokation of [./compiler/bin/bsb.exe]
    and [bsb.exe] (combined with a dirty bsconfig.json) will not trigger unnecessary rebuild.
 
    The location of [bsc] and [bsdep] is configured by the combination of [Sys.executable_name]

compiler/bsb_helper/bsb_helper_depfile_gen.ml

@@ -107,7 +107,7 @@ let oc_cmi buf namespace source =
      it can be errored out earlier
 
    #5368: It turns out there are many false positives on detecting self-cycles (see: `tests/build_tests/zerocycle`)
-          To properly solve this, we would need to `jscomp/ml/depend.ml` because
+          To properly solve this, we would need to `compiler/ml/depend.ml` because
             cmi and cmj is broken in the first place (same problem as in ocaml/ocaml#4618).
           So we will just ignore the self-cycles. Even if there is indeed a self-cycle, it should fail to compile anyway.
 *)

compiler/ext/ext_path.ml

@@ -41,26 +41,6 @@ let split_by_sep_per_os : string -> string list =
       x
   else fun x -> Ext_string.split x '/'
 
-(** example
-    {[
-      "/bb/mbigc/mbig2899/bgit/rescript/jscomp/stdlib/external/pervasives.cmj"
-        "/bb/mbigc/mbig2899/bgit/rescript/jscomp/stdlib/ocaml_array.ml"
-    ]}
-
-    The other way
-    {[
-
-      "/bb/mbigc/mbig2899/bgit/rescript/jscomp/stdlib/ocaml_array.ml"
-        "/bb/mbigc/mbig2899/bgit/rescript/jscomp/stdlib/external/pervasives.cmj"
-    ]}
-    {[
-      "/bb/mbigc/mbig2899/bgit/rescript/jscomp/stdlib//ocaml_array.ml"
-    ]}
-    {[
-      /a/b
-      /c/d
-    ]}
-*)
 let node_relative_path ~from:(file_or_dir_2 : t) (file_or_dir_1 : t) =
   let relevant_dir1 =
     match file_or_dir_1 with Dir x -> x

compiler/syntax/benchmarks/Benchmark.ml

@@ -226,7 +226,7 @@ end = struct
     Benchmark.report b
 
   let run () =
-    let data_dir = "jscomp/syntax/benchmarks/data" in
+    let data_dir = "compiler/syntax/benchmarks/data" in
     benchmark (Filename.concat data_dir "RedBlackTree.res") Rescript Parse;
     benchmark (Filename.concat data_dir "RedBlackTree.res") Rescript Print;
     benchmark

compiler/syntax/testrunner/res_test.ml

@@ -1,6 +1,6 @@
 module IO = Res_io
 
-let data_dir = "jscomp/syntax/tests"
+let data_dir = "compiler/syntax/tests"
 
 (* test printing of .res file*)
 let () =

dune

@@ -1 +1 @@
-(dirs jscomp)
+(dirs compiler)

scripts/prebuilt.js

@@ -7,7 +7,7 @@ const assert = require("assert");
 
 const package_config = require(path.join(__dirname, "..", "package.json"));
 const bsVersion = fs.readFileSync(
-  path.join(__dirname, "..", "jscomp", "common", "bs_version.ml"),
+  path.join(__dirname, "..", "compiler", "common", "bs_version.ml"),
   "utf-8",
 );
 

scripts/setVersion.js

@@ -18,7 +18,7 @@ fs.writeFileSync(
 );
 
 fs.writeFileSync(
-  "./jscomp/common/bs_version.ml",
+  "./compiler/common/bs_version.ml",
   `(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
  *
  * This program is free software: you can redistribute it and/or modify

scripts/test_syntax.sh

@@ -23,7 +23,7 @@ function maybeWait {
   [[ $((taskCount % 20)) = 0 ]] && wait
 }
 
-pushd jscomp/syntax
+pushd compiler/syntax
 
 rm -rf temp
 mkdir temp