Update the compiler libs with those from the compiler. (#744)

* Update the compiler libs with those from the compiler.

So we have a single copy around.
Also, a prerequisite to update the vendored parser.

* Install cppo in CI

* No need to wrap ext.

* No need to wrap Ml.

* Remove the two remaining wrapped libraries.

Author: cristianoc

.github/workflows/ci.yml

@@ -55,7 +55,7 @@ jobs:
         node-version: 16
 
     - run: npm ci
-    - run: opam install dune
+    - run: opam install dune cppo
     - run: npm run compile
 
     # These 2 runs (or just the second?) are for when you have opam dependencies. We don't.

analysis/dune

@@ -1 +1,16 @@
 (dirs src reanalyze vendor)
+
+(env
+ (dev
+  (env-vars
+   (CPPO_FLAGS -U=RELEASE)))
+ (release
+  (env-vars
+   (CPPO_FLAGS -D=RELEASE))
+  (ocamlopt_flags
+   (:standard -O3 -unbox-closures)))
+ (static
+  (env-vars
+   (CPPO_FLAGS -D=RELEASE))
+  (ocamlopt_flags
+   (:standard -O3 -unbox-closures))))

analysis/dune-project

@@ -1,4 +1,4 @@
-(lang dune 2.0)
+(lang dune 2.3)
 
 (generate_opam_files true)
 
@@ -18,6 +18,8 @@
    (>= 4.10))
   (ocamlformat
    (= 0.22.4))
+  (cppo
+   (= 1.6.9))
   (reanalyze
    (= 2.23.0))
   dune))

analysis/reanalyze/src/Paths.ml

@@ -1,5 +1,5 @@
 open Common
-module StringMap = Ext_json_types.StringMap
+module StringMap = Map_string
 
 let bsconfig = "bsconfig.json"
 
@@ -138,19 +138,19 @@ let readDirsFromConfig ~configSources =
   in
   let rec processSourceItem (sourceItem : Ext_json_types.t) =
     match sourceItem with
-    | Str str -> str |> processDir ~subdirs:false
-    | Obj map -> (
-      match map |> StringMap.find_opt "dir" with
-      | Some (Str str) ->
+    | Str {str} -> str |> processDir ~subdirs:false
+    | Obj {map} -> (
+      match StringMap.find_opt map "dir" with
+      | Some (Str {str}) ->
         let subdirs =
-          match map |> StringMap.find_opt "subdirs" with
+          match StringMap.find_opt map "subdirs" with
           | Some (True _) -> true
           | Some (False _) -> false
           | _ -> false
         in
         str |> processDir ~subdirs
       | _ -> ())
-    | Arr arr -> arr |> Array.iter processSourceItem
+    | Arr {content = arr} -> arr |> Array.iter processSourceItem
     | _ -> ()
   in
   (match configSources with
@@ -166,13 +166,13 @@ let readSourceDirs ~configSources =
   let dirs = ref [] in
   let readDirs json =
     match json with
-    | Ext_json_types.Obj map -> (
-      match map |> StringMap.find_opt "dirs" with
-      | Some (Arr arr) ->
+    | Ext_json_types.Obj {map} -> (
+      match StringMap.find_opt map "dirs" with
+      | Some (Arr {content = arr}) ->
         arr
         |> Array.iter (fun x ->
                match x with
-               | Ext_json_types.Str str -> dirs := str :: !dirs
+               | Ext_json_types.Str {str} -> dirs := str :: !dirs
                | _ -> ());
         ()
       | _ -> ())
@@ -181,12 +181,12 @@ let readSourceDirs ~configSources =
   if sourceDirs |> Sys.file_exists then
     let jsonOpt = sourceDirs |> Ext_json_parse.parse_json_from_file in
     match jsonOpt with
-    | Some json ->
+    | exception _ -> ()
+    | json ->
       if runConfig.bsbProjectRoot <> runConfig.projectRoot then (
         readDirs json;
         dirs := readDirsFromConfig ~configSources)
       else readDirs json
-    | None -> ()
   else (
     if !Cli.debug then (
       Log_.item "Warning: can't find source dirs: %s\n" sourceDirs;

analysis/reanalyze/src/dune

@@ -1,8 +1,5 @@
 (library
  (name reanalyze)
  (flags
-  (-w "+6+26+27+32+33+39")
-  (-open Compilerlibs406)
-  (-open Jsonlib)
-  (-open Ext))
- (libraries compilerlibs406 jsonlib ext str unix))
+  (-w "+6+26+27+32+33+39"))
+ (libraries jsonlib ext ml str unix))

analysis/rescript-vscode.opam

@@ -8,6 +8,7 @@ bug-reports: "https://github.com/rescript-lang/rescript-vscode/issues"
 depends: [
   "ocaml" {>= "4.10"}
   "ocamlformat" {= "0.22.4"}
+  "cppo" {= "1.6.9"}
   "reanalyze" {= "2.23.0"}
   "dune"
 ]

analysis/src/DumpAst.ml

@@ -42,7 +42,7 @@ let printAttributes attributes =
 let printConstant const =
   match const with
   | Parsetree.Pconst_integer (s, _) -> "Pconst_integer(" ^ s ^ ")"
-  | Pconst_char c -> "Pconst_char(" ^ String.make 1 c ^ ")"
+  | Pconst_char c -> "Pconst_char(" ^ String.make 1 (Char.chr c) ^ ")"
   | Pconst_string (s, delim) ->
     let delim =
       match delim with
@@ -312,4 +312,4 @@ let dump ~currentFile ~pos =
   print_endline
     (structure
     |> List.map (fun structItem -> printStructItem structItem ~pos ~source)
-    |> String.concat "")
+    |> String.concat "")

analysis/src/dune

@@ -4,9 +4,6 @@
  ; The main module that will become the binary.
  (name Cli)
  (flags
-  (-w "+6+26+27+32+33+39")
-  (-open Compilerlibs406)
-  (-open Jsonlib)
-  (-open Outcomeprinter))
+  (-w "+6+26+27+32+33+39"))
  ; Depends on:
- (libraries unix str compilerlibs406 jsonlib outcomeprinter reanalyze))
+ (libraries unix str ext ml jsonlib outcomeprinter reanalyze))