Refactor send

Author: mathk

.gdbinit

@@ -94,7 +94,7 @@ end
 
 
 define ofield
-po (($arg0)((OOP)$arg1)->object)->$arg2
+pos (($arg0)((OOP)$arg1)->object)->$arg2
 end
 document ofield
 Access a field of a Smalltalk object and print its contents.

.gitignore

@@ -4,6 +4,7 @@ aclocal.m4
 config.*
 configure
 *.o
+*.d
 *.lo
 *.la
 *.star

gst-objc-ext.h

@@ -15,10 +15,10 @@ typedef union ObjcType {
   unsigned int uintType;
   long longType;
   unsigned long ulongType;
-  long long longlongType;
-  unsigned long long ulonglongType;
-  float floatTYpe;
-  double doubleType;
+  // long long longlongType;
+  // unsigned long long ulonglongType;
+  // float floatTYpe;
+  // double doubleType;
   SEL selType;
 } ObjcType;
 

gst-objc-ext.m

@@ -128,7 +128,7 @@ void gst_SkipQualifiers(const char **typestr)
 	return NULL;
 }
 
-static void UnboxValue(long long value, void *dest, const char *objctype)
+void gst_unboxValue(long long value, void *dest, const char *objctype)
 {
   gst_SkipQualifiers(&objctype);
 
@@ -215,7 +215,7 @@ static void UnboxValue(long long value, void *dest, const char *objctype)
     }
 }
 
-static ObjcType BoxValue(void *value, const char *typestr)
+ObjcType gst_boxValue(void *value, const char *typestr)
 {
   gst_SkipQualifiers(&typestr);
   ObjcType ret;
@@ -373,13 +373,14 @@ static ObjcType BoxValue(void *value, const char *typestr)
   for (i = 0; i < argc; i++)
     {
       const char *objCType = [sig getArgumentTypeAtIndex: i + 2];
-      gst_UnboxValue(args[i], unboxedArgumentsBuffer[i + 2], objCType);
+      gst_unboxValue(args[i], unboxedArgumentsBuffer[i + 2], objCType);
       unboxedArguments[i + 2] = unboxedArgumentsBuffer[i + 2];
     }
 
   char msgSendRet[[sig methodReturnLength]];
   ffi_call(&cif, methodIMP, &msgSendRet, unboxedArguments);
-	
+  
+  return gst_boxValue(msgSendRet, [sig methodReturnType]);
 }
 
 void

gst-objc.m

@@ -25,13 +25,6 @@
   proxy->defineCFunc ("objc_retain", gst_retain);
   proxy->defineCFunc ("objc_release", gst_release);
   pool = [[NSAutoreleasePool alloc] init];
-
-  [NSApplication sharedApplication];
-  NSWindow* wnd = [[NSWindow alloc] initWithContentRect: NSMakeRect(0.0, 0.0, 100.0, 100.0)
-					      styleMask: 15
-						backing: 2
-						  defer: 1];
-  [wnd setTitle: @"Test it"];
   NSLog (@"Load complete");
 }
 

gst-objc/ObjcObject.st

@@ -65,11 +65,11 @@ Object subclass: ObjcObject [
 					   ifFalse: [buffer at: i - 1 put: each type: CLongType valueType]
 			]
 	]."
-	return := ObjcRuntime objcMsgSendClass: nil
-	    receiver: self objcPtr
-	    sel: selector
+	return := ObjcRuntime objcMsgSend: self objcPtr
+	    sel: (ObjcRuntime selRegisterName: selector)
 	    argc: arguments size
-	    argv: arguments.
+	    argv: arguments
+	    super: nil.
 "	buffer free."
 	^return = objcPtr
             ifFalse: [self class basicFromPtr: return]

gst-objc/ObjcRuntime.st

@@ -1,3 +1,7 @@
+CStruct subclass: ObjcType [
+    <declaration: #((#value #long))>
+]
+
 Object subclass: ObjcRuntime [
 
     ObjcRuntime class [
@@ -42,9 +46,9 @@ Object subclass: ObjcRuntime [
 	    <cCall: 'class_getName' returning: #string args: #( #cObject )>
 	]
 
-	objcMsgSendClass: class receiver: receiver sel: selector argc: aInt argv: args [
+	objcMsgSend: receiver sel: selector argc: aInt argv: args super: class [
 	    <category: 'instance'>
-	    <cCall: 'objc_sendMsg' returning: #cObject args: #( #cObject #cObject #string #uint #unknown )>
+	    <cCall: 'objc_sendMsg' returning: #{ObjcType} args: #( #cObject #cObject #uint #smalltalk #cObject )>
 	]
 
 	retain: receiver [