[enhance] compiler: Prettier js parse error

MLstate · Aug 7, 2012 · 8abdc7d · 8abdc7d
1 parent bcbeb3e
commit 8abdc7d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/compiler/jslang/globalizer.ml b/compiler/jslang/globalizer.ml
@@ -1,5 +1,5 @@
 (*
-    Copyright © 2011 MLstate
+    Copyright © 2011, 2012 MLstate
 
     This file is part of Opa.
 
@@ -78,7 +78,12 @@ let _ =
         try
           JsParse.String.code ~throw_exn:true content
         with
-          _ -> die "Could not read input"
+          JsParse.Exception e ->
+            OManager.error
+              ("Couldn't parse file @{<brigth>%s@}\n"^^
+                 "Error : %a")
+              filename
+              JsParse.pp e
       in
       (filename, JsUtils.export_to_global_namespace content)
     ) files

diff --git a/compiler/libbsl/bslRegisterLib.ml b/compiler/libbsl/bslRegisterLib.ml
@@ -992,7 +992,14 @@ let export_to_global_namespace nodejs_code =
       try
         JsParse.String.code ~throw_exn:true contents
       with
-        _ -> OManager.error "Couldn't parse file %s\n" filename
+        JsParse.Exception e ->
+          ignore (File.output "jserror.js" contents);
+          OManager.error
+            ("Couldn't parse file @{<brigth>%s@} after preprocessing\n"^^
+               "Take a look on generated file @{<brigth>jserror.js@}\n%!" ^^
+               "Error : %a")
+            filename
+            JsParse.pp e
     in
     let contents = JsUtils.export_to_global_namespace contents in
     (filename, Format.to_string JsPrint.pp_min#code contents, conf)