[eval] add explicit prototypes for Vector and Array

src/macro/eval/evalContext.ml

@@ -131,7 +131,9 @@ type context = {
 	mutable type_cache : Type.module_type IntMap.t;
 	overrides : (Type.path * string,bool) Hashtbl.t;
 	(* prototypes *)
+	mutable array_prototype : vprototype;
 	mutable string_prototype : vprototype;
+	mutable vector_prototype : vprototype;
 	mutable instance_prototypes : vprototype IntMap.t;
 	mutable static_prototypes : vprototype IntMap.t;
 	mutable constructors : value Lazy.t IntMap.t;

src/macro/eval/evalEmitter.ml

@@ -544,6 +544,8 @@ let emit_method_call exec name execs p =
 	let vf vthis = match vthis with
 		| VInstance {iproto = proto} | VPrototype proto -> proto_field_raise proto name
 		| VString _ -> proto_field_raise (get_ctx()).string_prototype name
+		| VArray _ -> proto_field_raise (get_ctx()).array_prototype name
+		| VVector _ -> proto_field_raise (get_ctx()).vector_prototype name
 		| _ -> unexpected_value_p vthis "instance" p
 	in
 	match execs with

src/macro/eval/evalField.ml

@@ -51,10 +51,10 @@ let field_raise v f =
 	| VPrototype proto -> proto_field_raise proto f
 	| VArray va ->
 		if f = key_length then vint (va.alength)
-		else proto_field_direct (get_instance_prototype_raise (get_ctx()) key_Array) f
+		else proto_field_direct (get_ctx()).array_prototype f
 	| VVector vv ->
 		if f = key_length then vint (Array.length vv)
-		else proto_field_direct (get_instance_prototype_raise (get_ctx()) key_eval_Vector) f
+		else proto_field_direct (get_ctx()).vector_prototype f
 	| VString (_,s) ->
 		if f = key_length then vint (String.length (Lazy.force s))
 		else proto_field_direct (get_ctx()).string_prototype f

src/macro/eval/evalMain.ml

@@ -115,6 +115,8 @@ let create com api is_macro =
 		had_error = false;
 		(* prototypes *)
 		string_prototype = fake_proto key_String;
+		array_prototype = fake_proto key_Array;
+		vector_prototype = fake_proto key_eval_Vector;
 		static_prototypes = IntMap.empty;
 		instance_prototypes = IntMap.empty;
 		constructors = IntMap.empty;

src/macro/eval/evalPrototype.ml

@@ -160,7 +160,9 @@ module PrototypeBuilder = struct
 			ctx.static_prototypes <- IntMap.add pctx.key proto ctx.static_prototypes
 		else begin
 			ctx.instance_prototypes <- IntMap.add pctx.key proto ctx.instance_prototypes;
-			if pctx.key = key_String then ctx.string_prototype <- proto;
+			if pctx.key = key_String then ctx.string_prototype <- proto
+			else if pctx.key = key_Array then ctx.array_prototype <- proto
+			else if pctx.key = key_eval_Vector then ctx.vector_prototype <- proto
 		end;
 		proto,f
 end