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

Speed up builds by skipping CFFI macro

Browse Source
This commit is contained in:
Joshua Granick
2018-06-25 20:32:03 -07:00
parent 8d3da1fb32
commit 5fa61ca2e9
3 changed files with 1580 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1587
lime/_backend/native/NativeCFFI.hx
View File

File diff suppressed because it is too large Load Diff

19
lime/_macros/CFFIMacro.hx
View File

@@ -94,6 +94,9 @@ class CFFIMacro {
cffiExpr = 'new cpp.Callable<$typeString> (cpp.Prime._loadPrime ("$library", "$method", "$typeSignature", $lazy))'; cffiExpr = 'new cpp.Callable<$typeString> (cpp.Prime._loadPrime ("$library", "$method", "$typeSignature", $lazy))';
// Sys.println ("private static var " + field.name + ':$typeString = CFFI.loadPrime ("$library", "$method", "$typeSignature");');
// Sys.println ("private static var " + field.name + ' = new cpp.Callable<$typeString> (cpp.Prime._loadPrime ("$library", "$method", "$typeSignature", $lazy));');
} else { } else {
var args = typeSignature.length - 1; var args = typeSignature.length - 1;
@@ -106,6 +109,8 @@ class CFFIMacro {
cffiExpr = 'new cpp.Callable<$typeString> (lime.system.CFFI.load ("$library", "$method", $args, $lazy))'; cffiExpr = 'new cpp.Callable<$typeString> (lime.system.CFFI.load ("$library", "$method", $args, $lazy))';
// Sys.println ("private static var " + field.name + ':$typeString = CFFI.load ("$library", "$method", $args);');
} }
cffiType = TPath ( { pack: [ "cpp" ], name: "Callable", params: [ TPType (TFun (type.args, type.result).toComplexType ()) ] } ); cffiType = TPath ( { pack: [ "cpp" ], name: "Callable", params: [ TPType (TFun (type.args, type.result).toComplexType ()) ] } );
@@ -129,6 +134,20 @@ class CFFIMacro {
expr += ")"; expr += ")";
// if (Context.defined ("cpp")) {
// Sys.println ('private static var $cffiName = new cpp.Callable<$typeString> (cpp.Prime._loadPrime ("$library", "$method", "$typeSignature", $lazy));');
// var _args = "";
// for (i in 0...typeArgs.length) {
// if (i > 0) _args += ", ";
// _args += typeArgs[i].name + ":" + typeArgs[i].t.toString ();
// }
// Sys.println ('private static function ${field.name} ($_args) { $expr; }');
// }
} }
field.access.push (AInline); field.access.push (AInline);

2
lime/system/CFFI.hx
View File

@@ -214,7 +214,7 @@ class CFFI {
public static macro function loadPrime (library:String, method:String, signature:String, lazy:Bool = false):Dynamic { public static macro function loadPrime (library:String, method:String, signature:String, lazy:Bool = false):Dynamic {
#if (!display && !macro && cpp) #if (!display && !macro && cpp && !disable_cffi)
return cpp.Prime.load (library, method, signature, lazy); return cpp.Prime.load (library, method, signature, lazy);
#else #else
var args = signature.length - 1; var args = signature.length - 1;