Compiler: fix #330

Author: hhugo

compiler/generate.ml

@@ -1095,15 +1095,15 @@ and translate_expr ctx queue loc _x e level : _ * J.statement_list =
         in
         (J.ENew (cc, if args = [] then None else Some args),
          or_p pc prop, queue)
-      | Extern "caml_js_get", [Pv o; Pc (String f | IString f)] ->
+      | Extern "caml_js_get", [Pv o; Pc (String f | IString f)] when J.is_ident f ->
         let ((po, co), queue) = access_queue queue o in
         (J.EDot (co, f), or_p po mutable_p, queue)
-      | Extern "caml_js_set", [Pv o; Pc (String f | IString f); v] ->
+      | Extern "caml_js_set", [Pv o; Pc (String f | IString f); v] when J.is_ident f ->
         let ((po, co), queue) = access_queue queue o in
         let ((pv, cv), queue) = access_queue' ~ctx queue v in
         (J.EBin (J.Eq, J.EDot (co, f), cv),
          or_p (or_p po pv) mutator_p, queue)
-      | Extern "caml_js_delete", [Pv o; Pc (String f | IString f)] ->
+      | Extern "caml_js_delete", [Pv o; Pc (String f | IString f)] when J.is_ident f ->
         let ((po, co), queue) = access_queue queue o in
         (J.EUn(J.Delete, J.EDot (co, f)), or_p po mutator_p, queue)
       | Extern "%overrideMod", [Pc (String m | IString m);Pc (String f | IString f)] ->

compiler/javascript.ml

@@ -105,21 +105,21 @@ and statement =
     Block of block
   | Variable_statement of variable_declaration list
   | Empty_statement
-  | Expression_statement of expression 
-  | If_statement of expression * (statement * location) * (statement * location) option 
-  | Do_while_statement of (statement * location) * expression 
+  | Expression_statement of expression
+  | If_statement of expression * (statement * location) * (statement * location) option
+  | Do_while_statement of (statement * location) * expression
   | While_statement of expression * (statement * location)
   | For_statement of  (expression option,variable_declaration list) either * expression option * expression option * (statement * location)
   | ForIn_statement of  (expression,variable_declaration) either * expression * (statement * location)
-  | Continue_statement of Label.t option 
-  | Break_statement of Label.t option 
-  | Return_statement of expression option 
+  | Continue_statement of Label.t option
+  | Break_statement of Label.t option
+  | Return_statement of expression option
   (* | With_statement of expression * statement *)
   | Labelled_statement of Label.t * (statement * location)
   | Switch_statement of
       expression * case_clause list * statement_list option * case_clause list
-  | Throw_statement of expression 
-  | Try_statement of block * (ident * block) option * block option 
+  | Throw_statement of expression
+  | Try_statement of block * (ident * block) option * block option
   | Debugger_statement
 
 and ('left,'right) either =
@@ -205,5 +205,23 @@ let string_of_number v =
         then s2
         else  Printf.sprintf "%.18g" v
 
+let is_ident =
+  let l = Array.init 256 (fun i ->
+    let c = Char.chr i in
+    if (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c = '_' || c = '$'
+    then 1
+    else if (c >= '0' && c <='9')
+    then 2
+    else 0
+  ) in
+  fun s ->
+    try
+      for i = 0 to String.length s - 1 do
+        let code = l.(Char.code(s.[i])) in
+        if i = 0 then assert (code = 1) else assert (code >= 1)
+      done;
+      true
+    with _ -> false
+
 module IdentSet = Set.Make(struct type t = ident let compare = compare_ident end)
 module IdentMap = Map.Make(struct type t = ident let compare = compare_ident end)

compiler/javascript.mli

@@ -157,6 +157,6 @@ and source_element =
 
 val compare_ident : ident -> ident -> int
 val string_of_number : float -> string
-
+val is_ident : string -> bool
 module IdentSet : Set.S with type elt = ident
 module IdentMap : Map.S with type key = ident