WIP

Author: hhugo

compiler/lib-wasm/link.ml

@@ -411,7 +411,7 @@ let report_missing_primitives missing =
   if not (List.is_empty missing)
   then
     Warning.warn
-      `Missing_primitives
+      `Missing_primitive
       "There are some missing Wasm primitives\n\
        Dummy implementations (raising an exception) will be provided.\n\
        Missing primitives:\n\

compiler/lib/driver.ml

@@ -264,7 +264,7 @@ let gen_missing js missing =
   if not (StringSet.is_empty missing)
   then
     Warning.warn
-      `Missing_primitives
+      `Missing_primitive
       "There are some missing primitives.\n\
        Dummy implementations (raising 'Failure' exception) will be used if they are not \
        available at runtime.\n\
@@ -425,7 +425,7 @@ let check_js js =
   if not (StringSet.is_empty missing)
   then
     Warning.warn
-      `Missing_primitives
+      `Missing_primitive
       "There are some missing primitives.\n%a"
       report_missing_primitives
       missing;

compiler/lib/linker.ml

@@ -163,7 +163,7 @@ module Check = struct
     if not (StringSet.is_empty freename)
     then
       Warning.warn
-        `Free_variables_in_primitives
+        `Free_variables_in_primitive
         "free variables in primitive code %S (%s)@.vars: %a@."
         name
         (loc pi)
@@ -569,7 +569,7 @@ let load_fragment ~target_env ~filename (f : Fragment.t) =
                   then true
                   else (
                     Warning.warn
-                      `Overriding_primitives
+                      `Overriding_primitive
                       "overriding primitive %S\n  old: %s\n  new: %s@."
                       name
                       (loc p.pi)
@@ -744,7 +744,7 @@ let link ?(check_missing = true) program (state : state) =
           then
             let name = fst (Int.Hashtbl.find provided_rev x) in
             Warning.warn
-              `Deprecated_primitives
+              `Deprecated_primitive
               "The runtime primitive [%s] is deprecated. %s\n"
               name
               txt
@@ -758,7 +758,7 @@ let link ?(check_missing = true) program (state : state) =
                    Printf.sprintf "-> %s:%s" nm (Parse_info.to_string loc)))
           in
           Warning.warn
-            `Deprecated_primitives
+            `Deprecated_primitive
             "The runtime primitive [%s] is deprecated. %s.  Used by:\n%s\n"
             name
             txt

compiler/lib/primitive.ml

@@ -99,7 +99,7 @@ let register p k kargs arity =
   | k' when kind_equal k k' -> ()
   | k' ->
       Warning.warn
-        `Overriding_primitives_purity
+        `Overriding_primitive_purity
         "overriding the purity of the primitive %s: %s -> %s@."
         p
         (string_of_kind k')

compiler/lib/warning.ml

@@ -9,15 +9,15 @@ type t =
   | `Missing_cmi
   | `Effect_handlers_without_effect_backend
   | (* runtime *)
-    `Missing_primitives
+    `Missing_primitive
   | `Missing_defined
   | `Missing_deps
   | `Deprecated_joo_global_object
-  | `Overriding_primitives
-  | `Overriding_primitives_purity
-  | `Deprecated_primitives
+  | `Overriding_primitive
+  | `Overriding_primitive_purity
+  | `Deprecated_primitive
   | `Unused_js_variable
-  | `Free_variables_in_primitives
+  | `Free_variables_in_primitive
   ]
 
 module StringTable = Hashtbl.Make (struct
@@ -50,11 +50,11 @@ let default = function
   (* effects *)
   | `Effect_handlers_without_effect_backend -> true
   (* runtime *)
-  | `Missing_primitives | `Missing_defined | `Missing_deps | `Free_variables_in_primitives
+  | `Missing_primitive | `Missing_defined | `Missing_deps | `Free_variables_in_primitive
     -> true
   | `Deprecated_joo_global_object -> true
-  | `Overriding_primitives | `Overriding_primitives_purity -> true
-  | `Deprecated_primitives -> true
+  | `Overriding_primitive | `Overriding_primitive_purity -> true
+  | `Deprecated_primitive -> true
   | `Unused_js_variable -> false
 
 let all =
@@ -66,35 +66,35 @@ let all =
   ; `Missing_cmi
   ; `Effect_handlers_without_effect_backend
   ; (* runtime *)
-    `Missing_primitives
+    `Missing_primitive
   ; `Missing_defined
   ; `Missing_deps
   ; `Deprecated_joo_global_object
-  ; `Overriding_primitives
-  ; `Overriding_primitives_purity
-  ; `Deprecated_primitives
+  ; `Overriding_primitive
+  ; `Overriding_primitive_purity
+  ; `Deprecated_primitive
   ; `Unused_js_variable
-  ; `Free_variables_in_primitives
+  ; `Free_variables_in_primitive
   ]
 
 let name = function
   (* command line parsing *)
-  | `Malformed_params -> "malformed-program"
+  | `Malformed_params -> "malformed-params"
   (* Parsing bytecode *)
   | `Integer_overflow -> "integer-overflow"
   | `Missing_debug_event -> "missing-debug-event"
   | `Missing_cmi -> "missing-cmi"
   (* effects *)
   | `Effect_handlers_without_effect_backend -> "effects"
   (* runtime *)
-  | `Missing_primitives -> "missing-primitive"
+  | `Missing_primitive -> "missing-primitive"
   | `Missing_defined -> "missing-defined"
   | `Missing_deps -> "missing-deps"
-  | `Free_variables_in_primitives -> "free-variables"
+  | `Free_variables_in_primitive -> "free-variables"
   | `Deprecated_joo_global_object -> "deprecated-joo-global-object"
-  | `Overriding_primitives -> "overriding-primitive"
-  | `Overriding_primitives_purity -> "overriding-primitive-purity"
-  | `Deprecated_primitives -> "deprecated-primitive"
+  | `Overriding_primitive -> "overriding-primitive"
+  | `Overriding_primitive_purity -> "overriding-primitive-purity"
+  | `Deprecated_primitive -> "deprecated-primitive"
   | `Unused_js_variable -> "unused-js-vars"
 
 let parse : string -> t option =