Restructure some includes.

programming-nu · Apr 25, 2016 · 9806965 · 9806965
1 parent f01d0bb
commit 9806965
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 10 deletions.
diff --git a/objc/NSNumber+Nu.m b/objc/NSNumber+Nu.m
@@ -9,6 +9,7 @@
 #import "NSNumber+Nu.h"
 #import "NuInternals.h"
 #import "NuBlock.h"
+#import "NuCell.h"
 
 @implementation NSNumber(Nu)
 

diff --git a/objc/NSObject+Nu.m b/objc/NSObject+Nu.m
@@ -11,6 +11,8 @@
 #import "NSDictionary+Nu.h"
 #import "NuEnumerable.h"
 #import "NuMethod.h"
+#import "NuClass.h"
+#import "NuCell.h"
 
 @protocol NuCanSetAction
 - (void) setAction:(SEL) action;

diff --git a/objc/NSString+Nu.m b/objc/NSString+Nu.m
@@ -10,6 +10,7 @@
 #import "NuInternals.h"
 #import "NSDictionary+Nu.h"
 #import "NSData+Nu.h"
+#import "NuCell.h"
 
 @interface NuStringEnumerator : NSEnumerator
 {

diff --git a/objc/Nu.m b/objc/Nu.m
@@ -71,6 +71,7 @@
 #import "NuException.h"
 #import "NuBridge.h"
 #import "NuBridgedFunction.h"
+#import "NuClass.h"
 
 #ifdef LINUX
 id loadNuLibraryFile(NSString *nuFileName, id parser, id context, id symbolTable);

diff --git a/objc/NuBlock.m b/objc/NuBlock.m
@@ -11,6 +11,7 @@
 #import "NuSuper.h"
 #import "NSDictionary+Nu.h"
 #import "NuCell.h"
+#import "NuClass.h"
 
 @interface NuBlock ()
 {

diff --git a/objc/NuBridge.h b/objc/NuBridge.h
@@ -23,13 +23,4 @@
 #endif
 
 
-ffi_type *ffi_type_for_objc_type(const char *typeString);
-
-
-#import "NuMethod.h"
-
-#pragma mark -
-#pragma mark Interacting with the Objective-C Runtime
-
-#import "NuClass.h"
-
+ffi_type *ffi_type_for_objc_type(const char *typeString);
diff --git a/objc/NuBridge.m b/objc/NuBridge.m
@@ -43,6 +43,9 @@
 #import "NuHandler.h"
 #import "NuReference.h"
 #import "NuPointer.h"
+#import "NuClass.h"
+#import "NSMethodSignature+Nu.h"
+#import "NSDictionary+Nu.h"
 
 /*
  * types:

diff --git a/objc/NuEnumerable.m b/objc/NuEnumerable.m
@@ -9,6 +9,7 @@
 #import "NuEnumerable.h"
 #import "NuInternals.h"
 #import "NuCell.h"
+#import "NuBlock.h"
 
 #pragma mark - NuEnumerable.m
 

diff --git a/objc/NuMarkupOperator.m b/objc/NuMarkupOperator.m
@@ -9,6 +9,7 @@
 #import "Nu.h"
 #import "NuInternals.h"
 #import "NuMarkupOperator.h"
+#import "NuCell.h"
 
 @implementation NuMarkupOperator
 

diff --git a/objc/NuOperators.m b/objc/NuOperators.m
@@ -16,6 +16,7 @@
 #import "NSArray+Nu.h"
 #import "NuBridge.h"
 #import "NuBridgedFunction.h"
+#import "NuClass.h"
 
 #if TARGET_OS_IPHONE
 #import <UIKit/UIKit.h>

diff --git a/objc/NuSymbol.m b/objc/NuSymbol.m
@@ -12,6 +12,7 @@
 #import "NuBridge.h"
 #import "NuBridgedFunction.h"
 #import "NuBridgedConstant.h"
+#import "NuClass.h"
 
 #pragma mark - NuSymbol.m