Split a foundation mod from appkit.

examples/hello_world.rs

@@ -1,11 +1,11 @@
 extern crate cocoa;
 
-use cocoa::base::{NSUInteger, selector, nil, YES, NO};
-use cocoa::appkit::{NSApp, NSRect, NSPoint, NSSize,
-					NSAutoreleasePool, NSProcessInfo,
+use cocoa::base::{selector, nil, YES, NO};
+use cocoa::foundation::{NSUInteger, NSRect, NSPoint, NSSize,
+						NSAutoreleasePool, NSProcessInfo, NSString};
+use cocoa::appkit::{NSApp,
 					NSApplication, NSApplicationActivationPolicyRegular,
 					NSWindow, NSTitledWindowMask, NSBackingStoreBuffered,
-					NSString,
 					NSMenu, NSMenuItem};
 
 fn main() {

src/appkit.rs

@@ -9,8 +9,9 @@
 
 #![allow(non_upper_case_globals)]
 
-use base::{id, class};
-use base::{BOOL, SEL, NSInteger, NSUInteger};
+use base::{id, class, BOOL, SEL};
+use foundation::{NSInteger, NSUInteger, NSTimeInterval,
+                 NSPoint, NSSize, NSRect, NSRectEdge};
 use libc;
 
 pub use self::NSApplicationActivationPolicy::*;
@@ -20,8 +21,6 @@ pub use self::NSOpenGLPixelFormatAttribute::*;
 pub use self::NSOpenGLPFAOpenGLProfiles::*;
 pub use self::NSEventType::*;
 
-use std::ffi::CString;
-
 #[cfg(target_pointer_width = "32")]
 pub type CGFloat = f32;
 #[cfg(target_pointer_width = "64")]
@@ -37,71 +36,9 @@ pub struct CGPoint {
     pub y: CGFloat,
 }
 
-#[repr(C)]
-pub struct NSPoint {
-    pub x: f64,
-    pub y: f64,
-}
-
-impl NSPoint {
-    #[inline]
-    pub fn new(x: f64, y: f64) -> NSPoint {
-        NSPoint {
-            x: x,
-            y: y,
-        }
-    }
-}
-
-#[repr(C)]
-pub struct NSSize {
-    pub width: f64,
-    pub height: f64,
-}
-
-impl NSSize {
-    #[inline]
-    pub fn new(width: f64, height: f64) -> NSSize {
-        NSSize {
-            width: width,
-            height: height,
-        }
-    }
-}
-
-#[repr(C)]
-pub struct NSRect {
-    pub origin: NSPoint,
-    pub size: NSSize,
-}
-
-impl NSRect {
-    #[inline]
-    pub fn new(origin: NSPoint, size: NSSize) -> NSRect {
-        NSRect {
-            origin: origin,
-            size: size
-        }
-    }
-}
-
-// Same as CGRectEdge
-#[repr(u32)]
-pub enum NSRectEdge {
-    NSRectMinXEdge,
-    NSRectMinYEdge,
-    NSRectMaxXEdge,
-    NSRectMaxYEdge,
-}
-
 #[link(name = "AppKit", kind = "framework")]
 extern {}
 
-#[link(name = "Foundation", kind = "framework")]
-extern {
-    pub static NSDefaultRunLoopMode: id;
-}
-
 pub unsafe fn NSApp() -> id {
     msg_send![class("NSApplication"), sharedApplication]
 }
@@ -252,41 +189,6 @@ pub enum NSOpenGLContextParameter {
 
 pub static NSMainMenuWindowLevel: libc::int32_t = 24;
 
-pub trait NSAutoreleasePool {
-    unsafe fn new(_: Self) -> id {
-        msg_send![class("NSAutoreleasePool"), new]
-    }
-
-    unsafe fn autorelease(self) -> Self;
-    unsafe fn drain(self);
-}
-
-impl NSAutoreleasePool for id {
-    unsafe fn autorelease(self) -> id {
-        msg_send![self, autorelease]
-    }
-
-    unsafe fn drain(self) {
-        msg_send![self, drain]
-    }
-}
-
-pub trait NSProcessInfo {
-    unsafe fn processInfo(_: Self) -> id {
-        msg_send![class("NSProcessInfo"), processInfo]
-    }
-
-    unsafe fn processName(self) -> id;
-}
-
-impl NSProcessInfo for id {
-    unsafe fn processName(self) -> id {
-        msg_send![self, processName]
-    }
-}
-
-pub type NSTimeInterval = libc::c_double;
-
 pub trait NSApplication {
     unsafe fn sharedApplication(_: Self) -> id {
         msg_send![class("NSApplication"), sharedApplication]
@@ -1219,36 +1121,6 @@ impl NSWindow for id {
     // TODO: Constraint-Based Layouts
 }
 
-pub trait NSString {
-    unsafe fn alloc(_: Self) -> id {
-        msg_send![class("NSString"), alloc]
-    }
-
-    unsafe fn initWithUTF8String_(self, c_string: *const i8) -> id;
-    unsafe fn stringByAppendingString_(self, other: id) -> id;
-    unsafe fn init_str(self, string: &str) -> Self;
-    unsafe fn UTF8String(self) -> *const libc::c_char;
-}
-
-impl NSString for id {
-    unsafe fn initWithUTF8String_(self, c_string: *const i8) -> id {
-        msg_send![self, initWithUTF8String:c_string as id]
-    }
-
-    unsafe fn stringByAppendingString_(self, other: id) -> id {
-        msg_send![self, stringByAppendingString:other]
-    }
-
-    unsafe fn init_str(self, string: &str) -> id {
-        let cstring = CString::new(string).unwrap();
-        self.initWithUTF8String_(cstring.as_ptr())
-    }
-
-    unsafe fn UTF8String(self) -> *const libc::c_char {
-        msg_send![self, UTF8String]
-    }
-}
-
 pub trait NSView {
     unsafe fn alloc(_: Self) -> id {
         msg_send![class("NSView"), alloc]
@@ -1447,20 +1319,6 @@ impl NSOpenGLContext for id {
     }
 }
 
-pub trait NSDate {
-    unsafe fn distantPast(_: Self) -> id {
-        msg_send![class("NSDate"), distantPast]
-    }
-
-    unsafe fn distantFuture(_: Self) -> id {
-        msg_send![class("NSDate"), distantFuture]
-    }
-}
-
-impl NSDate for id {
-
-}
-
 bitflags! {
     flags NSEventSwipeTrackingOptions: NSUInteger {
         const NSEventSwipeTrackingLockDirection         = 0x1 << 0,

src/base.rs

@@ -7,7 +7,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use libc;
 use objc::runtime;
 use std::mem;
 
@@ -18,16 +17,6 @@ pub type Class = *mut runtime::Class;
 pub type id = *mut runtime::Object;
 pub type SEL = runtime::Sel;
 
-#[cfg(target_pointer_width = "32")]
-pub type NSInteger = libc::c_int;
-#[cfg(target_pointer_width = "32")]
-pub type NSUInteger = libc::c_uint;
-
-#[cfg(target_pointer_width = "64")]
-pub type NSInteger = libc::c_long;
-#[cfg(target_pointer_width = "64")]
-pub type NSUInteger = libc::c_ulong;
-
 #[allow(non_upper_case_globals)]
 pub const nil: id = 0 as id;
 #[allow(non_upper_case_globals)]

src/foundation.rs

@@ -0,0 +1,163 @@
+// Copyright 2013 The Servo Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use base::{id, class};
+use libc;
+use std::ffi::CString;
+
+#[cfg(target_pointer_width = "32")]
+pub type NSInteger = libc::c_int;
+#[cfg(target_pointer_width = "32")]
+pub type NSUInteger = libc::c_uint;
+
+#[cfg(target_pointer_width = "64")]
+pub type NSInteger = libc::c_long;
+#[cfg(target_pointer_width = "64")]
+pub type NSUInteger = libc::c_ulong;
+
+#[repr(C)]
+pub struct NSPoint {
+    pub x: f64,
+    pub y: f64,
+}
+
+impl NSPoint {
+    #[inline]
+    pub fn new(x: f64, y: f64) -> NSPoint {
+        NSPoint {
+            x: x,
+            y: y,
+        }
+    }
+}
+
+#[repr(C)]
+pub struct NSSize {
+    pub width: f64,
+    pub height: f64,
+}
+
+impl NSSize {
+    #[inline]
+    pub fn new(width: f64, height: f64) -> NSSize {
+        NSSize {
+            width: width,
+            height: height,
+        }
+    }
+}
+
+#[repr(C)]
+pub struct NSRect {
+    pub origin: NSPoint,
+    pub size: NSSize,
+}
+
+impl NSRect {
+    #[inline]
+    pub fn new(origin: NSPoint, size: NSSize) -> NSRect {
+        NSRect {
+            origin: origin,
+            size: size
+        }
+    }
+}
+
+// Same as CGRectEdge
+#[repr(u32)]
+pub enum NSRectEdge {
+    NSRectMinXEdge,
+    NSRectMinYEdge,
+    NSRectMaxXEdge,
+    NSRectMaxYEdge,
+}
+
+#[link(name = "Foundation", kind = "framework")]
+extern {
+    pub static NSDefaultRunLoopMode: id;
+}
+
+pub trait NSAutoreleasePool {
+    unsafe fn new(_: Self) -> id {
+        msg_send![class("NSAutoreleasePool"), new]
+    }
+
+    unsafe fn autorelease(self) -> Self;
+    unsafe fn drain(self);
+}
+
+impl NSAutoreleasePool for id {
+    unsafe fn autorelease(self) -> id {
+        msg_send![self, autorelease]
+    }
+
+    unsafe fn drain(self) {
+        msg_send![self, drain]
+    }
+}
+
+pub trait NSProcessInfo {
+    unsafe fn processInfo(_: Self) -> id {
+        msg_send![class("NSProcessInfo"), processInfo]
+    }
+
+    unsafe fn processName(self) -> id;
+}
+
+impl NSProcessInfo for id {
+    unsafe fn processName(self) -> id {
+        msg_send![self, processName]
+    }
+}
+
+pub type NSTimeInterval = libc::c_double;
+
+pub trait NSString {
+    unsafe fn alloc(_: Self) -> id {
+        msg_send![class("NSString"), alloc]
+    }
+
+    unsafe fn initWithUTF8String_(self, c_string: *const i8) -> id;
+    unsafe fn stringByAppendingString_(self, other: id) -> id;
+    unsafe fn init_str(self, string: &str) -> Self;
+    unsafe fn UTF8String(self) -> *const libc::c_char;
+}
+
+impl NSString for id {
+    unsafe fn initWithUTF8String_(self, c_string: *const i8) -> id {
+        msg_send![self, initWithUTF8String:c_string as id]
+    }
+
+    unsafe fn stringByAppendingString_(self, other: id) -> id {
+        msg_send![self, stringByAppendingString:other]
+    }
+
+    unsafe fn init_str(self, string: &str) -> id {
+        let cstring = CString::new(string).unwrap();
+        self.initWithUTF8String_(cstring.as_ptr())
+    }
+
+    unsafe fn UTF8String(self) -> *const libc::c_char {
+        msg_send![self, UTF8String]
+    }
+}
+
+pub trait NSDate {
+    unsafe fn distantPast(_: Self) -> id {
+        msg_send![class("NSDate"), distantPast]
+    }
+
+    unsafe fn distantFuture(_: Self) -> id {
+        msg_send![class("NSDate"), distantFuture]
+    }
+}
+
+impl NSDate for id {
+
+}

src/lib.rs

@@ -24,3 +24,5 @@ extern crate objc;
 pub mod appkit;
 #[cfg(target_os="macos")]
 pub mod base;
+#[cfg(target_os="macos")]
+pub mod foundation;