mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-11-20 13:39:22 +00:00
Merge branch '0.7b-integration' into 0.7b
This commit is contained in:
commit
e395d6e0e0
4 files changed
+17
-3
No files matched your search
+1
-1
@@ -25,7 +25,7 @@ ObjectiveJ::BundleTask.new(:AppKit) do |t|
|
||||
t.resources = FileList['Resources/*']
|
||||
t.license = ObjectiveJ::License::LGPL_v2_1
|
||||
t.build_path = $BUILD_PATH
|
||||
t.flag = '-DDEBUG' if $CONFIGURATION == 'Debug'
|
||||
t.flag = '-DDEBUG -g' if $CONFIGURATION == 'Debug'
|
||||
t.flag = '-O' if $CONFIGURATION == 'Release'
|
||||
t.platforms = [ObjectiveJ::Platform::Browser, ObjectiveJ::Platform::Rhino]
|
||||
t.type = ObjectiveJ::Bundle::Type::Framework
|
||||
|
||||
@@ -46,6 +46,8 @@ var _CPKeyedArchiverNullString = "$
|
||||
var _CPKeyedUnarchiverArrayClass = Nil,
|
||||
_CPKeyedUnarchiverStringClass = Nil,
|
||||
_CPKeyedUnarchiverDictionaryClass = Nil,
|
||||
_CPKeyedUnarchiverNumberClass = Nil,
|
||||
_CPKeyedUnarchiverDataClass = Nil,
|
||||
_CPKeyedUnarchiverArchiverValueClass = Nil;
|
||||
|
||||
/*
|
||||
@@ -117,6 +119,8 @@ var _CPKeyedUnarchiverArrayClass = Ni
|
||||
_CPKeyedUnarchiverArrayClass = [CPArray class];
|
||||
_CPKeyedUnarchiverStringClass = [CPString class];
|
||||
_CPKeyedUnarchiverDictionaryClass = [CPDictionary class];
|
||||
_CPKeyedUnarchiverNumberClass = [CPNumber class];
|
||||
_CPKeyedUnarchiverDataClass = [CPData class];
|
||||
_CPKeyedUnarchiverArchiverValueClass = [_CPKeyedArchiverValue class];
|
||||
}
|
||||
|
||||
@@ -298,7 +302,7 @@ var _CPKeyedUnarchiverArrayClass = Ni
|
||||
if ([object isKindOfClass:_CPKeyedUnarchiverDictionaryClass])
|
||||
return _CPKeyedUnarchiverDecodeObjectAtIndex(self, [object objectForKey:_CPKeyedArchiverUIDKey]);
|
||||
|
||||
else if ([object isKindOfClass:[CPNumber class]] || [object isKindOfClass:[CPData class]])
|
||||
else if ([object isKindOfClass:_CPKeyedUnarchiverNumberClass] || [object isKindOfClass:_CPKeyedUnarchiverDataClass])
|
||||
return object;
|
||||
|
||||
else if ([object isKindOfClass:_CPKeyedUnarchiverArrayClass])
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@ ObjectiveJ::BundleTask.new(:Foundation) do |t|
|
||||
t.resources = FileList['Resources/*'].to_a
|
||||
t.license = ObjectiveJ::License::LGPL_v2_1
|
||||
t.build_path = $BUILD_PATH
|
||||
t.flag = '-DDEBUG' if $CONFIGURATION == 'Debug'
|
||||
t.flag = '-DDEBUG -g' if $CONFIGURATION == 'Debug'
|
||||
t.flag = '-O' if $CONFIGURATION == 'Release'
|
||||
t.type = ObjectiveJ::Bundle::Type::Framework
|
||||
end
|
||||
|
||||
@@ -470,6 +470,16 @@ function objj_msgSend(/*id*/ aReceiver, /*SEL*/ aSelector)
|
||||
|
||||
CLASS_GET_METHOD_IMPLEMENTATION(var implementation, aReceiver.isa, aSelector);
|
||||
|
||||
switch(arguments.length)
|
||||
{
|
||||
case 2:
|
||||
return implementation(aReceiver, aSelector);
|
||||
case 3:
|
||||
return implementation(aReceiver, aSelector, arguments[2]);
|
||||
case 4:
|
||||
return implementation(aReceiver, aSelector, arguments[2], arguments[3]);
|
||||
}
|
||||
|
||||
return implementation.apply(aReceiver, arguments);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user