[hoc-cvs] [hoc commit] r322 - in trunk/hoc/Bindings: . AdditionalCode/Foundation

[<cod...@go...>]

Author: wol...@gm...
Date: Mon Sep 29 13:37:28 2008
New Revision: 322

Removed:
    trunk/hoc/Bindings/AdditionalCode/Foundation/NSObjCRuntime.hs
Modified:
    trunk/hoc/Bindings/binding-script.txt
    trunk/hoc/Bindings/just-generate.sh
    trunk/hoc/Bindings/make-bindings-macos.sh

Log:
cleanup in binding-script and related things


Modified: trunk/hoc/Bindings/binding-script.txt
==============================================================================
--- trunk/hoc/Bindings/binding-script.txt	(original)
+++ trunk/hoc/Bindings/binding-script.txt	Mon Sep 29 13:37:28 2008
@@ -1,7 +1,7 @@
-hidePrelude init error minimum maximum null concat words print length  
compare;
  rename data data';
  rename type type';
  rename class class';
+-- hidePrelude init error minimum maximum null concat words print length  
compare;

  covariant stringWithCString stringWithCStringLength;
  covariant stringWithContentsOfFile stringWithContentsOfURL;
@@ -26,21 +26,26 @@
  rename drawKnob: drawKnob_;
  rename titleWidth: titleWidth_;

-class NSDistributedNotificationCenter {
-    hide addObserver:selector:name:object: postNotificationName:object:
-         postNotificationName:object:userInfo:  
removeObserver:name:object: ;
-}
-
+    -- resolve type conflicts between NSUserDefaults & NSDictionary
+    -- NSUserDefaults use NSString keys
  class NSUserDefaults {
      - (id) objectForKey: (id) key;
      - (void) removeObjectForKey: (id) key;
      - (void) setObject: (id) object forKey: (id) key;
  }

+    -- NSStatusItem has a CGFloat length
  class NSStatusItem {
      hide setLength: length;
  }

+
+class NSDistributedNotificationCenter {
+    hide addObserver:selector:name:object: postNotificationName:object:
+         postNotificationName:object:userInfo:  
removeObserver:name:object: ;
+}
+
+
  class NSToolbar {
      - (id) initWithIdentifier: (id) ident;
  }
@@ -57,23 +62,20 @@
      - (void) setContentView: (NSView*) view;
  }

-
  type NSPoint Foundation.NSGeometry;
  type NSSize Foundation.NSGeometry;
  type NSRect Foundation.NSGeometry;
  type NSRange Foundation.NSRange;

-type NSInteger Foundation.NSObjCRuntime;
-type NSUInteger Foundation.NSObjCRuntime;
-
  -- GNUstep specifics:
+{-
  rename rawMimeData: rawMimeData_;
  rename setContent:type: setContentAndType;
  rename setContent:type:name: setContentAndTypeAndName;
  rename removePort:forName: removePort_forName;

-hide performSelector:withObject:afterDelay:;
-hide performSelector:withObject:afterDelay:inModes:;
+-- hide performSelector:withObject:afterDelay:;
+-- hide performSelector:withObject:afterDelay:inModes:;

  class GSXMLNamespace {
      rename next nextNamespace;
@@ -99,3 +101,4 @@

  hideEnums _NSGNUstepStringEncoding NSGNUstepStringEncoding;

+-}

Modified: trunk/hoc/Bindings/just-generate.sh
==============================================================================
--- trunk/hoc/Bindings/just-generate.sh	(original)
+++ trunk/hoc/Bindings/just-generate.sh	Mon Sep 29 13:37:28 2008
@@ -5,19 +5,20 @@

  ARGUMENTS=$*

-IFGEN="../../InterfaceGenerator2/hoc-ifgen"
+IFGEN=hoc-ifgen #"../../InterfaceGenerator2/hoc-ifgen"

  mkdir -p Generated
  cd Generated

-$IFGEN Foundation -f -b ../binding-script.txt -a ../AdditionalCode/
+OPTS=-q
+$IFGEN Foundation -f -b ../binding-script.txt -a ../AdditionalCode/ $OPTS
  build Foundation
-$IFGEN QuartzCore -f -b ../binding-script.txt -a ../AdditionalCode/ -d  
Foundation
+$IFGEN QuartzCore -f -b ../binding-script.txt -a ../AdditionalCode/ -d  
Foundation $OPTS
  build QuartzCore
-$IFGEN AppKit -f -b ../binding-script.txt -a ../AdditionalCode/ -d  
Foundation -d QuartzCore
+$IFGEN AppKit -f -b ../binding-script.txt -a ../AdditionalCode/ -d  
Foundation -d QuartzCore $OPTS
  build AppKit
  $IFGEN CoreData -f -b ../binding-script.txt -a ../AdditionalCode/ -d  
Foundation \
-    -d AppKit -d QuartzCore     # fake dependencies
+    -d AppKit -d QuartzCore $OPTS    # fake dependencies
  build CoreData
-$IFGEN Cocoa -u -d Foundation -d QuartzCore -d AppKit -d CoreData
+$IFGEN Cocoa -u -d Foundation -d QuartzCore -d AppKit -d CoreData $OPTS
  build Cocoa

Modified: trunk/hoc/Bindings/make-bindings-macos.sh
==============================================================================
--- trunk/hoc/Bindings/make-bindings-macos.sh	(original)
+++ trunk/hoc/Bindings/make-bindings-macos.sh	Mon Sep 29 13:37:28 2008
@@ -8,19 +8,21 @@
  }

  ARGUMENTS=$*
+OPTS=

  set -e
  mkdir -p Generated
  cd Generated

-hoc-ifgen Foundation -f -b ../binding-script.txt -a ../AdditionalCode/
+
+hoc-ifgen Foundation -f -b ../binding-script.txt -a ../AdditionalCode/  
$OPTS
  build HOC-Foundation
-hoc-ifgen QuartzCore -f -b ../binding-script.txt -a ../AdditionalCode/ -d  
Foundation
+hoc-ifgen QuartzCore -f -b ../binding-script.txt -a ../AdditionalCode/ -d  
Foundation $OPTS
  build HOC-QuartzCore
-hoc-ifgen AppKit -f -b ../binding-script.txt -a ../AdditionalCode/ -d  
Foundation -d QuartzCore
+hoc-ifgen AppKit -f -b ../binding-script.txt -a ../AdditionalCode/ -d  
Foundation -d QuartzCore $OPTS
  build HOC-AppKit
  hoc-ifgen CoreData -f -b ../binding-script.txt -a ../AdditionalCode/ -d  
Foundation \
-    -d AppKit -d QuartzCore     # fake dependencies
+    -d AppKit -d QuartzCore  $OPTS    # fake dependencies
  build HOC-CoreData
-hoc-ifgen Cocoa -u -d Foundation -d QuartzCore -d AppKit -d CoreData
+hoc-ifgen Cocoa -u -d Foundation -d QuartzCore -d AppKit -d CoreData  $OPTS
  build HOC-Cocoa