Make the extension compilable with latest ocaml.

Author: cristianoc

analysis/vendor/ext/bsb_db.ml

@@ -31,12 +31,10 @@ type info =
   | Impl
   | Impl_intf
 
-type syntax_kind = Ml | Res
 
 type module_info = {
   mutable info : info;
   dir : string;
-  syntax_kind : syntax_kind;
   case : bool;
   name_sans_extension : string;
 }

analysis/vendor/ext/bsb_db.mli

@@ -37,16 +37,10 @@ type info =
   | Impl
   | Impl_intf
 
-type syntax_kind = Ml | Res
 
 type module_info = {
   mutable info : info;
   dir : string;
-  syntax_kind : syntax_kind;
-  (* This is actually not stored in bsbuild meta info
-     since creating .d file only emit .cmj/.cmi dependencies, so it does not
-     need know which syntax it is written
-  *)
   case : bool;
   name_sans_extension : string;
 }

analysis/vendor/ext/ext_buffer.mli

@@ -51,7 +51,6 @@ val clear : t -> unit
 (** Empty the buffer. *)
 
 val add_char : t -> char -> unit
-  [@@inline]
 (** [add_char b c] appends the character [c] at the end of the buffer [b]. *)
 
 val add_string : t -> string -> unit

analysis/vendor/ext/ext_file_extensions.ml

@@ -1,6 +1,4 @@
 type valid_input =
-  | Ml
-  | Mli
   | Res
   | Resi
   | Intf_ast
@@ -16,8 +14,6 @@ type valid_input =
 
 let classify_input ext =
   match () with
-  | _ when ext = Literals.suffix_ml -> Ml
-  | _ when ext = !Config.interface_suffix -> Mli
   | _ when ext = Literals.suffix_ast -> Impl_ast
   | _ when ext = Literals.suffix_iast -> Intf_ast
   | _ when ext = Literals.suffix_mlmap -> Mlmap

analysis/vendor/ext/ext_ident.ml

@@ -23,12 +23,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-
-
-
-
-
-
 let js_flag = 0b1_000 (* check with ocaml compiler *)
 
 (* let js_module_flag = 0b10_000 (\* javascript external modules *\) *)
@@ -172,18 +166,14 @@ let name_mangle name =
         Ext_buffer.add_string buffer (convert ~op:(i=0) c)        
     done; Ext_buffer.contents buffer
 
-(* TODO:
-    check name conflicts with javascript conventions
-   {[
-     Ext_ident.convert "^";;
-     - : string = "$caret"
-   ]}
-   [convert name] if [name] is a js keyword,add "$$"
+(**
+   [convert name] if [name] is a js keyword or js global, add "$$"
    otherwise do the name mangling to make sure ocaml identifier it is
    a valid js identifier
 *)
 let convert (name : string) =
-  if  Js_reserved_map.is_reserved name  then
+  let name = unwrap_uppercase_exotic name in
+  if Js_reserved_map.is_js_keyword name || Js_reserved_map.is_js_global name then
     "$$" ^ name
   else name_mangle name