use existing convention for primitives

Author: cometkim

compiler/core/lam_analysis.ml

@@ -59,7 +59,7 @@ let rec no_side_effects (lam : Lam.t) : bool =
     (* bool primitives *)
     | Psequand | Psequor | Pnot | Pboolcomp _ | Pboolorder | Pboolmin | Pboolmax
     (* int primitives *)
-    | Pnegint | Paddint | Psubint | Pmulint | Ppowint | P_bitnot_int | Pandint
+    | Pnegint | Paddint | Psubint | Pmulint | Ppowint | Pnotint | Pandint
     | Porint | Pxorint | Plslint | Plsrint | Pasrint | Pintcomp _ | Pintorder
     | Pintmin | Pintmax
     (* float primitives *)
@@ -68,8 +68,8 @@ let rec no_side_effects (lam : Lam.t) : bool =
     | Pfloatmin | Pfloatmax
     (* bigint primitives *)
     | Pnegbigint | Paddbigint | Psubbigint | Pmulbigint | Ppowbigint
-    | P_bitnot_bigint | Pandbigint | Porbigint | Pxorbigint | Plslbigint
-    | Pasrbigint | Pbigintcomp _ | Pbigintorder | Pbigintmin | Pbigintmax
+    | Pnotbigint | Pandbigint | Porbigint | Pxorbigint | Plslbigint | Pasrbigint
+    | Pbigintcomp _ | Pbigintorder | Pbigintmin | Pbigintmax
     (* string primitives *)
     | Pstringlength | Pstringrefu | Pstringrefs | Pstringcomp _ | Pstringorder
     | Pstringmin | Pstringmax

compiler/core/lam_compile_primitive.ml

@@ -283,11 +283,11 @@ let translate output_prefix loc (cxt : Lam_compile_context.t)
     match args with
     | [e1; e2] -> E.bigint_op Asr e1 e2
     | _ -> assert false)
