2
0
Эх сурвалжийг харах

added hl inflate support, added $unref

Nicolas Cannasse 9 жил өмнө
parent
commit
b549c876f9

+ 11 - 0
src/generators/genhl.ml

@@ -1822,6 +1822,17 @@ and eval_expr ctx e =
 			let rv = eval_to ctx e2 (match rtype ctx r with HRef t -> t | _ -> invalid()) in
 			op ctx (OSetref (r,rv));
 			r
+		| "$unref", [e1] ->
+			let rec loop e = match e.eexpr with
+				| TParenthesis e1 | TMeta(_,e1) | TCast(e1,None) -> loop e1
+				| TLocal v -> v
+				| _ -> invalid()
+			in
+			let v = loop e1 in
+			let r = alloc_reg ctx v in
+			let out = alloc_tmp ctx (match rtype ctx r with HRef t -> t | _ -> invalid()) in
+			op ctx (OUnref (out,r));
+			out
 		| "$ttype", [v] ->
 			let r = alloc_tmp ctx HType in
 			op ctx (OType (r,to_type ctx v.etype));

+ 74 - 0
std/hl/_std/haxe/zip/Uncompress.hx

@@ -0,0 +1,74 @@
+/*
+ * Copyright (C)2005-2016 Haxe Foundation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+package haxe.zip;
+
+private typedef Inflater = hl.types.NativeAbstract<"fmt_inflater">;
+
+@:coreApi @:hlNative("fmt")
+class Uncompress {
+
+	var s : Inflater;
+
+	public function new( ?windowBits : Int ) : Void {
+		s = inflate_init(windowBits);
+	}
+
+	public function execute( src : haxe.io.Bytes, srcPos : Int, dst : haxe.io.Bytes, dstPos : Int ) : { done : Bool, read : Int, write : Int } {
+		var read = 0, write = 0;
+		var done = inflate_buffer(s,src.getData(),srcPos,src.length,dst.getData(),dstPos,dst.length,read,write);
+		return { done : done, read : read, write : write };
+	}
+
+	public function setFlushMode( f : FlushMode ) : Void {
+		inflate_flush_mode(s,f.getIndex());
+	}
+
+	public function close() : Void {
+		inflate_end(s);
+	}
+
+	public static function run( src : haxe.io.Bytes, ?bufsize : Int ) : haxe.io.Bytes {
+		var u = new Uncompress(null);
+		if( bufsize == null ) bufsize = 1 << 16; // 64K
+		var tmp = haxe.io.Bytes.alloc(bufsize);
+		var b = new haxe.io.BytesBuffer();
+		var pos = 0;
+		u.setFlushMode(FlushMode.SYNC);
+		while( true ) {
+			var r = u.execute(src,pos,tmp,0);
+			b.addBytes(tmp,0,r.write);
+			pos += r.read;
+			if( r.done )
+				break;
+		}
+		u.close();
+		return b.getBytes();
+	}
+
+	static function inflate_init( bits : Int ) : Inflater { return null; }
+	static function inflate_buffer( i : Inflater, bytes : hl.types.Bytes, bytesPos : Int, bytesLen : Int, dst : hl.types.Bytes, dstPos : Int, dstLen : Int, read : hl.types.Ref<Int>, write : hl.types.Ref<Int>) : Bool {
+		return false;
+	}
+	static function inflate_end( i : Inflater ) : Void { }
+	static function inflate_flush_mode( i : Inflater, flush : Int ) : Void {}
+
+}