colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-11-14 02:33:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for minimization in Cappuccino.

Browse Source 
[#9 state:resolved]

Reviewed by ross.
This commit is contained in:
Francisco Ryan Tolmasky I committed 2008-11-03 16:57:28 -08:00
1 parent 54d48e9292
commit 6cff27c7bb
8 files changed
+165 -117
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AppKit/AppKit.steam
+3 -13
View File
@@ -35,23 +35,13 @@
<key>Name</key>
<string>Debug</string>
<key>Flags</key>
<string>-DDEBUG</string>
<key>Settings</key>
<dict>
<key>PREPROCESS</key>
<true/>
</dict>
<string>-DDEBUG -g</string>
</dict>
<dict>
<key>Name</key>
<string>Release</string>
<key>Settings</key>
<dict>
<key>PREPROCESS</key>
<true/>
<key>PREINTERPRET</key>
<true/>
</dict>
<key>Flags</key>
<string>-O</string>
</dict>
</array>
</dict>
AppKit/Platform/DOM/CPDOMWindowBridge.j
+5
View File
@@ -35,6 +35,11 @@ CPSharedDOMWindowBridge = nil;
var ExcludedDOMElements = [];
// Define up here so compressor knows about em.
var CPDOMWindowGetFrame,
CPDOMEventGetClickCount,
CPDOMEventStop;
@implementation CPDOMWindowBridge : CPObject
{
CPArray _orderedWindows;
Foundation/Foundation.steam
+4 -14
View File
@@ -16,24 +16,14 @@
<dict>
<key>Name</key>
<string>Debug</string>
<key>Settings</key>
<dict>
<key>PREPROCESS</key>
<true/>
<key>FLAGS</key>
<string>-DDEBUG</string>
</dict>
<key>Flags</key>
<string>-DDEBUG -g</string>
</dict>
<dict>
<key>Name</key>
<string>Release</string>
<key>Settings</key>
<dict>
<key>PREPROCESS</key>
<true/>
<key>PREINTERPRET</key>
<true/>
</dict>
<key>Flags</key>
<string>-O</string>
</dict>
</array>
</dict>
Objective-J/evaluate.js
+1 -1
View File
@@ -202,7 +202,7 @@ function fragment_evaluate_file(aFragment)
// Grab the file's fragments if it has them, or preprocess it if not.
if (!aFile.fragments)
aFile.fragments = objj_preprocess(aFile.contents, aFile.bundle, aFile);
aFile.fragments = objj_preprocess(aFile.contents, aFile.bundle, aFile, OBJJ_PREPROCESSOR_DEBUG_SYMBOLS);
var fragments = aFile.fragments,
count = fragments.length,
Objective-J/preprocess.js
+12 -6
View File
@@ -20,13 +20,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
function objj_preprocess(/*String*/ aString, /*objj_bundle*/ aBundle, /*objj_file*/ aSourceFile)
OBJJ_PREPROCESSOR_DEBUG_SYMBOLS = 1 << 0;
function objj_preprocess(/*String*/ aString, /*objj_bundle*/ aBundle, /*objj_file*/ aSourceFile, /*unsigned*/ flags)
{
try
{
OBJJ_CURRENT_BUNDLE = aBundle;
return new objj_preprocessor(aString, aSourceFile).fragments();
return new objj_preprocessor(aString, aSourceFile, flags).fragments();
}
catch (anException)
{
@@ -133,7 +135,7 @@ objj_stringBuffer.prototype.isEmpty = function()
return (this.atoms.length === 0);
}
var objj_preprocessor = function(aString, aSourceFile)
var objj_preprocessor = function(aString, aSourceFile, flags)
{
this._currentClass = "";
this._currentSuperClass = "";
@@ -142,6 +144,7 @@ var objj_preprocessor = function(aString, aSourceFile)
this._fragments = [];
this._preprocessed = new objj_stringBuffer();
this._tokens = new objj_lexer(aString);
this._flags = flags;
this.preprocess(this._tokens, this._preprocessed);
this.fragment();
@@ -736,8 +739,11 @@ objj_preprocessor.prototype.method = function(tokens)
CONCAT(buffer, "new objj_method(sel_getUid(\"");
CONCAT(buffer, selector);
CONCAT(buffer, "\"), function ");
CONCAT(buffer, "$" + this._currentClass + "__" + selector.replace(/:/g, "_"));
CONCAT(buffer, "\"), function");
if (this._flags & OBJJ_PREPROCESSOR_DEBUG_SYMBOLS)
CONCAT(buffer, " $" + this._currentClass + "__" + selector.replace(/:/g, "_"));
CONCAT(buffer, "(self, _cmd");
for(; index < count; ++index)
@@ -811,7 +817,7 @@ objj_preprocessor.prototype.preprocess = function(tokens, /*objj_stringBuffer*/
// Skip everything until the next open curly brace.
while((token = tokens.next()) && token != TOKEN_OPEN_BRACE)
CONCAT(bfufer, token);
CONCAT(buffer, token);
// Place the open curly brace as well, and the function name
CONCAT(buffer, token + "\n \"__FIREBUG_FNAME__" + functionName + "\".length;\n");
Objective-J/static.js
-36
View File
@@ -9,42 +9,6 @@ var STATIC_MAGIC_NUMBER = "@STATIC",
var STATIC_EXTENSION = "sj";
function objj_preprocess_file(aFilePath, fileContents, checkSyntax)
{
// Preprocess contents into fragments.
var fragments = objj_preprocess(fileContents, { path:"/x" }, { path:aFilePath}),
index = 0,
count = fragments.length,
preprocessed = MARKER_PATH + ';' + aFilePath.length() + ';' + aFilePath;
// Writer preprocessed fragments out.
for (; index < count; ++index)
{
var fragment = fragments[index];
if (IS_FILE(fragment))
preprocessed += (IS_LOCAL(fragment) ? MARKER_IMPORT_LOCAL : MARKER_IMPORT_STD) + ';' + GET_PATH(fragment).length + ';' + GET_PATH(fragment);
else
{
if (checkSyntax)
{
try
{
new Function(GET_CODE(fragment));
}
catch (e)
{
e.fragment = fragment;
throw e;
}
}
preprocessed += MARKER_CODE + ';' + GET_CODE(fragment).length + ';' + GET_CODE(fragment);
}
}
return preprocessed;
}
function objj_decompile(aString, bundle)
{
var stream = new objj_markedStream(aString);
Tools/objjc/build.xml
+2
View File
@@ -51,6 +51,8 @@
<copy file = "${Build.objjc}/objjc.class" tofile = "${Build.Cappuccino.Tools.Lib}/objjc.class" />
<copy file = "shrinksafe.jar" tofile = "${Build.Cappuccino.Tools.Lib}/shrinksafe.jar" />
</target>
</project>
Tools/objjc/objjc.js
+138 -47
View File
@@ -8,27 +8,86 @@ importClass(java.io.BufferedWriter);
importClass(java.io.FileWriter);
function exec(command)
{
var p = Packages.java.lang.Runtime.getRuntime().exec(command);//jsArrayToJavaArray(command));
var reader = new Packages.java.io.BufferedReader(new Packages.java.io.InputStreamReader(p.getInputStream()));
while (s = reader.readLine())
System.out.println(s);
var reader = new Packages.java.io.BufferedReader(new Packages.java.io.InputStreamReader(p.getErrorStream()));
while (s = reader.readLine())
System.out.println(s);
var result = p.waitFor();
return result;
OBJJ_PREPROCESSOR_PREPROCESS = 1 << 10;
OBJJ_PREPROCESSOR_COMPRESS = 1 << 11;
OBJJ_PREPROCESSOR_SYNTAX = 1 << 12;
function exec(/*Array*/ command, /*Boolean*/ showOutput)
{
var line = "",
output = "",
process = Packages.java.lang.Runtime.getRuntime().exec(command),//jsArrayToJavaArray(command));
reader = new Packages.java.io.BufferedReader(new Packages.java.io.InputStreamReader(process.getInputStream()));
while (line = reader.readLine())
{
if (showOutput)
System.out.println(line);
output += line + '\n';
}
reader = new Packages.java.io.BufferedReader(new Packages.java.io.InputStreamReader(process.getErrorStream()));
while (line = reader.readLine())
System.out.println(line);
try
{
if (process.waitFor() != 0)
System.err.println("exit value = " + process.exitValue());
}
catch (anException)
{
System.err.println(anException);
}
return output;
}
function preprocess(aFilePath, outFilePath, gccArgs, shouldObjjPreprocess, shouldCheckSyntax)
function compress(/*String*/ aCode, /*Object*/ flags, /*File*/ tmpFile)
{
var writer = new BufferedWriter(new FileWriter(tmpFile));
writer.write(aCode);
writer.close();
return exec(["java", "-jar", OBJJ_HOME + "/lib/shrinksafe.jar", "-c", tmpFile.getCanonicalPath()]);
}
//#define SET_CONTEXT(aFragment, aContext) aFragment.context = aContext
//#define GET_CONTEXT(aFragment) aFragment.context
//#define SET_TYPE(aFragment, aType) aFragment.type = (aType)
//#define GET_TYPE(aFragment) aFragment.type
function GET_CODE(aFragment) { return aFragment.info; }
//#define SET_CODE(aFragment, aCode) aFragment.info = (aCode)
function GET_PATH(aFragment) { return aFragment.info; }
//#define SET_PATH(aFragment, aPath) aFragment.info = aPath
//#define GET_BUNDLE(aFragment) aFragment.bundle
//#define SET_BUNDLE(aFragment, aBundle) aFragment.bundle = aBundle
//#define GET_FILE(aFragment) aFragment.file
//#define SET_FILE(aFragment, aFile) aFragment.file = aFile
function IS_FILE(aFragment) { return (aFragment.type & FRAGMENT_FILE); }
function IS_LOCAL(aFragment) { return (aFragment.type & FRAGMENT_LOCAL); }
//#define IS_IMPORT(aFragment) (aFragment.type & FRAGMENT_IMPORT)
function preprocess(aFilePath, outFilePath, gccArgs, flags)
{
print("Statically Preprocessing " + aFilePath);
var shouldObjjPreprocess = flags & OBJJ_PREPROCESSOR_PREPROCESS,
shouldCheckSyntax = flags & OBJJ_PREPROCESSOR_SYNTAX,
shouldCompress = flags & OBJJ_PREPROCESSOR_COMPRESS;
// FIXME: figure out why this doesn't work on Windows/Cygwin
//var tmpFile = java.io.File.createTempFile("OBJJC", "");
var tmpFile = new java.io.File(outFilePath+".tmp");
@@ -59,32 +118,58 @@ function preprocess(aFilePath, outFilePath, gccArgs, shouldObjjPreprocess, shoul
reader.close();
var results;
try
{
results = objj_preprocess_file(new File(aFilePath).getName(), fileContents, shouldCheckSyntax);
}
catch (e)
{
if (e.fragment)
{
var lines = e.fragment.info.split("\n"),
PAD = 3;
System.out.println(
"Syntax error in "+e.fragment.file.path+
" on preprocessed line number "+e.lineNumber+"\n"+
"\t"+lines.slice(e.lineNumber-1-PAD<0 ? 0 : e.lineNumber-1-PAD, e.lineNumber+PAD).join("\n\t"));
}
else
System.out.println("Unknown error: " + e);
System.exit(1);
}
// Preprocess contents into fragments.
var filePath = new String(new File(aFilePath).getName()),
fragments = objj_preprocess(fileContents, { path:"/x" }, {path:filePath}, flags),
index = 0,
count = fragments.length,
preprocessed = MARKER_PATH + ';' + filePath.length + ';' + filePath;
// Writer preprocessed fragments out.
for (; index < count; ++index)
{
var fragment = fragments[index];
if (IS_FILE(fragment))
preprocessed += (IS_LOCAL(fragment) ? MARKER_IMPORT_LOCAL : MARKER_IMPORT_STD) + ';' + GET_PATH(fragment).length + ';' + GET_PATH(fragment);
else
{
var code = GET_CODE(fragment);
if (shouldCheckSyntax)
{
try
{
new Function(GET_CODE(fragment));
}
catch (e)
{
var lines = e.fragment.info.split("\n"),
PAD = 3;
System.out.println(
"Syntax error in "+e.fragment.file.path+
" on preprocessed line number "+e.lineNumber+"\n"+
"\t"+lines.slice(e.lineNumber-1-PAD<0 ? 0 : e.lineNumber-1-PAD, e.lineNumber+PAD).join("\n\t"));
System.exit(1);
}
}
if (shouldCompress)
{
code = compress("function(){" + code + '}', 0, tmpFile);
code = code.substr("function(){".length, code.length - "function(){};\n\n".length);
}
preprocessed += MARKER_CODE + ';' + code.length + ';' + code;
}
}
// Write file.
var writer = new BufferedWriter(new FileWriter(outFilePath));
writer.write(results);
writer.write(preprocessed);
writer.close();
}
@@ -98,9 +183,9 @@ function main()
gccArgs = [],
shouldObjjPreprocess = true,
shouldCheckSyntax = true;
flags = OBJJ_PREPROCESSOR_PREPROCESS | OBJJ_PREPROCESSOR_SYNTAX;
for (; index < count; ++index)
{
if (args[index] == "-o")
@@ -109,24 +194,30 @@ function main()
outFilePaths.push(args[index]);
}
else if (args[index].indexOf("-D") == 0)
else if (args[index].indexOf("-D") === 0)
gccArgs.push(args[index])
else if (args[index].indexOf("-U") == 0)
else if (args[index].indexOf("-U") === 0)
gccArgs.push(args[index]);
else if (args[index].indexOf("-E") == 0)
shouldObjjPreprocess = false;
else if (args[index].indexOf("-E") === 0)
flags &= ~OBJJ_PREPROCESSOR_PREPROCESS;
else if (args[index].indexOf("-S") == 0)
shouldCheckSyntax = false;
else if (args[index].indexOf("-S") === 0)
flags &= ~OBJJ_PREPROCESSOR_SYNTAX;
else if (args[index].indexOf("-g") === 0)
flags |= OBJJ_PREPROCESSOR_DEBUG_SYMBOLS;
else if (args[index].indexOf("-O") === 0)
flags |= OBJJ_PREPROCESSOR_COMPRESS;
else
filePaths.push(args[index]);
}
for (index = 0, count = filePaths.length; index < count; ++index)
preprocess(filePaths[index], outFilePaths[index], gccArgs, shouldObjjPreprocess, shouldCheckSyntax);
preprocess(filePaths[index], outFilePaths[index], gccArgs, flags);
}
args = arguments;