-  | P_bitnot_int -> (
+  | Pnotint -> (
     match args with
     | [e] -> E.int_bnot e
     | _ -> assert false)
-  | P_bitnot_bigint -> (
+  | Pnotbigint -> (
     match args with
     | [e] -> E.int_bnot e
     | _ -> assert false)

compiler/core/lam_convert.ml

@@ -253,7 +253,7 @@ let lam_prim ~primitive:(p : Lambda.primitive) ~args loc : Lam.t =
   | Pandint -> prim ~primitive:Pandint ~args loc
   | Porint -> prim ~primitive:Porint ~args loc
   | Pxorint -> prim ~primitive:Pxorint ~args loc
-  | P_bitnot_int -> prim ~primitive:P_bitnot_int ~args loc
+  | Pnotint -> prim ~primitive:Pnotint ~args loc
   | Plslint -> prim ~primitive:Plslint ~args loc
   | Plsrint -> prim ~primitive:Plsrint ~args loc
   | Pasrint -> prim ~primitive:Pasrint ~args loc
@@ -297,7 +297,7 @@ let lam_prim ~primitive:(p : Lambda.primitive) ~args loc : Lam.t =
   | Pandbigint -> prim ~primitive:Pandbigint ~args loc
   | Porbigint -> prim ~primitive:Porbigint ~args loc
   | Pxorbigint -> prim ~primitive:Pxorbigint ~args loc
-  | P_bitnot_bigint -> prim ~primitive:P_bitnot_bigint ~args loc
+  | Pnotbigint -> prim ~primitive:Pnotbigint ~args loc
   | Plslbigint -> prim ~primitive:Plslbigint ~args loc
   | Pasrbigint -> prim ~primitive:Pasrbigint ~args loc
   | Pbigintcomp x -> prim ~primitive:(Pbigintcomp x) ~args loc

compiler/core/lam_primitive.ml

@@ -77,7 +77,7 @@ type t =
   | Pandint
   | Porint
   | Pxorint
-  | P_bitnot_int
+  | Pnotint
   | Plslint
   | Plsrint
   | Pasrint
@@ -112,7 +112,7 @@ type t =
   | Pandbigint
   | Porbigint
   | Pxorbigint
-  | P_bitnot_bigint
+  | Pnotbigint
   | Plslbigint
   | Pasrbigint
   | Pbigintcomp of Lam_compat.comparison
@@ -203,15 +203,15 @@ let eq_primitive_approx (lhs : t) (rhs : t) =
   | Psequand | Psequor | Pnot | Pboolcomp _ | Pboolorder | Pboolmin | Pboolmax
   (* int primitives *)
   | Pisint | Pnegint | Paddint | Psubint | Pmulint | Pdivint | Pmodint | Ppowint
-  | P_bitnot_int | Pandint | Porint | Pxorint | Plslint | Plsrint | Pasrint
+  | Pnotint | Pandint | Porint | Pxorint | Plslint | Plsrint | Pasrint
   | Pintorder | Pintmin | Pintmax
   (* float primitives *)
   | Pintoffloat | Pfloatofint | Pnegfloat | Paddfloat | Psubfloat | Pmulfloat
   | Pdivfloat | Pmodfloat | Ppowfloat | Pfloatorder | Pfloatmin | Pfloatmax
   (* bigint primitives *)
   | Pnegbigint | Paddbigint | Psubbigint | Pmulbigint | Pdivbigint | Pmodbigint
-  | Ppowbigint | P_bitnot_bigint | Pandbigint | Porbigint | Pxorbigint
-  | Plslbigint | Pasrbigint | Pbigintorder | Pbigintmin | Pbigintmax
+  | Ppowbigint | Pnotbigint | Pandbigint | Porbigint | Pxorbigint | Plslbigint
+  | Pasrbigint | Pbigintorder | Pbigintmin | Pbigintmax
   (* string primitives *)
   | Pstringlength | Pstringrefu | Pstringrefs | Pstringadd | Pstringcomp _
   | Pstringorder | Pstringmin | Pstringmax

compiler/core/lam_primitive.mli

@@ -72,7 +72,7 @@ type t =
   | Pandint
   | Porint
   | Pxorint
-  | P_bitnot_int
+  | Pnotint
   | Plslint
   | Plsrint
   | Pasrint
@@ -107,7 +107,7 @@ type t =
   | Pandbigint
   | Porbigint
   | Pxorbigint
-  | P_bitnot_bigint
+  | Pnotbigint
   | Plslbigint
   | Pasrbigint
   | Pbigintcomp of Lam_compat.comparison

compiler/core/lam_print.ml

@@ -119,7 +119,7 @@ let primitive ppf (prim : Lam_primitive.t) =
   | Pandint -> fprintf ppf "and"
   | Porint -> fprintf ppf "or"
   | Pxorint -> fprintf ppf "xor"
-  | P_bitnot_int -> fprintf ppf "~~"
+  | Pnotint -> fprintf ppf "~~"
   | Plslint -> fprintf ppf "lsl"
   | Plsrint -> fprintf ppf "lsr"
   | Pasrint -> fprintf ppf "asr"
@@ -162,7 +162,7 @@ let primitive ppf (prim : Lam_primitive.t) =
   | Pandbigint -> fprintf ppf "and"
   | Porbigint -> fprintf ppf "or"
   | Pxorbigint -> fprintf ppf "xor"
-  | P_bitnot_bigint -> fprintf ppf "~~"
+  | Pnotbigint -> fprintf ppf "~~"
   | Plslbigint -> fprintf ppf "lsl"
   | Pasrbigint -> fprintf ppf "asr"
   | Pbigintcomp Ceq -> fprintf ppf "=="

compiler/ml/lambda.ml

@@ -210,7 +210,7 @@ type primitive =
   | Pandint
   | Porint
   | Pxorint
-  | P_bitnot_int
+  | Pnotint
   | Plslint
   | Plsrint
   | Pasrint
@@ -246,7 +246,7 @@ type primitive =
   | Pandbigint
   | Porbigint
   | Pxorbigint
-  | P_bitnot_bigint
+  | Pnotbigint
   | Plslbigint
   | Pasrbigint
   | Pbigintcomp of comparison

compiler/ml/lambda.mli

@@ -177,7 +177,7 @@ type primitive =
   | Pandint
   | Porint
   | Pxorint
-  | P_bitnot_int
+  | Pnotint
   | Plslint
   | Plsrint
   | Pasrint
@@ -213,7 +213,7 @@ type primitive =
   | Pandbigint
   | Porbigint
   | Pxorbigint
-  | P_bitnot_bigint
+  | Pnotbigint
   | Plslbigint
   | Pasrbigint
   | Pbigintcomp of comparison

compiler/ml/printlambda.ml

@@ -152,7 +152,7 @@ let primitive ppf = function
   | Pandint -> fprintf ppf "and"
   | Porint -> fprintf ppf "or"
   | Pxorint -> fprintf ppf "xor"
-  | P_bitnot_int -> fprintf ppf "~~"
+  | Pnotint -> fprintf ppf "~~"
   | Plslint -> fprintf ppf "lsl"
   | Plsrint -> fprintf ppf "lsr"
   | Pasrint -> fprintf ppf "asr"
@@ -194,7 +194,7 @@ let primitive ppf = function
   | Pandbigint -> fprintf ppf "and"
   | Porbigint -> fprintf ppf "or"
   | Pxorbigint -> fprintf ppf "xor"
-  | P_bitnot_bigint -> fprintf ppf "~~"
+  | Pnotbigint -> fprintf ppf "~~"
   | Plslbigint -> fprintf ppf "lsl"
   | Pasrbigint -> fprintf ppf "asr"
   | Pdivbigint -> fprintf ppf "/"

compiler/ml/translcore.ml

@@ -276,7 +276,7 @@ let primitives_table =
       ("%mulint", Pmulint);
       ("%divint", Pdivint);
       ("%modint", Pmodint);
-      ("%bitnot_int", P_bitnot_int);
+      ("%bitnot_int", Pnotint);
       ("%andint", Pandint);
       ("%orint", Porint);
       ("%xorint", Pxorint);
@@ -323,7 +323,7 @@ let primitives_table =
       ("%lebigint", Pbigintcomp Cle);
       ("%gtbigint", Pbigintcomp Cgt);
       ("%gebigint", Pbigintcomp Cge);
-      ("%bitnot_bigint", P_bitnot_bigint);
+      ("%bitnot_bigint", Pnotbigint);
       ("%andbigint", Pandbigint);
       ("%orbigint", Porbigint);
       ("%xorbigint", Pxorbigint);

compiler/ml/unified_ops.ml

@@ -213,10 +213,10 @@ let entries =
       form = Unary;
       specialization =
         {
-          int = P_bitnot_int;
+          int = Pnotint;
           bool = None;
           float = None;
-          bigint = Some P_bitnot_bigint;
+          bigint = Some Pnotbigint;
           string = None;
         };
     };