VM: Refactor os-* to Factor style

[factor.git] / vm / os-macosx.mm

diff --git a/vm/os-macosx.mm b/vm/os-macosx.mm
index c18c6aa1ea6673d8a3e2bdfe4cbb552bd114d947..be7afcb5521ce6abcf0ee6b24c2895747a301eef 100644 (file)
--- a/vm/os-macosx.mm
+++ b/vm/os-macosx.mm
@@ -5,88 +5,78 @@
 
 #include "master.hpp"
 
-namespace factor
-{
+namespace factor {
 
-void factor_vm::c_to_factor_toplevel(cell quot)
-{
-       c_to_factor(quot);
-}
+void factor_vm::c_to_factor_toplevel(cell quot) { c_to_factor(quot); }
 
 // Darwin 9 is 10.5, Darwin 10 is 10.6
 // http://en.wikipedia.org/wiki/Darwin_(operating_system)#Release_history
-void early_init(void)
-{
-       struct utsname u;
-       int n;
-       uname(&u);
-       sscanf(u.release,"%d", &n);
-       if(n < 9) {
-               std::cout << "Factor requires Mac OS X 10.5 or later.\n";
-               exit(1);
-       }
+void early_init(void) {
+  struct utsname u;
+  int n;
+  uname(&u);
+  sscanf(u.release, "%d", &n);
+  if (n < 9) {
+    std::cout << "Factor requires Mac OS X 10.5 or later.\n";
+    exit(1);
+  }
 }
 
-const char *vm_executable_path(void)
-{
-       return [[[NSBundle mainBundle] executablePath] UTF8String];
+const char* vm_executable_path(void) {
+  return [[[NSBundle mainBundle] executablePath] UTF8String];
 }
 
-const char *default_image_path(void)
-{
-       NSBundle *bundle = [NSBundle mainBundle];
-       NSString *path = [bundle bundlePath];
-       NSString *executable = [[bundle executablePath] lastPathComponent];
-       NSString *image = [executable stringByAppendingString:@".image"];
+const char* default_image_path(void) {
+  NSBundle* bundle = [NSBundle mainBundle];
+  NSString* path = [bundle bundlePath];
+  NSString* executable = [[bundle executablePath] lastPathComponent];
+  NSString* image = [executable stringByAppendingString:@".image"];
 
-       NSString *returnVal;
+  NSString* returnVal;
 
-       if([path hasSuffix:@".app"] || [path hasSuffix:@".app/"])
-       {
-               NSFileManager *mgr = [NSFileManager defaultManager];
+  if ([path hasSuffix:@".app"] || [path hasSuffix:@".app/"]) {
+    NSFileManager* mgr = [NSFileManager defaultManager];
 
-               NSString *imageInBundle = [[path stringByAppendingPathComponent:@"Contents/Resources"] stringByAppendingPathComponent:image];
-               NSString *imageAlongBundle = [[path stringByDeletingLastPathComponent] stringByAppendingPathComponent:image];
+    NSString* imageInBundle =
+        [[path stringByAppendingPathComponent:@"Contents/Resources"]
+            stringByAppendingPathComponent:image];
+    NSString* imageAlongBundle = [[path stringByDeletingLastPathComponent]
+        stringByAppendingPathComponent:image];
 
-               returnVal = ([mgr fileExistsAtPath:imageInBundle]
-                       ? imageInBundle : imageAlongBundle);
-       }
-       else
-               returnVal = [path stringByAppendingPathComponent:image];
+    returnVal = ([mgr fileExistsAtPath:imageInBundle] ? imageInBundle
+                                                      : imageAlongBundle);
+  } else
+    returnVal = [path stringByAppendingPathComponent:image];
 
-       return [returnVal UTF8String];
+  return [returnVal UTF8String];
 }
 
-void factor_vm::init_signals(void)
-{
-       unix_init_signals();
-       mach_initialize();
+void factor_vm::init_signals(void) {
+  unix_init_signals();
+  mach_initialize();
 }
 
 /* Amateurs at Apple: implement this function, properly! */
-Protocol *objc_getProtocol(char *name)
-{
-       if(strcmp(name,"NSTextInput") == 0)
-               return @protocol(NSTextInput);
-       else
-               return nil;
+Protocol* objc_getProtocol(char* name) {
+  if (strcmp(name, "NSTextInput") == 0)
+    return @protocol(NSTextInput);
+  else
+    return nil;
 }
 
-u64 nano_count()
-{
-       u64 time = mach_absolute_time();
-
-       static u64 scaling_factor = 0;
-       if(!scaling_factor)
-       {
-               mach_timebase_info_data_t info;
-               kern_return_t ret = mach_timebase_info(&info);
-               if(ret != 0)
-                       fatal_error("mach_timebase_info failed",ret);
-               scaling_factor = info.numer/info.denom;
-       }
-
-       return time * scaling_factor;
+u64 nano_count() {
+  u64 time = mach_absolute_time();
+
+  static u64 scaling_factor = 0;
+  if (!scaling_factor) {
+    mach_timebase_info_data_t info;
+    kern_return_t ret = mach_timebase_info(&info);
+    if (ret != 0)
+      fatal_error("mach_timebase_info failed", ret);
+    scaling_factor = info.numer / info.denom;
+  }
+
+  return time * scaling_factor;
 }
 
 }