Asynchronous IO API

.vscode/settings.json

@@ -28,5 +28,8 @@
 			],
 			"url": "./.vscode/schemas/meta.schema.json"
 		}
+	],
+	"haxe.configurations": [
+		["--cwd", "tests/asys", "build.hxml"]
 	]
 }

src/macro/eval/evalDebugSocket.ml

@@ -62,8 +62,9 @@ let var_to_json name value vio env =
 		in
 		JObject fields
 	in
-	let string_repr s = "\"" ^ (StringHelper.s_escape s.sstring) ^ "\"" in
+	let string_repr s = "\"" ^ (StringHelper.s_escape s) ^ "\"" in
 	let rec level2_value_repr = function
+		| VFileDescriptor _ -> "<descriptor>"
 		| VNull -> "null"
 		| VTrue -> "true"
 		| VFalse -> "false"
@@ -76,12 +77,13 @@ let var_to_json name value vio env =
 				| vl -> name ^ "(...)"
 			end
 		| VObject o -> "{...}"
-		| VString s -> string_repr s
+		| VString s -> string_repr s.sstring
 		| VArray _ | VVector _ -> "[...]"
 		| VInstance vi -> (rev_hash vi.iproto.ppath) ^ " {...}"
 		| VPrototype proto -> (s_proto_kind proto).sstring
 		| VFunction _ | VFieldClosure _ -> "<fun>"
 		| VLazy f -> level2_value_repr (!f())
+		| VNativeString s -> string_repr s
 	in
 	let fields_string fields =
 		let l = List.map (fun (name, value) -> Printf.sprintf "%s: %s" (rev_hash name) (level2_value_repr value)) fields in
@@ -92,6 +94,7 @@ let var_to_json name value vio env =
 		Printf.sprintf "[%s]" (String.concat ", " l)
 	in
 	let rec value_string v = match v with
+		| VFileDescriptor _ -> jv "eval.Unix.FileDescriptor" "<descriptor>" 0
 		| VNull -> jv "NULL" "null" 0
 		| VTrue -> jv "Bool" "true" 0
 		| VFalse -> jv "Bool" "false" 0
@@ -117,7 +120,7 @@ let var_to_json name value vio env =
 				jv "Anonymous" (fields_string fields) (List.length fields)
 			end
 		| VString s ->
-			jv "String" (string_repr s) 2
+			jv "String" (string_repr s.sstring) 2
 		| VArray va -> jv "Array" (array_elems (EvalArray.to_list va)) va.alength
 		| VVector vv -> jv "Vector" (array_elems (Array.to_list vv)) (Array.length vv)
 		| VInstance vi ->
@@ -143,6 +146,8 @@ let var_to_json name value vio env =
 			jv "Anonymous" (s_proto_kind proto).sstring (List.length fields)
 		| VFunction _ | VFieldClosure _ -> jv "Function" "<fun>" 0
 		| VLazy f -> value_string (!f())
+		| VNativeString s ->
+			jv "NativeString" (string_repr s) 0
 	in
 	value_string value
 
@@ -262,7 +267,7 @@ let output_scope_vars env scope =
 
 let output_inner_vars v env =
 	let rec loop v = match v with
-		| VNull | VTrue | VFalse | VInt32 _ | VFloat _ | VFunction _ | VFieldClosure _ -> []
+		| VNull | VTrue | VFalse | VInt32 _ | VFloat _ | VFunction _ | VFieldClosure _ | VNativeString _ | VFileDescriptor _ -> []
 		| VEnumValue ve ->
 			begin match (get_static_prototype_raise (get_ctx()) ve.epath).pkind with
 				| PEnum names ->
@@ -424,7 +429,7 @@ module ValueCompletion = struct
 			| _ -> "field"
 		in
 		let rec loop v = match v with
-			| VNull | VTrue | VFalse | VInt32 _ | VFloat _ | VFunction _ | VFieldClosure _ ->
+			| VNull | VTrue | VFalse | VInt32 _ | VFloat _ | VFunction _ | VFieldClosure _ | VNativeString _ | VFileDescriptor _ ->
 				[]
 			| VObject o ->
 				let fields = object_fields o in

src/macro/eval/evalDecode.ml

@@ -57,6 +57,14 @@ let decode_vstring v = match v with
 	| VString s -> s
 	| _ -> unexpected_value v "string"
 
+let decode_native_string v = match v with
+	| VNativeString s -> s
+	| _ -> unexpected_value v "native string"
+
+let decode_file_descriptor v = match v with
+	| VFileDescriptor fd -> fd
+	| _ -> unexpected_value v "file descriptor"
+
 let decode_bytes v = match v with
 	| VInstance {ikind=IBytes s} -> s
 	| _ -> unexpected_value v "string"

src/macro/eval/evalExceptions.ml

@@ -61,6 +61,7 @@ let is v path =
 	| _ -> false
 
 let s_value_kind = function
+	| VFileDescriptor _ -> "VFileDescriptor"
 	| VNull -> "VNull"
 	| VTrue -> "VTrue"
 	| VFalse -> "VFalse"
@@ -76,6 +77,7 @@ let s_value_kind = function
 	| VFunction _ -> "VFunction"
 	| VFieldClosure _ -> "VFieldClosure"
 	| VLazy _ -> "VLazy"
+	| VNativeString _ -> "VNativeString"
 
 let unexpected_value : 'a . value -> string -> 'a = fun v s ->
 	let str = match v with

src/macro/eval/evalHash.ml

@@ -144,3 +144,5 @@ let key_mbedtls_Entropy = hash "mbedtls.Entropy"
 let key_mbedtls_PkContext = hash "mbedtls.PkContext"
 let key_mbedtls_Ssl = hash "mbedtls.Ssl"
 let key_mbedtls_X509Crt = hash "mbedtls.X509Crt"
