Merge pull request #4811 from jacob-carlborg/objc_fixup

Minor follow up fix for D/Objective-C
dlang · Jul 12, 2015 · b30fc1b · b30fc1b
2 parents 941808d + d667ec0
commit b30fc1b
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 40 deletions.
diff --git a/src/magicport.json b/src/magicport.json
@@ -111,41 +111,41 @@
             ]
         },
         {
-          "module" : "objc",
-          "package" : "",
-          "imports" : [
-            "arraytypes",
-            "cond",
-            "dclass",
-            "dmangle",
-            "dmodule",
-            "dscope",
-            "dstruct",
-            "expression",
-            "func",
-            "globals",
-            "id",
-            "identifier",
-            "mtype",
-            "root.outbuffer",
-            "root.stringtable"
-          ],
-          "members" : [
-            "struct ObjcSelector",
-            "struct Objc_ClassDeclaration",
-            "struct Objc_FuncDeclaration",
-            "function objc_ClassDeclaration_semantic_PASSinit_LINKobjc",
-            "function objc_InterfaceDeclaration_semantic_objcExtern",
-            "function objc_FuncDeclaration_semantic_setSelector",
-            "function objc_isUdaSelector",
-            "function objc_FuncDeclaration_semantic_validateSelector",
-            "function objc_FuncDeclaration_semantic_checkLinkage",
-            "function objc_tryMain_dObjc",
-            "function objc_tryMain_init"
-          ],
-          "extra" : [
-            "extern(C++) void objc_initSymbols();"
-          ]
+            "module" : "objc",
+            "package" : "",
+            "imports" : [
+                "arraytypes",
+                "cond",
+                "dclass",
+                "dmangle",
+                "dmodule",
+                "dscope",
+                "dstruct",
+                "expression",
+                "func",
+                "globals",
+                "id",
+                "identifier",
+                "mtype",
+                "root.outbuffer",
+                "root.stringtable"
+            ],
+            "members" : [
+                "struct ObjcSelector",
+                "struct Objc_ClassDeclaration",
+                "struct Objc_FuncDeclaration",
+                "function objc_ClassDeclaration_semantic_PASSinit_LINKobjc",
+                "function objc_InterfaceDeclaration_semantic_objcExtern",
+                "function objc_FuncDeclaration_semantic_setSelector",
+                "function objc_isUdaSelector",
+                "function objc_FuncDeclaration_semantic_validateSelector",
+                "function objc_FuncDeclaration_semantic_checkLinkage",
+                "function objc_tryMain_dObjc",
+                "function objc_tryMain_init"
+            ],
+            "extra" : [
+                "extern(C++) void objc_initSymbols();"
+            ]
         },
         {
             "module" : "dclass",

diff --git a/src/objc.h b/src/objc.h
@@ -20,6 +20,8 @@ class FuncDeclaration;
 class ClassDeclaration;
 class InterfaceDeclaration;
 class ObjcSelector;
+struct Scope;
+class StructDeclaration;
 
 class ObjcSelector
 {

diff --git a/src/objc_stubs.c b/src/objc_stubs.c
@@ -9,17 +9,16 @@
  * https://github.com/D-Programming-Language/dmd/blob/master/src/objc_stubs.c
  */
 
+#include "objc.h"
 #include "arraytypes.h"
-#include "class.c"
+#include "aggregate.h"
 #include "mars.h"
-#include "objc.h"
 #include "outbuffer.h"
 #include "parse.h"
+#include "scope.h"
 
-class ClassDeclaration;
 class FuncDeclaration;
 class Identifier;
-class InterfaceDeclaration;
 
 // MARK: ObjcSelector
 
@@ -74,7 +73,7 @@ bool Objc_ClassDeclaration::isInterface()
 
 Objc_FuncDeclaration::Objc_FuncDeclaration()
 {
-    this->fdecl = fdecl;
+    this->fdecl = NULL;
     selector = NULL;
 }