|
@@ -697,7 +697,10 @@ let create_macro_context com =
|
|
[cp#clone]
|
|
[cp#clone]
|
|
) com.class_paths#as_list;
|
|
) com.class_paths#as_list;
|
|
(* Eval _std must be in front so we don't look into hxnodejs or something. *)
|
|
(* Eval _std must be in front so we don't look into hxnodejs or something. *)
|
|
- com2.class_paths#add (Option.get !eval_std);
|
|
|
|
|
|
+ (* This can run before `TyperEntry.create`, so in order to display nice error when std is not found, this needs to be checked here too *)
|
|
|
|
+ (match !eval_std with
|
|
|
|
+ | Some std -> com2.class_paths#add std
|
|
|
|
+ | None -> Error.raise_std_not_found ());
|
|
let defines = adapt_defines_to_macro_context com2.defines; in
|
|
let defines = adapt_defines_to_macro_context com2.defines; in
|
|
com2.defines.values <- defines.values;
|
|
com2.defines.values <- defines.values;
|
|
com2.defines.defines_signature <- None;
|
|
com2.defines.defines_signature <- None;
|