+
+let key_eval_PosixError = hash "eval.PosixError"

src/macro/eval/evalMain.ml

@@ -199,7 +199,7 @@ let value_signature v =
 			incr cache_length;
 			f()
 	in
-	let function_count = ref 0 in
+	let cache_count = ref 0 in
 	let rec loop v = match v with
 		| VNull -> addc 'n'
 		| VTrue -> addc 't'
@@ -290,6 +290,8 @@ let value_signature v =
 			)
 		| VString s ->
 			adds s.sstring
+		| VNativeString s ->
+			add s
 		| VArray {avalues = a} | VVector a ->
 			cache v (fun () ->
 				addc 'a';
@@ -323,8 +325,15 @@ let value_signature v =
 			(* Custom format: enumerate functions as F0, F1 etc. *)
 			cache v (fun () ->
 				addc 'F';
-				add (string_of_int !function_count);
-				incr function_count
+				add (string_of_int !cache_count);
+				incr cache_count
+			)
+		| VFileDescriptor _ ->
+			(* Custom format: enumerate descriptors as D0, D1 etc. *)
+			cache v (fun () ->
+				addc 'D';
+				add (string_of_int !cache_count);
+				incr cache_count
 			)
 		| VLazy f ->
 			loop (!f())

src/macro/eval/evalPrinting.ml

@@ -40,6 +40,7 @@ let rtrue = create_ascii "true"
 let rfalse = create_ascii "false"
 let rfun = create_ascii "#fun"
 let rclosure = create_ascii "#closure"
+let rdescriptor = create_ascii "#descriptor"
 
 let s_date d =
 	let open Unix in
@@ -108,6 +109,7 @@ and s_value depth v =
 	in
 	if depth > 5 then rstop
 	else match v with
+	| VFileDescriptor _ -> rdescriptor
 	| VNull -> rnull
 	| VInt32 i32 -> create_ascii(Int32.to_string i32)
 	| VTrue -> rtrue
@@ -120,6 +122,7 @@ and s_value depth v =
 	| VFieldClosure _ -> rclosure
 	| VEnumValue ve -> s_enum_value depth ve
 	| VString s -> s
+	| VNativeString s -> create_unknown_vstring s
 	| VArray va -> s_array (depth + 1) va
 	| VVector vv -> s_vector (depth + 1) vv
 	| VInstance {ikind=IDate d} -> s_date d

src/macro/eval/evalStdLib.ml

@@ -3020,6 +3020,8 @@ module StdType = struct
 				7,[|get_static_prototype_as_value ctx ve.epath null_pos|]
 			| VLazy f ->
 				loop (!f())
+			| VNativeString _ -> 8,[||]
+			| VFileDescriptor _ -> 8,[||]
 		in
 		let i,vl = loop v in
 		encode_enum_value key_ValueType i vl None
@@ -3123,6 +3125,34 @@ module StdUtf8 = struct
 	)
 end
 
+module StdNativeString = struct
+	let from_string = vfun1 (fun v ->
+		let s = decode_vstring v in
+		vnative_string s.sstring
+	)
+
+	let from_bytes = vfun1 (fun v ->
+		let b = decode_bytes v in
+		vnative_string (Bytes.to_string b)
+	)
+
+	let to_string = vfun1 (fun v ->
+		let s = decode_native_string v in
+		create_unknown s
+	)
+
+	let to_bytes = vfun1 (fun v ->
+		let s = decode_native_string v in
+		encode_bytes (Bytes.of_string s)
+	)
+
+	let equals = vfun2 (fun v1 v2 ->
+		let s1 = decode_native_string v1
+		and s2 = decode_native_string v2 in
+		vbool (s1 = s2)
+	)
+end
+
 let init_fields builtins path static_fields instance_fields =
 	let map (name,v) = (hash name,v) in
 	let path = path_hash path in
@@ -3725,4 +3755,25 @@ let init_standard_library builtins =
 		"addChar",StdUtf8.addChar;
 		"toString",StdUtf8.toString;
 	];
+	init_fields builtins (["eval";"_NativeString"],"NativeString_Impl_") [
+		"fromBytes",StdNativeString.from_bytes;
+		"fromString",StdNativeString.from_string;
+		"toBytes",StdNativeString.to_bytes;
+		"toString",StdNativeString.to_string;
+		"equals",StdNativeString.equals;
+	] [];
+	init_fields builtins (["eval"],"Unix") [
+		"isLink",EvalUnix.is_link;
+		"isFile",EvalUnix.is_file;
+		"isDirectory",EvalUnix.is_directory;
+		"stat",EvalUnix.get_stat;
+		"lstat",EvalUnix.get_lstat;
+		"utimes",EvalUnix.set_utimes;
+		"realPath",EvalUnix.get_real_path;
+		"mkdir",EvalUnix.mkdir;
+		"openFile",EvalUnix.open_file;
+		"closeFile",EvalUnix.close_file;
+		"read",EvalUnix.read_file;
+		"write",EvalUnix.write_file;
+	] [];
 	EvalSsl.init_fields init_fields builtins

src/macro/eval/evalString.ml

@@ -38,8 +38,11 @@ let empty_string = create_ascii ""
 
 let v_empty_string = VString empty_string
 
+let create_unknown_vstring s =
+	create_with_length s (try UTF8.length s with _ -> String.length s)
+
 let create_unknown s =
-	vstring (create_with_length s (try UTF8.length s with _ -> String.length s))
+	vstring (create_unknown_vstring s)
 
 let concat s1 s2 =
 	create_with_length (s1.sstring ^ s2.sstring) (s1.slength + s2.slength)