Merge pull request #450 from bloomberg/fix_remember_state

fix #448 -- test bsc -I ../stdlib -I ../runtime -dsource -i  config1_…

Author: bobzhang

jscomp/lam_compile_group.ml

@@ -191,7 +191,7 @@ let compile  ~filename output_prefix non_export env _sigs
   (* To make toplevel happy - reentrant for js-demo *)
   let ()   = 
     Translmod.reset () ; 
-    Lam_compile_env.reset () 
+    Lam_compile_env.reset () ;
   in 
   let lam = Lam.convert lam in 
   let _d  = Lam_util.dump env  in

jscomp/syntax/ppx_entry.ml

@@ -79,6 +79,15 @@ let obj_type_as_js_obj_type = ref false
 let uncurry_type = ref false 
 let obj_type_auto_uncurry =  ref false
 let non_export = ref false 
+
+let reset () = 
+  record_as_js_object := None ;
+  obj_type_as_js_obj_type := false ;
+  uncurry_type := false ;
+  obj_type_auto_uncurry := false ;
+  non_export  :=  false
+
+
 let lift_js_type ~loc  x  = Typ.constr ~loc {txt = js_obj_type_id (); loc} [x]
 let lift_curry_type ~loc x  = Typ.constr ~loc {txt = curry_type_id (); loc} [x]
 
@@ -666,37 +675,40 @@ let make_call_back table ((x : Longident.t Asttypes.loc) , y) =
 
 let rewrite_signature : (Parsetree.signature -> Parsetree.signature) ref = 
   ref (fun  x -> 
-      match (x : Parsetree.signature) with 
-      | {psig_desc = Psig_attribute ({txt = "bs.config"; loc}, payload); _} :: rest 
-        -> 
-        begin 
-          Ast_payload.as_record_and_process loc payload 
-            (make_call_back signature_config_table) ; 
-          unsafe_mapper.signature unsafe_mapper rest
-        end
-      | _ -> 
-        unsafe_mapper.signature  unsafe_mapper x
-       )
+      let result = 
+        match (x : Parsetree.signature) with 
+        | {psig_desc = Psig_attribute ({txt = "bs.config"; loc}, payload); _} :: rest 
+          -> 
+          begin 
+            Ast_payload.as_record_and_process loc payload 
+              (make_call_back signature_config_table) ; 
+            unsafe_mapper.signature unsafe_mapper rest
+          end
+        | _ -> 
+          unsafe_mapper.signature  unsafe_mapper x in 
+      reset (); result 
+    )
 
 let rewrite_implementation : (Parsetree.structure -> Parsetree.structure) ref = 
   ref (fun (x : Parsetree.structure) -> 
-      match x with 
-      | {pstr_desc = Pstr_attribute ({txt = "bs.config"; loc}, payload); _} :: rest 
-        -> 
-        begin 
-          Ast_payload.as_record_and_process loc payload 
-            (make_call_back structural_config_table) ; 
-          let rest = unsafe_mapper.structure unsafe_mapper rest in
-          if !non_export then
-            [Str.include_ ~loc  
-               (Incl.mk ~loc 
-                  (Mod.constraint_ ~loc
-                     (Mod.structure ~loc rest  )
-                     (Mty.signature ~loc [])
-                  ))]
-          else rest 
-
-        end
-      | _ -> 
-        unsafe_mapper.structure  unsafe_mapper x )
+      let result = 
+        match x with 
+        | {pstr_desc = Pstr_attribute ({txt = "bs.config"; loc}, payload); _} :: rest 
+          -> 
+          begin 
+            Ast_payload.as_record_and_process loc payload 
+              (make_call_back structural_config_table) ; 
+            let rest = unsafe_mapper.structure unsafe_mapper rest in
+            if !non_export then
+              [Str.include_ ~loc  
+                 (Incl.mk ~loc 
+                    (Mod.constraint_ ~loc
+                       (Mod.structure ~loc rest  )
+                       (Mty.signature ~loc [])
+                    ))]
+            else rest 
+          end
+        | _ -> 
+          unsafe_mapper.structure  unsafe_mapper x  in 
+      reset (); result )
 

jscomp/syntax/ppx_entry.mli

@@ -23,6 +23,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
+
+
 val rewrite_signature :   (Parsetree.signature -> Parsetree.signature) ref
 
 val rewrite_implementation : (Parsetree.structure -> Parsetree.structure) ref