ready for json

Author: bobzhang

jscomp/core/lam_compile_const.ml

@@ -91,3 +91,12 @@ let rec translate (x : Lam.constant ) : J.expression =
 
   | Const_immstring s ->  (*TODO *)
     E.str s  (* TODO: check *)
+
+
+let translate_arg_cst (cst : Ast_arg.cst) = 
+  (match cst with 
+   | Arg_int_lit i -> 
+     E.int (Int32.of_int i)
+   | Arg_string_lit i -> 
+     E.str i
+   | Arg_js_null  -> assert false)

jscomp/core/lam_compile_const.mli

@@ -32,3 +32,6 @@
 (** Compile lambda constant to JS *)
 
 val translate : Lam.constant -> J.expression
+
+
+val translate_arg_cst : Ast_arg.cst -> J.expression

jscomp/core/lam_compile_external_call.ml

@@ -133,15 +133,10 @@ let assemble_args_splice call_loc ffi  js_splice arg_types args : E.t list * E.t
   let rec aux (labels : Ast_arg.kind list) args = 
     match labels, args with 
     | [] , [] -> empty_pair
-    | { arg_label =  Empty (Some (Arg_int_lit i)) } :: labels  , args 
-    | { arg_label =  Label (_, Some (Arg_int_lit i))} :: labels  , args -> 
-      let accs, eff = aux labels args in 
-      E.int (Int32.of_int i) ::accs, eff 
-    | { arg_label =  Label (_, Some (Arg_string_lit i))} :: labels , args 
-    | { arg_label =  Empty (Some (Arg_string_lit i)) } :: labels , args
-      -> 
-      let accs, eff = aux labels args in 
-      E.str i :: accs, eff
+    | { arg_label =  Empty (Some cst) } :: labels  , args 
+    | { arg_label =  Label (_, Some cst)} :: labels  , args -> 
+      let accs, eff = aux labels args in
+      Lam_compile_const.translate_arg_cst cst :: accs, eff 
     | ({arg_label = Empty None | Label (_,None) | Optional _ } as arg_kind) ::labels, arg :: args
       ->  
       if js_splice && args = [] then 

jscomp/core/lam_compile_external_obj.ml

@@ -43,15 +43,10 @@ let assemble_args_obj (labels : Ast_arg.kind list) (args : J.expression list) =
   let rec aux (labels : Ast_arg.kind list) args = 
     match labels, args with 
     | [] , [] as empty_pair -> empty_pair
-    | {arg_label = Label (label, Some (Arg_int_lit i))} :: labels  , args -> 
+    | {arg_label = Label (label, Some cst )} :: labels  , args -> 
       let accs, eff = aux labels args in 
-      (Js_op.Key label, E.int (Int32.of_int i) )::accs, eff 
-    | {arg_label = Label(label, Some (Arg_string_lit i))} :: labels , args 
-      -> 
-      let accs, eff = aux labels args in 
-      (Js_op.Key label, E.str i) :: accs, eff
-    | {arg_label = Empty (Some (Arg_int_lit i)) } :: rest  , args -> assert false 
-    | {arg_label = Empty(Some (Arg_string_lit i))} :: rest , args -> assert false 
+      (Js_op.Key label, Lam_compile_const.translate_arg_cst cst )::accs, eff 
+    | {arg_label = Empty (Some _) } :: rest  , args -> assert false 
     | {arg_label = Empty None }::labels, arg::args 
       ->  
       let (accs, eff) as r  = aux labels args in 

jscomp/syntax/ast_arg.ml

@@ -28,7 +28,7 @@ type cst =
   | Arg_int_lit of int 
   | Arg_string_lit of string 
 
-
+  | Arg_js_null
 type label = 
   | Label of string * cst option 
   | Empty of cst option

jscomp/syntax/ast_arg.mli

@@ -25,7 +25,10 @@
 type cst = 
   | Arg_int_lit of int 
   | Arg_string_lit of string 
-
+  (* | Arg_js_true *)
+  (* | Arg_js_false *)
+  | Arg_js_null
+  
 
 type label = private
   | Label of string * cst option