|
@@ -1854,7 +1854,7 @@ and type_expr ?(mode=MGet) ctx (e,p) (with_type:WithType.t) =
|
|
| EConst (Regexp (r,opt)) ->
|
|
| EConst (Regexp (r,opt)) ->
|
|
let str = mk (TConst (TString r)) ctx.t.tstring p in
|
|
let str = mk (TConst (TString r)) ctx.t.tstring p in
|
|
let opt = mk (TConst (TString opt)) ctx.t.tstring p in
|
|
let opt = mk (TConst (TString opt)) ctx.t.tstring p in
|
|
- let t = Typeload.load_core_type ctx "EReg" in
|
|
|
|
|
|
+ let t = Typeload.load_instance ctx (mk_type_path (["std"],"EReg"),null_pos) false in
|
|
mk (TNew ((match t with TInst (c,[]) -> c | _ -> die "" __LOC__),[],[str;opt])) t p
|
|
mk (TNew ((match t with TInst (c,[]) -> c | _ -> die "" __LOC__),[],[str;opt])) t p
|
|
| EConst (String(s,SSingleQuotes)) when s <> "" ->
|
|
| EConst (String(s,SSingleQuotes)) when s <> "" ->
|
|
type_expr ctx (format_string ctx s p) with_type
|
|
type_expr ctx (format_string ctx s p) with_type
|