colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-04 08:06:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added support for new compiler when loading objj files in the browsers

Browse Source
This commit is contained in:
Martin Carlberg committed 2012-12-15 23:35:36 +01:00
1 parent a202cfbbe9
commit 59fa5c27b6
5 files changed
+4597 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Objective-J/Executable.js
+27 -3
View File
@@ -26,15 +26,17 @@ var ExecutableUnloadedFileDependencies = 0,
ExecutableLoadedFileDependencies = 2,
AnonymousExecutableCount = 0;
function Executable(/*String*/ aCode, /*Array*/ fileDependencies, /*CFURL|String*/ aURL, /*Function*/ aFunction)
function Executable(/*String*/ aCode, /*Array*/ fileDependencies, /*CFURL|String*/ aURL, /*Function*/ aFunction, /*ObjJCompiler*/aCompiler)
{
if (arguments.length === 0)
return this;
this._code = aCode;
this._function = aFunction || NULL;
this._function = aFunction || null;
this._URL = makeAbsoluteURL(aURL || new CFURL("(Anonymous" + (AnonymousExecutableCount++) + ")"));
this._compiler = aCompiler || null;
this._fileDependencies = fileDependencies;
if (fileDependencies.length)
@@ -48,7 +50,8 @@ function Executable(/*String*/ aCode, /*Array*/ fileDependencies, /*CFURL|String
if (this._function)
return;
this.setCode(aCode);
if (!aCompiler)
this.setCode(aCode);
}
exports.Executable = Executable;
@@ -135,6 +138,27 @@ Executable.prototype.execute = function()
#if EXECUTION_LOGGING
CPLog("EXECUTION: " + this.URL());
#endif
if (this._compiler)
{
var fileDependencies = this.fileDependencies(),
index = 0,
count = fileDependencies.length;
for (; index < count; ++index)
{
var fileDependency = fileDependencies[index],
isQuoted = fileDependency.isLocal(),
URL = fileDependency.URL();
CPLog("Execute FileDependant: " + URL);
objj_executeFile(URL, isQuoted);
}
CPLog("Compile Pass 2: " + this.URL());
this.setCode(this._compiler.compilePass2());
}
var oldContextBundle = CONTEXT_BUNDLE;
// FIXME: Should we have stored this?