diff --git a/include.xml b/include.xml index a451d311d..ab1ef1d74 100644 --- a/include.xml +++ b/include.xml @@ -91,7 +91,7 @@ - + diff --git a/src/lime/_internal/backend/native/NativeCFFI.hx b/src/lime/_internal/backend/native/NativeCFFI.hx index 611fddc2c..70816fe60 100644 --- a/src/lime/_internal/backend/native/NativeCFFI.hx +++ b/src/lime/_internal/backend/native/NativeCFFI.hx @@ -12,8 +12,6 @@ import lime.graphics.Image; import lime.graphics.ImageBuffer; import lime.math.Rectangle; import lime.media.openal.ALAuxiliaryEffectSlot; -import lime.system.CFFI; -import lime.system.CFFIPointer; import lime.utils.DataPointer; #if hl @@ -29,12 +27,22 @@ import lime.system.DisplayMode; import lime.utils.ArrayBufferView; #end +#if (!lime_doc_gen || lime_cffi) +import lime.system.CFFI; +import lime.system.CFFIPointer; +#end + #if cpp import cpp.Float32; #else typedef Float32 = Float; #end +#if (lime_doc_gen && !lime_cffi) +typedef CFFI = Dynamic; +typedef CFFIPointer = Dynamic; +#end + // #if hl // typedef TNative_Application = hl.Abstract<"Application">; // #end @@ -44,7 +52,7 @@ typedef Float32 = Float; @:noDebug #end -#if !macro +#if (!macro && !lime_doc_gen) @:build(lime.system.CFFI.build()) #end diff --git a/src/lime/app/Application.hx b/src/lime/app/Application.hx index 35bc8b688..de7ba039f 100644 --- a/src/lime/app/Application.hx +++ b/src/lime/app/Application.hx @@ -629,7 +629,9 @@ class Application extends Module { if (__windows.length == 0) { + #if !lime_doc_gen System.exit (0); + #end } diff --git a/src/lime/graphics/opengl/GL.hx b/src/lime/graphics/opengl/GL.hx index 0040c2394..ad70f960f 100644 --- a/src/lime/graphics/opengl/GL.hx +++ b/src/lime/graphics/opengl/GL.hx @@ -3,7 +3,6 @@ package lime.graphics.opengl; #if (!lime_doc_gen || lime_opengl || lime_opengles import haxe.io.Bytes; import haxe.Int64; -import lime.system.CFFIPointer; import lime.utils.ArrayBufferView; import lime.utils.ArrayBuffer; import lime.utils.BytePointer; @@ -11,8 +10,9 @@ import lime.utils.DataPointer; import lime.utils.Float32Array; import lime.utils.Int32Array; -#if (lime_cffi && lime_opengl && !macro) +#if (lime_cffi && (lime_opengl || lime_opengles) && !macro) import lime._internal.backend.native.NativeCFFI; +import lime.system.CFFIPointer; #end @:allow(lime.ui.Window) @@ -3332,7 +3332,7 @@ class GL { private var id:Int; - private var ptr:CFFIPointer; + private var ptr:#if (lime_cffi && (lime_opengl || lime_opengles) && !macro) CFFIPointer #else Dynamic #end; private var refs:Array; diff --git a/src/lime/net/curl/CURL.hx b/src/lime/net/curl/CURL.hx index c64da3d5a..5d82f4073 100644 --- a/src/lime/net/curl/CURL.hx +++ b/src/lime/net/curl/CURL.hx @@ -1,4 +1,4 @@ -package lime.net.curl; +package lime.net.curl; #if (!lime_doc_gen || lime_curl) import haxe.io.Bytes; @@ -315,4 +315,7 @@ class CURL { } -} \ No newline at end of file +} + + +#end \ No newline at end of file diff --git a/src/lime/net/curl/CURLCode.hx b/src/lime/net/curl/CURLCode.hx index c497f25cd..d8af46b1f 100644 --- a/src/lime/net/curl/CURLCode.hx +++ b/src/lime/net/curl/CURLCode.hx @@ -1,4 +1,4 @@ -package lime.net.curl; +package lime.net.curl; #if (!lime_doc_gen || lime_curl) @:enum abstract CURLCode(Int) from Int to Int from UInt to UInt { @@ -98,4 +98,7 @@ package lime.net.curl; var HTTP2_STREAM = 92; //var LAST = 93; -} \ No newline at end of file +} + + +#end \ No newline at end of file diff --git a/src/lime/net/curl/CURLInfo.hx b/src/lime/net/curl/CURLInfo.hx index ea4ab06f5..774acef07 100644 --- a/src/lime/net/curl/CURLInfo.hx +++ b/src/lime/net/curl/CURLInfo.hx @@ -1,4 +1,4 @@ -package lime.net.curl; +package lime.net.curl; #if (!lime_doc_gen || lime_curl) @:enum abstract CURLInfo(Int) from Int to Int from UInt to UInt { @@ -60,4 +60,7 @@ package lime.net.curl; var PROTOCOL = 0x200000 + 48; var SCHEME = 0x100000 + 49; -} \ No newline at end of file +} + + +#end \ No newline at end of file diff --git a/src/lime/net/curl/CURLMulti.hx b/src/lime/net/curl/CURLMulti.hx index 11fadf05d..c8e2136ce 100644 --- a/src/lime/net/curl/CURLMulti.hx +++ b/src/lime/net/curl/CURLMulti.hx @@ -1,4 +1,4 @@ -package lime.net.curl; +package lime.net.curl; #if (!lime_doc_gen || lime_curl) import lime._internal.backend.native.NativeCFFI; @@ -137,4 +137,7 @@ class CURLMulti { } -} \ No newline at end of file +} + + +#end \ No newline at end of file diff --git a/src/lime/net/curl/CURLMultiCode.hx b/src/lime/net/curl/CURLMultiCode.hx index 661c82919..b49c486cc 100644 --- a/src/lime/net/curl/CURLMultiCode.hx +++ b/src/lime/net/curl/CURLMultiCode.hx @@ -1,4 +1,4 @@ -package lime.net.curl; +package lime.net.curl; #if (!lime_doc_gen || lime_curl) @:enum abstract CURLMultiCode(Int) from Int to Int from UInt /*to UInt*/ { @@ -31,4 +31,7 @@ package lime.net.curl; //LAST -} \ No newline at end of file +} + + +#end \ No newline at end of file diff --git a/src/lime/net/curl/CURLMultiMessage.hx b/src/lime/net/curl/CURLMultiMessage.hx index fbbd9250e..f04520616 100644 --- a/src/lime/net/curl/CURLMultiMessage.hx +++ b/src/lime/net/curl/CURLMultiMessage.hx @@ -1,4 +1,4 @@ -package lime.net.curl; +package lime.net.curl; #if (!lime_doc_gen || lime_curl) class CURLMultiMessage { @@ -16,4 +16,7 @@ class CURLMultiMessage { } -} \ No newline at end of file +} + + +#end \ No newline at end of file diff --git a/src/lime/net/curl/CURLMultiOption.hx b/src/lime/net/curl/CURLMultiOption.hx index abccd9efa..f44b15bf7 100644 --- a/src/lime/net/curl/CURLMultiOption.hx +++ b/src/lime/net/curl/CURLMultiOption.hx @@ -1,4 +1,4 @@ -package lime.net.curl; +package lime.net.curl; #if (!lime_doc_gen || lime_curl) @:enum abstract CURLMultiOption(Int) from Int to Int from UInt to UInt { @@ -8,48 +8,51 @@ package lime.net.curl; /* This is the argument passed to the socket callback */ var SOCKETDATA = 100002; - + /* set to 1 to enable pipelining for this multi handle */ var PIPELINING = 3; - + /* This is the timer callback function pointer */ var TIMERFUNCTION = 20004; - + /* This is the argument passed to the timer callback */ var TIMERDATA = 10005; - + /* maximum number of entries in the connection cache */ var MAXCONNECTS = 6; - + /* maximum number of (pipelining) connections to one host */ var MAX_HOST_CONNECTIONS = 7; - + /* maximum number of requests in a pipeline */ var MAX_PIPELINE_LENGTH = 8; - + /* a connection with a content-length longer than this will not be considered for pipelining */ var CONTENT_LENGTH_PENALTY_SIZE = 30009; - + /* a connection with a chunk length longer than this will not be considered for pipelining */ var CHUNK_LENGTH_PENALTY_SIZE = 30010; - + /* a list of site names(+port) that are blacklisted from pipelining */ var PIPELINING_SITE_BL = 10011; - + /* a list of server types that are blacklisted from pipelining */ var PIPELINING_SERVER_BL = 10012; - + /* maximum number of open connections in total */ var MAX_TOTAL_CONNECTIONS = 13; - + /* This is the server push callback function pointer */ var PUSHFUNCTION = 20014; - + /* This is the argument passed to the server push callback */ var PUSHDATA = 10015; -} \ No newline at end of file +} + + +#end \ No newline at end of file diff --git a/src/lime/net/curl/CURLOption.hx b/src/lime/net/curl/CURLOption.hx index 506e460a6..8a6864bb2 100644 --- a/src/lime/net/curl/CURLOption.hx +++ b/src/lime/net/curl/CURLOption.hx @@ -1,4 +1,4 @@ -package lime.net.curl; +package lime.net.curl; #if (!lime_doc_gen || lime_curl) @:enum abstract CURLOption(Int) from Int to Int from UInt to UInt { @@ -261,4 +261,7 @@ package lime.net.curl; var SSH_COMPRESSION = 268; var MIMEPOST = 10269; -} \ No newline at end of file +} + + +#end \ No newline at end of file diff --git a/src/lime/net/curl/CURLVersion.hx b/src/lime/net/curl/CURLVersion.hx index 4df14e0b2..58a7d1264 100644 --- a/src/lime/net/curl/CURLVersion.hx +++ b/src/lime/net/curl/CURLVersion.hx @@ -1,4 +1,4 @@ -package lime.net.curl; +package lime.net.curl; #if (!lime_doc_gen || lime_curl) @:enum abstract CURLVersion(Int) from Int to Int from UInt to UInt { @@ -9,4 +9,7 @@ package lime.net.curl; var FOURTH = 3; //var LAST = 4; -} \ No newline at end of file +} + + +#end \ No newline at end of file diff --git a/src/lime/system/CFFI.hx b/src/lime/system/CFFI.hx index 5669904df..5c256a5c5 100644 --- a/src/lime/system/CFFI.hx +++ b/src/lime/system/CFFI.hx @@ -1,4 +1,4 @@ -package lime.system; +package lime.system; #if (!lime_doc_gen || lime_cffi) import lime._internal.macros.CFFIMacro; @@ -495,4 +495,7 @@ class CFFI { } } +#end + + #end \ No newline at end of file diff --git a/src/lime/system/CFFIPointer.hx b/src/lime/system/CFFIPointer.hx index b5cd0876f..eb0280bbd 100644 --- a/src/lime/system/CFFIPointer.hx +++ b/src/lime/system/CFFIPointer.hx @@ -1,4 +1,4 @@ -package lime.system; +package lime.system; #if (!lime_doc_gen || lime_cffi) import lime._internal.backend.native.NativeCFFI; @@ -45,4 +45,7 @@ abstract CFFIPointer(Dynamic) from Dynamic to Dynamic { @:noCompletion @:op(A != B) private static inline function notEqualsPointer (a:CFFIPointer, b:CFFIPointer):Bool { return a.get () != b.get (); } -} \ No newline at end of file +} + + +#end \ No newline at end of file diff --git a/src/lime/system/FileWatcher.hx b/src/lime/system/FileWatcher.hx index 26f35ba7d..748b260e6 100644 --- a/src/lime/system/FileWatcher.hx +++ b/src/lime/system/FileWatcher.hx @@ -1,4 +1,4 @@ -package lime.system; +package lime.system; #if (!lime_doc_gen || lime_cffi) import lime._internal.backend.native.NativeCFFI; @@ -156,4 +156,7 @@ class FileWatcher { } -} \ No newline at end of file +} + + +#end \ No newline at end of file diff --git a/src/lime/system/JNI.hx b/src/lime/system/JNI.hx index d325b7a76..b7840d702 100644 --- a/src/lime/system/JNI.hx +++ b/src/lime/system/JNI.hx @@ -1,4 +1,4 @@ -package lime.system; +package lime.system; #if (!lime_doc_gen || android) import lime._internal.backend.native.NativeCFFI; @@ -366,4 +366,7 @@ class JNIMethod { } -} \ No newline at end of file +} + + +#end \ No newline at end of file diff --git a/src/lime/system/System.hx b/src/lime/system/System.hx index 91e9cfe73..cae0f3348 100644 --- a/src/lime/system/System.hx +++ b/src/lime/system/System.hx @@ -159,6 +159,7 @@ class System { #end + #if (!lime_doc_gen || sys) public static function exit (code:Int):Void { #if ((sys || air) && !macro) @@ -182,6 +183,7 @@ class System { #end } + #end public static function getDisplay (id:Int):Display { @@ -295,7 +297,7 @@ class System { } - + #if (!lime_doc_gen || lime_cffi) public static inline function load (library:String, method:String, args:Int = 0, lazy:Bool = false):Dynamic { #if !macro @@ -305,6 +307,7 @@ class System { #end } + #end public static function openFile (path:String):Void { diff --git a/src/lime/text/harfbuzz/HB.hx b/src/lime/text/harfbuzz/HB.hx index dde5633fc..3d6bba2ef 100644 --- a/src/lime/text/harfbuzz/HB.hx +++ b/src/lime/text/harfbuzz/HB.hx @@ -1,4 +1,4 @@ -package lime.text.harfbuzz; +package lime.text.harfbuzz; #if (!lime_doc_gen || lime_harfbuzz) import lime._internal.backend.native.NativeCFFI; @@ -18,4 +18,7 @@ class HB { } -} \ No newline at end of file +} + + +#end \ No newline at end of file diff --git a/src/lime/text/harfbuzz/HBBlob.hx b/src/lime/text/harfbuzz/HBBlob.hx index f09390e33..87c007cce 100644 --- a/src/lime/text/harfbuzz/HBBlob.hx +++ b/src/lime/text/harfbuzz/HBBlob.hx @@ -1,4 +1,4 @@ -package lime.text.harfbuzz; +package lime.text.harfbuzz; #if (!lime_doc_gen || lime_harfbuzz) import lime._internal.backend.native.NativeCFFI; @@ -112,4 +112,7 @@ abstract HBBlob(CFFIPointer) from CFFIPointer to CFFIPointer { } -} \ No newline at end of file +} + + +#end \ No newline at end of file diff --git a/src/lime/text/harfbuzz/HBBuffer.hx b/src/lime/text/harfbuzz/HBBuffer.hx index 5ba7a605a..863deac59 100644 --- a/src/lime/text/harfbuzz/HBBuffer.hx +++ b/src/lime/text/harfbuzz/HBBuffer.hx @@ -1,4 +1,4 @@ -package lime.text.harfbuzz; +package lime.text.harfbuzz; #if (!lime_doc_gen || lime_harfbuzz) import lime._internal.backend.native.NativeCFFI; @@ -439,4 +439,7 @@ abstract HBBuffer(CFFIPointer) from CFFIPointer to CFFIPointer { } -} \ No newline at end of file +} + + +#end \ No newline at end of file diff --git a/src/lime/text/harfbuzz/HBBufferClusterLevel.hx b/src/lime/text/harfbuzz/HBBufferClusterLevel.hx index 1aa22d467..d92a19959 100644 --- a/src/lime/text/harfbuzz/HBBufferClusterLevel.hx +++ b/src/lime/text/harfbuzz/HBBufferClusterLevel.hx @@ -1,4 +1,4 @@ -package lime.text.harfbuzz; +package lime.text.harfbuzz; #if (!lime_doc_gen || lime_harfbuzz) @:enum abstract HBBufferClusterLevel(Int) from Int to Int { @@ -8,4 +8,7 @@ package lime.text.harfbuzz; public var CHARACTERS = 2; public var DEFAULT = 0; -} \ No newline at end of file +} + + +#end \ No newline at end of file diff --git a/src/lime/text/harfbuzz/HBBufferContentType.hx b/src/lime/text/harfbuzz/HBBufferContentType.hx index aece903d2..320bfdcf1 100644 --- a/src/lime/text/harfbuzz/HBBufferContentType.hx +++ b/src/lime/text/harfbuzz/HBBufferContentType.hx @@ -1,4 +1,4 @@ -package lime.text.harfbuzz; +package lime.text.harfbuzz; #if (!lime_doc_gen || lime_harfbuzz) @:enum abstract HBBufferContentType(Int) from Int to Int { @@ -7,4 +7,7 @@ package lime.text.harfbuzz; public var UNICODE = 1; public var GLYPHS = 2; -} \ No newline at end of file +} + + +#end \ No newline at end of file diff --git a/src/lime/text/harfbuzz/HBBufferFlags.hx b/src/lime/text/harfbuzz/HBBufferFlags.hx index b7aac0dd8..1da91bf51 100644 --- a/src/lime/text/harfbuzz/HBBufferFlags.hx +++ b/src/lime/text/harfbuzz/HBBufferFlags.hx @@ -1,4 +1,4 @@ -package lime.text.harfbuzz; +package lime.text.harfbuzz; #if (!lime_doc_gen || lime_harfbuzz) @:enum abstract HBBufferFlags(Int) from Int to Int { @@ -8,4 +8,7 @@ package lime.text.harfbuzz; public var EOT = 0x00000002; public var PRESERVE_DEFAULT_IGNORABLES = 0x00000004; -} \ No newline at end of file +} + + +#end \ No newline at end of file diff --git a/src/lime/text/harfbuzz/HBBufferSerializeFlags.hx b/src/lime/text/harfbuzz/HBBufferSerializeFlags.hx index 34a70ea78..b024dc9f4 100644 --- a/src/lime/text/harfbuzz/HBBufferSerializeFlags.hx +++ b/src/lime/text/harfbuzz/HBBufferSerializeFlags.hx @@ -1,4 +1,4 @@ -package lime.text.harfbuzz; +package lime.text.harfbuzz; #if (!lime_doc_gen || lime_harfbuzz) @:enum abstract HBBufferSerializeFlags(Int) from Int to Int { @@ -8,4 +8,7 @@ package lime.text.harfbuzz; public var NO_POSITIONS = 0x00000002; public var NO_GLYPH_NAMES = 0x00000004; -} \ No newline at end of file +} + + +#end \ No newline at end of file diff --git a/src/lime/text/harfbuzz/HBBufferSerializeFormat.hx b/src/lime/text/harfbuzz/HBBufferSerializeFormat.hx index 6c08fc9b4..16fe555c0 100644 --- a/src/lime/text/harfbuzz/HBBufferSerializeFormat.hx +++ b/src/lime/text/harfbuzz/HBBufferSerializeFormat.hx @@ -1,4 +1,4 @@ -package lime.text.harfbuzz; +package lime.text.harfbuzz; #if (!lime_doc_gen || lime_harfbuzz) @:enum abstract HBBufferSerializeFormat(Int) from Int to Int { @@ -18,4 +18,7 @@ package lime.text.harfbuzz; //@:cffi private static function lime_hb_buffer_serialize_format_from_string (str:String, len:Int):Int; //@:cffi private static function lime_hb_buffer_serialize_format_to_string (format:Int):CFFIPointer; - //@:cffi private static function lime_hb_buffer_serialize_list_formats ():CFFIPointer; \ No newline at end of file + //@:cffi private static function lime_hb_buffer_serialize_list_formats ():CFFIPointer; + + +#end \ No newline at end of file diff --git a/src/lime/text/harfbuzz/HBDirection.hx b/src/lime/text/harfbuzz/HBDirection.hx index f1d7998cc..19ebe7979 100644 --- a/src/lime/text/harfbuzz/HBDirection.hx +++ b/src/lime/text/harfbuzz/HBDirection.hx @@ -1,4 +1,4 @@ -package lime.text.harfbuzz; +package lime.text.harfbuzz; #if (!lime_doc_gen || lime_harfbuzz) @:enum abstract HBDirection(Int) from Int to Int { @@ -9,4 +9,7 @@ package lime.text.harfbuzz; public var TTB = 6; public var BTT = 7; -} \ No newline at end of file +} + + +#end \ No newline at end of file diff --git a/src/lime/text/harfbuzz/HBFTFont.hx b/src/lime/text/harfbuzz/HBFTFont.hx index 4dadb3a6e..45b23a97a 100644 --- a/src/lime/text/harfbuzz/HBFTFont.hx +++ b/src/lime/text/harfbuzz/HBFTFont.hx @@ -1,4 +1,4 @@ -package lime.text.harfbuzz; +package lime.text.harfbuzz; #if (!lime_doc_gen || lime_harfbuzz) import lime._internal.backend.native.NativeCFFI; @@ -55,4 +55,7 @@ abstract HBFTFont(HBFont) to HBFont from CFFIPointer to CFFIPointer { } -} \ No newline at end of file +} + + +#end \ No newline at end of file diff --git a/src/lime/text/harfbuzz/HBFace.hx b/src/lime/text/harfbuzz/HBFace.hx index 7500537f3..c700f0666 100644 --- a/src/lime/text/harfbuzz/HBFace.hx +++ b/src/lime/text/harfbuzz/HBFace.hx @@ -1,4 +1,4 @@ -package lime.text.harfbuzz; +package lime.text.harfbuzz; #if (!lime_doc_gen || lime_harfbuzz) import lime._internal.backend.native.NativeCFFI; @@ -121,4 +121,7 @@ abstract HBFace(CFFIPointer) from CFFIPointer to CFFIPointer { } -} \ No newline at end of file +} + + +#end \ No newline at end of file diff --git a/src/lime/text/harfbuzz/HBFeature.hx b/src/lime/text/harfbuzz/HBFeature.hx index 2ade9ffcb..2eb2e5751 100644 --- a/src/lime/text/harfbuzz/HBFeature.hx +++ b/src/lime/text/harfbuzz/HBFeature.hx @@ -1,4 +1,4 @@ -package lime.text.harfbuzz; +package lime.text.harfbuzz; #if (!lime_doc_gen || lime_harfbuzz) class HBFeature { @@ -14,4 +14,7 @@ class HBFeature { } //@:cffi private static function lime_hb_feature_from_string (str:String):CFFIPointer; -//@:cffi private static function lime_hb_feature_to_string (feature:CFFIPointer):CFFIPointer; \ No newline at end of file +//@:cffi private static function lime_hb_feature_to_string (feature:CFFIPointer):CFFIPointer; + + +#end \ No newline at end of file diff --git a/src/lime/text/harfbuzz/HBFont.hx b/src/lime/text/harfbuzz/HBFont.hx index 9a0e15e10..ad8639e79 100644 --- a/src/lime/text/harfbuzz/HBFont.hx +++ b/src/lime/text/harfbuzz/HBFont.hx @@ -1,4 +1,4 @@ -package lime.text.harfbuzz; +package lime.text.harfbuzz; #if (!lime_doc_gen || lime_harfbuzz) import lime._internal.backend.native.NativeCFFI; @@ -217,4 +217,7 @@ abstract HBFont(CFFIPointer) from CFFIPointer to CFFIPointer { } -} \ No newline at end of file +} + + +#end \ No newline at end of file diff --git a/src/lime/text/harfbuzz/HBGlyphExtents.hx b/src/lime/text/harfbuzz/HBGlyphExtents.hx index 7326dd4ad..2f4bfd922 100644 --- a/src/lime/text/harfbuzz/HBGlyphExtents.hx +++ b/src/lime/text/harfbuzz/HBGlyphExtents.hx @@ -1,15 +1,17 @@ -package lime.text.harfbuzz; +package lime.text.harfbuzz; #if (!lime_doc_gen || lime_harfbuzz) -/** - * ... - * @author Joshua Granick - */ -class HBGlyphExtents -{ - public function new() - { +class HBGlyphExtents { + + + public function new () { + + } -} \ No newline at end of file + +} + + +#end \ No newline at end of file diff --git a/src/lime/text/harfbuzz/HBGlyphInfo.hx b/src/lime/text/harfbuzz/HBGlyphInfo.hx index b8d4bd989..e29da9a5a 100644 --- a/src/lime/text/harfbuzz/HBGlyphInfo.hx +++ b/src/lime/text/harfbuzz/HBGlyphInfo.hx @@ -1,4 +1,4 @@ -package lime.text.harfbuzz; +package lime.text.harfbuzz; #if (!lime_doc_gen || lime_harfbuzz) class HBGlyphInfo { @@ -19,8 +19,4 @@ class HBGlyphInfo { } - - -//hb_codepoint_t codepoint; - //hb_mask_t mask; - //uint32_t cluster; \ No newline at end of file +#end \ No newline at end of file diff --git a/src/lime/text/harfbuzz/HBGlyphPosition.hx b/src/lime/text/harfbuzz/HBGlyphPosition.hx index c2ee38290..88d0cc49a 100644 --- a/src/lime/text/harfbuzz/HBGlyphPosition.hx +++ b/src/lime/text/harfbuzz/HBGlyphPosition.hx @@ -1,4 +1,4 @@ -package lime.text.harfbuzz; +package lime.text.harfbuzz; #if (!lime_doc_gen || lime_harfbuzz) class HBGlyphPosition { @@ -20,7 +20,4 @@ class HBGlyphPosition { } -//hb_position_t x_advance; - //hb_position_t y_advance; - //hb_position_t x_offset; - //hb_position_t y_offset; \ No newline at end of file +#end \ No newline at end of file diff --git a/src/lime/text/harfbuzz/HBLanguage.hx b/src/lime/text/harfbuzz/HBLanguage.hx index 6f4c753d0..4dff3cb8e 100644 --- a/src/lime/text/harfbuzz/HBLanguage.hx +++ b/src/lime/text/harfbuzz/HBLanguage.hx @@ -1,4 +1,4 @@ -package lime.text.harfbuzz; +package lime.text.harfbuzz; #if (!lime_doc_gen || lime_harfbuzz) import lime._internal.backend.native.NativeCFFI; @@ -50,4 +50,7 @@ abstract HBLanguage(CFFIPointer) from CFFIPointer to CFFIPointer { } -} \ No newline at end of file +} + + +#end \ No newline at end of file diff --git a/src/lime/text/harfbuzz/HBMemoryMode.hx b/src/lime/text/harfbuzz/HBMemoryMode.hx index b8f48c265..9441b42fa 100644 --- a/src/lime/text/harfbuzz/HBMemoryMode.hx +++ b/src/lime/text/harfbuzz/HBMemoryMode.hx @@ -1,4 +1,4 @@ -package lime.text.harfbuzz; +package lime.text.harfbuzz; #if (!lime_doc_gen || lime_harfbuzz) @:enum abstract HBMemoryMode(Int) from Int to Int { @@ -8,4 +8,7 @@ package lime.text.harfbuzz; public var WRITABLE = 2; public var READONLY_MAY_MAKE_WRITABLE = 3; -} \ No newline at end of file +} + + +#end \ No newline at end of file diff --git a/src/lime/text/harfbuzz/HBScript.hx b/src/lime/text/harfbuzz/HBScript.hx index 2a8b728c9..5806ab3ac 100644 --- a/src/lime/text/harfbuzz/HBScript.hx +++ b/src/lime/text/harfbuzz/HBScript.hx @@ -1,4 +1,4 @@ -package lime.text.harfbuzz; +package lime.text.harfbuzz; #if (!lime_doc_gen || lime_harfbuzz) @:enum abstract HBScript(Int) from Int to Int { @@ -143,4 +143,7 @@ package lime.text.harfbuzz; public var NEWA = "N".code << 24 | "e".code << 16 | "w".code << 8 | "a".code; public var INVALID = 0; -} \ No newline at end of file +} + + +#end \ No newline at end of file diff --git a/src/lime/text/harfbuzz/HBSegmentProperties.hx b/src/lime/text/harfbuzz/HBSegmentProperties.hx index d6de0cb63..b609011dd 100644 --- a/src/lime/text/harfbuzz/HBSegmentProperties.hx +++ b/src/lime/text/harfbuzz/HBSegmentProperties.hx @@ -1,18 +1,19 @@ -package lime.text.harfbuzz; +package lime.text.harfbuzz; #if (!lime_doc_gen || lime_harfbuzz) -/** - * ... - * @author Joshua Granick - */ -class HBSegmentProperties -{ - public function new() - { +class HBSegmentProperties { + + + public function new () { + + } //@:cffi private static function lime_hb_segment_properties_equal (a:CFFIPointer, b:CFFIPointer):Bool; //@:cffi private static function lime_hb_segment_properties_hash (p:CFFIPointer):Int; -} \ No newline at end of file +} + + +#end \ No newline at end of file diff --git a/src/lime/text/harfbuzz/HBSet.hx b/src/lime/text/harfbuzz/HBSet.hx index a22e6c9a2..2119188a0 100644 --- a/src/lime/text/harfbuzz/HBSet.hx +++ b/src/lime/text/harfbuzz/HBSet.hx @@ -1,4 +1,4 @@ -package lime.text.harfbuzz; +package lime.text.harfbuzz; #if (!lime_doc_gen || lime_harfbuzz) import lime._internal.backend.native.NativeCFFI; @@ -247,4 +247,7 @@ abstract HBSet(CFFIPointer) from CFFIPointer to CFFIPointer { } -} \ No newline at end of file +} + + +#end \ No newline at end of file diff --git a/src/lime/utils/DataPointer.hx b/src/lime/utils/DataPointer.hx index d7127a2d5..cdd5af549 100644 --- a/src/lime/utils/DataPointer.hx +++ b/src/lime/utils/DataPointer.hx @@ -129,6 +129,7 @@ abstract DataPointer(DataPointerType) to DataPointerType { } + #if !lime_doc_gen @:from @:noCompletion public static function fromCFFIPointer (pointer:CFFIPointer):DataPointer { #if (lime_cffi && !macro) @@ -139,6 +140,7 @@ abstract DataPointer(DataPointerType) to DataPointerType { #end } + #end public static function fromFile (path:String):DataPointer { @@ -407,13 +409,21 @@ abstract DataPointer(DataPointerType) to DataPointerType { @:noCompletion @:op(A == B) private static inline function equals (a:DataPointer, b:Int):Bool { return (a:Float) == b; } @:noCompletion @:op(A == B) private static inline function equalsPointer (a:DataPointer, b:DataPointer):Bool { return (a:Float) == (b:Float); } @:noCompletion @:op(A > B) private static inline function greaterThan (a:DataPointer, b:Int):Bool { return (a:Float) > b; } + #if !lime_doc_gen @:noCompletion @:op(A > B) private static inline function greaterThanPointer (a:DataPointer, b:CFFIPointer):Bool { return (a:Float) > b; } + #end @:noCompletion @:op(A >= B) private static inline function greaterThanOrEqual (a:DataPointer, b:Int):Bool { return (a:Float) >= b; } + #if !lime_doc_gen @:noCompletion @:op(A >= B) private static inline function greaterThanOrEqualPointer (a:DataPointer, b:CFFIPointer):Bool { return (a:Float) >= b; } + #end @:noCompletion @:op(A < B) private static inline function lessThan (a:DataPointer, b:Int):Bool { return (a:Float) < b; } + #if !lime_doc_gen @:noCompletion @:op(A < B) private static inline function lessThanPointer (a:DataPointer, b:CFFIPointer):Bool { return (a:Float) < b; } + #end @:noCompletion @:op(A <= B) private static inline function lessThanOrEqual (a:DataPointer, b:Int):Bool { return (a:Float) <= b; } + #if !lime_doc_gen @:noCompletion @:op(A <= B) private static inline function lessThanOrEqualPointer (a:DataPointer, b:CFFIPointer):Bool { return (a:Float) <= b; } + #end @:noCompletion @:op(A != B) private static inline function notEquals (a:DataPointer, b:Int):Bool { return (a:Float) != b; } @:noCompletion @:op(A != B) private static inline function notEqualsPointer (a:DataPointer, b:DataPointer):Bool { return (a:Float) != (b:Float); } @:noCompletion @:op(A + B) private static inline function plus (a:DataPointer, b:Int):DataPointer { return __withOffset (a, b); }