kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove ByteArray CFFI

Browse Source
This commit is contained in:
Joshua Granick
2015-07-06 13:25:39 -07:00
parent 087203455c
commit 6216b69f88
2 changed files with 5 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
lime/utils/ByteArray.hx
View File

@@ -25,7 +25,7 @@ import js.html.Uint8Array;
import cpp.NativeArray; import cpp.NativeArray;
#end #end
#if ((disable_cffi || java) && sys) #if sys
import sys.io.File; import sys.io.File;
#end #end
@@ -55,72 +55,6 @@ class ByteArray #if !js extends Bytes implements ArrayAccess<Int> implements IDa
#end #end
#if (!html5 && !disable_cffi && !java)
private static function __init__ () {
var factory = function (length:Int) { return new ByteArray (length); };
#if nodejs
var resize = function (bytes:ByteArray, length:Int) {
bytes.length = length;
}
#else
var resize = function (bytes:ByteArray, length:Int) {
if (length > 0)
bytes.ensureElem (length - 1, true);
bytes.length = length;
};
#end
#if nodejs
var bytes = function (bytes:Dynamic) {
if (Std.is (bytes, ByteArray))
return untyped bytes.byteView;
else if (Std.is (bytes, UInt8Array) ||
Std.is (bytes, UInt16Array) ||
Std.is (bytes, Int16Array) ||
Std.is (bytes, Float32Array))
return bytes;
if (bytes != null)
trace("Couldn't get BytesData:" + bytes);
return null;
}
var slen = function (bytes:ByteArray) {
if (Std.is (bytes, ByteArray))
return untyped bytes.length;
else if (Std.is (bytes, UInt8Array) ||
Std.is (bytes, UInt16Array) ||
Std.is (bytes, UInt32Array) ||
Std.is (bytes, Int8Array) ||
Std.is (bytes, Int16Array) ||
Std.is (bytes, Int32Array) ||
Std.is (bytes, Float32Array))
return untyped bytes.byteLength;
return 0;
}
#else
var bytes = function (bytes:ByteArray) { return bytes == null ? null : bytes.b; }
var slen = function (bytes:ByteArray){ return bytes == null ? 0 : bytes.length; }
#end
#if !lime_legacy
var init = System.load ("lime", "lime_byte_array_init", 4);
if (init != null) init (factory, slen, resize, bytes);
#end
#if (lime_hybrid || lime_legacy)
var init = System.load ("lime-legacy", "lime_legacy_byte_array_init", 4);
if (init != null) init (factory, slen, resize, bytes);
#end
}
#end
public function new (size = 0):Void { public function new (size = 0):Void {
#if js #if js
@@ -396,10 +330,8 @@ class ByteArray #if !js extends Bytes implements ArrayAccess<Int> implements IDa
#if html5 #if html5
return null; return null;
#elseif (java || disable_cffi)
return ByteArray.fromBytes (File.getBytes (path));
#else #else
return lime_byte_array_read_file (path); return ByteArray.fromBytes (File.getBytes (path));
#end #end
} }
@@ -790,12 +722,8 @@ class ByteArray #if !js extends Bytes implements ArrayAccess<Int> implements IDa
public function writeFile (path:String):Void { public function writeFile (path:String):Void {
#if !js #if sys
#if disable_cffi
File.saveBytes (path, this); File.saveBytes (path, this);
#else
lime_byte_array_overwrite_file (path, this);
#end
#end #end
} }
@@ -1006,7 +934,7 @@ class ByteArray #if !js extends Bytes implements ArrayAccess<Int> implements IDa
#if (cpp || neko || nodejs) #if (cpp || neko || nodejs)
public function __getNativePointer ():Dynamic { public function __getNativePointer ():Dynamic {
return lime_byte_array_get_native_pointer (this); return lime_bytes_get_data_pointer (this);
} }
#end #end
@@ -1164,10 +1092,7 @@ class ByteArray #if !js extends Bytes implements ArrayAccess<Int> implements IDa
private static var lime_byte_array_get_native_pointer = System.load ("lime", "lime_byte_array_get_native_pointer", 1); private static var lime_bytes_get_data_pointer = System.load ("lime", "lime_bytes_get_data_pointer", 1);
private static var lime_byte_array_overwrite_file = System.load ("lime", "lime_byte_array_overwrite_file", 2);
private static var lime_byte_array_read_file = System.load ("lime", "lime_byte_array_read_file", 1);
} }

1
project/Build.xml
View File

@@ -208,7 +208,6 @@
<file name="src/ui/TextEvent.cpp" /> <file name="src/ui/TextEvent.cpp" />
<file name="src/ui/TouchEvent.cpp" /> <file name="src/ui/TouchEvent.cpp" />
<file name="src/ui/WindowEvent.cpp" /> <file name="src/ui/WindowEvent.cpp" />
<file name="src/utils/ByteArray.cpp" />
<file name="src/utils/Bytes.cpp" /> <file name="src/utils/Bytes.cpp" />
</files> </files>