|
@@ -698,7 +698,7 @@ let type_macro ctx mode cpath f (el:Ast.expr list) p =
|
|
incr index;
|
|
incr index;
|
|
(EArray ((EArrayDecl [e],p),(EConst (Int (string_of_int (!index))),p)),p)
|
|
(EArray ((EArrayDecl [e],p),(EConst (Int (string_of_int (!index))),p)),p)
|
|
) el in
|
|
) el in
|
|
- let elt = fst (CallUnification.unify_call_args mctx constants (List.map fst eargs) t_dynamic p false false false) in
|
|
|
|
|
|
+ let elt = CallUnification.unify_call_args mctx constants (List.map fst eargs) t_dynamic p false false false in
|
|
List.map2 (fun (_,mct) e ->
|
|
List.map2 (fun (_,mct) e ->
|
|
let e, et = (match e.eexpr with
|
|
let e, et = (match e.eexpr with
|
|
(* get back our index and real expression *)
|
|
(* get back our index and real expression *)
|
|
@@ -770,7 +770,7 @@ let type_macro ctx mode cpath f (el:Ast.expr list) p =
|
|
let call_macro ctx path meth args p =
|
|
let call_macro ctx path meth args p =
|
|
let mctx, (margs,_,mclass,mfield), call = load_macro ctx false path meth p in
|
|
let mctx, (margs,_,mclass,mfield), call = load_macro ctx false path meth p in
|
|
mctx.curclass <- null_class;
|
|
mctx.curclass <- null_class;
|
|
- let el, _ = CallUnification.unify_call_args mctx args margs t_dynamic p false false false in
|
|
|
|
|
|
+ let el = CallUnification.unify_call_args mctx args margs t_dynamic p false false false in
|
|
call (List.map (fun e -> try Interp.make_const e with Exit -> error "Parameter should be a constant" e.epos) el)
|
|
call (List.map (fun e -> try Interp.make_const e with Exit -> error "Parameter should be a constant" e.epos) el)
|
|
|
|
|
|
let call_init_macro ctx e =
|
|
let call_init_macro ctx e =
|