NSURL fixes/rewrite.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@13776 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,12 @@
+2002-06-05  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Headers/Foundation/NSURL.h: Added a couple of ivars and removed
+	non-standard methods.
+	* Source/NSURL.m: Rewrite everything apart from the code dealing
+	with NSURLHandle objects (and change some of that) to conform to
+	the documentation (I hope) and to try to match behavior with that
+	of MacOS-X.
+
 2002-06-04  Adam Fedor  <fedor@gnu.org>
 
 	* Headers/gnustep/base/NSByteOrder.h: Hack for bug in gcc 3.1

Headers/gnustep/base/NSObject.h

@@ -206,34 +206,15 @@ NSCopyObject(NSObject *anObject, unsigned extraBytes, NSZone *zone);
 GS_EXPORT BOOL
 NSShouldRetainWithZone(NSObject *anObject, NSZone *requestedZone);
 
-/**
+GS_EXPORT BOOL
- * Return the extra reference count of anObject (a value in the range
+NSDecrementExtraRefCountWasZero(id anObject);
- * from 0 to the maximum unsigned integer value minus one).<br />
+
- * The retain count
- * for an object is this value plus one.
- */
 GS_EXPORT unsigned
 NSExtraRefCount(id anObject);
 
-/**
- * Increments the extra reference count for anObject.
- * The GNUstep version raises an exception if the reference count
- * would be incremented to too large a value.
- * This is used by the [NSObject-retain] method.
- */
 GS_EXPORT void
 NSIncrementExtraRefCount(id anObject);
 
-/**
- * Examines the extra reference count for the object and, if non-zero
- * decrements it, otherwise leaves it unchanged.<br />
- * Returns a flag to say whether the count was zero
- * (and hence whether the extra refrence count was decremented).<br />
- * This function is used by the [NSObject-release] method.
- */
-GS_EXPORT BOOL
-NSDecrementExtraRefCountWasZero(id anObject);
-
 typedef enum _NSComparisonResult 
 {
   NSOrderedAscending = -1, NSOrderedSame, NSOrderedDescending

Headers/gnustep/base/NSURL.h

@@ -28,13 +28,14 @@
 
 @class NSNumber;
 
-GS_EXPORT NSString* NSURLFileScheme; //file
+GS_EXPORT NSString* NSURLFileScheme;
 
-//============================================================================
 @interface NSURL: NSObject <NSCoding, NSCopying, NSURLHandleClient>
 {
   NSString	*_urlString;
   NSURL		*_baseURL;
+  void		*_clients;
+  void		*_data;
 }
         
 + (id) fileURLWithPath: (NSString*)aPath;
@@ -42,58 +43,34 @@ GS_EXPORT NSString* NSURLFileScheme; //file
 + (id) URLWithString: (NSString*)aUrlString
        relativeToURL: (NSURL*)aBaseUrl;
 
-- (id) initWithScheme: (NSString*)aScheme
-		 host: (NSString*)aHost
-		 path: (NSString*)aPath;
-
-//Non Standard Function
-- (id) initWithScheme: (NSString*)aScheme
-		 host: (NSString*)aHost
-		 port: (NSNumber*)aPort
-		 path: (NSString*)aPath;
-
-//Do a initWithScheme: NSFileScheme host: nil path: path
 - (id) initFileURLWithPath: (NSString*)aPath;
-
+- (id) initWithScheme: (NSString*)aScheme
-// urlString is escaped
+		 host: (NSString*)aHost
+		 path: (NSString*)aPath;
 - (id) initWithString: (NSString*)aUrlString;
-
-//URLString!=nil !
-// urlString is escaped
 - (id) initWithString: (NSString*)aUrlString
 	relativeToURL: (NSURL*)aBaseUrl;
 
-- (NSString*) description;
 - (NSString*) absoluteString;
-- (NSString*) relativeString;
-
-- (NSURL*) baseURL;
 - (NSURL*) absoluteURL;
-
+- (NSURL*) baseURL;
-- (NSString*) scheme;
+- (NSString*) fragment;
-- (NSString*) resourceSpecifier;
-
 - (NSString*) host;
-- (NSNumber*) port;
+- (BOOL) isFileURL;
-- (NSString*) user;
+- (NSString*) parameterString;
 - (NSString*) password;
 - (NSString*) path;
-- (NSString*) fragment;
+- (NSNumber*) port;
-- (NSString*) parameterString;
 - (NSString*) query;
 - (NSString*) relativePath;
-
+- (NSString*) relativeString;
-- (BOOL) isFileURL;
+- (NSString*) resourceSpecifier;
-
+- (NSString*) scheme;
 - (NSURL*) standardizedURL;
-
+- (NSString*) user;
-//FIXME: delete these fn when NSURL will be validated
-+ (void) test;
-+ (void) testPrint: (NSURL*)url;
 
 @end
 
-//=============================================================================
 @interface NSURL (NSURLLoading)
 - (NSData*) resourceDataUsingCache: (BOOL)shouldUseCache;
 
@@ -110,7 +87,6 @@ GS_EXPORT NSString* NSURLFileScheme; //file
 
 @end
 
-//=============================================================================
 @interface NSObject (NSURLClient)
 - (void) URL: (NSURL*)sender
   resourceDataDidBecomeAvailable: (NSData*)newBytes;

Source/NSObject.m

@@ -52,10 +52,17 @@
 extern BOOL __objc_responds_to(id, SEL);
 #endif
 
-#if GS_WITH_GC == 0
+#if GS_WITH_GC
+
+#include	<gc.h>
+#include	<gc_typed.h>
+
+#else
+
 @class	_FastMallocBuffer;
 static Class	fastMallocClass;
 static unsigned	fastMallocOffset;
+
 #endif
 
 static Class	NSConstantStringClass;
@@ -158,7 +165,6 @@ static void GSLogZombie(id o, SEL sel)
  *	Define a structure to hold information that is held locally
  *	(before the start) in each object.
  */ 
-
 typedef struct obj_layout_unpadded {
 #if	defined(REFCNT_LOCAL)
     unsigned	retained;
@@ -174,7 +180,6 @@ typedef struct obj_layout_unpadded {
  *	what padding (if any) is required to get the alignment of the
  *	structure correct.
  */
-
 struct obj_layout {
 #if	defined(REFCNT_LOCAL)
     unsigned	retained;
@@ -188,43 +193,177 @@ typedef	struct obj_layout *obj;
 
 #endif	/* defined(REFCNT_LOCAL) || defined(CACHE_ZONE) */
 
-
+#if !defined(REFCNT_LOCAL)
-#if	GS_WITH_GC
-
-unsigned
-NSExtraRefCount(id anObject)
-{
-  return 0;
-}
-void
-NSIncrementExtraRefCount(id anObject)
-{
-}
-#define	NSIncrementExtraRefCount(X) 
-BOOL
-NSDecrementExtraRefCountWasZero(id anObject)
-{
-  return NO;
-}
-#define NSDecrementExtraRefCountWasZero(X)	NO
-
-#else	/* GS_WITH_GC	*/
 
 /*
- *	Now do conditional compilation of reference count functions
+ * Set up map table for non-local reference counts.
- *	depending on whether we are using local or global counting.
  */
-#if	defined(REFCNT_LOCAL)
 
-unsigned
+#define GSI_MAP_EQUAL(M, X, Y)	(X.obj == Y.obj)
-NSExtraRefCount(id anObject)
+#define GSI_MAP_HASH(M, X)	(X.uint >> 2)
+#define GSI_MAP_RETAIN_KEY(M, X)
+#define GSI_MAP_RELEASE_KEY(M, X)
+#define GSI_MAP_RETAIN_VAL(M, X)
+#define GSI_MAP_RELEASE_VAL(M, X)
+#define GSI_MAP_KTYPES  GSUNION_OBJ|GSUNION_INT
+#define GSI_MAP_VTYPES  GSUNION_INT
+#define	GSI_MAP_NOCLEAN	1
+
+#include <base/GSIMap.h>
+
+static GSIMapTable_t	retain_counts = 0;
+
+#endif	/* !defined(REFCNT_LOCAL) */
+
+
+/**
+ * Examines the extra reference count for the object and, if non-zero
+ * decrements it, otherwise leaves it unchanged.<br />
+ * Returns a flag to say whether the count was zero
+ * (and hence whether the extra refrence count was decremented).<br />
+ * This function is used by the [NSObject-release] method.
+ */
+inline BOOL
+NSDecrementExtraRefCountWasZero(id anObject)
 {
-  return ((obj)anObject)[-1].retained;
+#if	GS_WITH_GC
+  return NO;
+#else	/* GS_WITH_GC */
+#if	defined(REFCNT_LOCAL)
+  if (allocationLock != 0)
+    {
+      objc_mutex_lock(allocationLock);
+      if (((obj)anObject)[-1].retained == 0)
+	{
+	  objc_mutex_unlock(allocationLock);
+	  return YES;
+	}
+      else
+	{
+	  ((obj)anObject)[-1].retained--;
+	  objc_mutex_unlock(allocationLock);
+	  return NO;
+	}
+    }
+  else
+    {
+      if (((obj)anObject)[-1].retained == 0)
+	{
+	  return YES;
+	}
+      else
+	{
+	  ((obj)anObject)[-1].retained--;
+	  return NO;
+	}
+    }
+#else
+  GSIMapNode	node;
+
+  if (allocationLock != 0)
+    {
+      objc_mutex_lock(allocationLock);
+      node = GSIMapNodeForKey(&retain_counts, (GSIMapKey)anObject);
+      if (node == 0)
+	{
+	  objc_mutex_unlock(allocationLock);
+	  return YES;
+	}
+      if (node->value.uint == 0)
+	{
+	  GSIMapRemoveKey((GSIMapTable)&retain_counts, (GSIMapKey)anObject);
+	  objc_mutex_unlock(allocationLock);
+	  return YES;
+	}
+      else
+	{
+	  (node->value.uint)--;
+	}
+      objc_mutex_unlock(allocationLock);
+    }
+  else
+    {
+      node = GSIMapNodeForKey(&retain_counts, (GSIMapKey)anObject);
+      if (node == 0)
+	{
+	  return YES;
+	}
+      if (node->value.uint) == 0)
+	{
+	  GSIMapRemoveKey((GSIMapTable)&retain_counts, (GSIMapKey)anObject);
+	  return YES;
+	}
+      else
+	{
+	  --(node->value.uint);
+	}
+    }
+  return NO;
+#endif
+#endif
 }
 
-void
+/**
+ * Return the extra reference count of anObject (a value in the range
+ * from 0 to the maximum unsigned integer value minus one).<br />
+ * The retain count for an object is this value plus one.
+ */
+inline unsigned
+NSExtraRefCount(id anObject)
+{
+#if	GS_WITH_GC
+  return UINT_MAX - 1;
+#else	/* GS_WITH_GC */
+#if	defined(REFCNT_LOCAL)
+  return ((obj)anObject)[-1].retained;
+#else
+  GSIMapNode	node;
+  unsigned	ret;
+
+  if (allocationLock != 0)
+    {
+      objc_mutex_lock(allocationLock);
+      node = GSIMapNodeForKey(&retain_counts, (GSIMapKey)anObject);
+      if (node == 0)
+	{
+	  ret = 0;
+	}
+      else
+	{
+	  ret = node->value.uint;
+	}
+      objc_mutex_unlock(allocationLock);
+    }
+  else
+    {
+      node = GSIMapNodeForKey(&retain_counts, (GSIMapKey)anObject);
+      if (node == 0)
+	{
+	  ret = 0;
+	}
+      else
+	{
+	  ret = node->value.uint;
+	}
+    }
+  return ret;
+#endif
+#endif
+}
+
+/**
+ * Increments the extra reference count for anObject.<br />
+ * The GNUstep version raises an exception if the reference count
+ * would be incremented to too large a value.<br />
+ * This is used by the [NSObject-retain] method.
+ */
+inline void
 NSIncrementExtraRefCount(id anObject)
 {
+#if	GS_WITH_GC
+  return;
+#else	/* GS_WITH_GC */
+#if	defined(REFCNT_LOCAL)
   if (allocationLock != 0)
     {
       objc_mutex_lock(allocationLock);
@@ -246,87 +385,8 @@ NSIncrementExtraRefCount(id anObject)
 	}
       ((obj)anObject)[-1].retained++;
     }
-}
+  return;
-
-#define	NSIncrementExtraRefCount(X) ({ \
-  if (allocationLock != 0) \
-    { \
-      objc_mutex_lock(allocationLock); \
-      if (((obj)X)[-1].retained == UINT_MAX - 1) \
-	{ \
-	  objc_mutex_unlock (allocationLock); \
-	  [NSException raise: NSInternalInconsistencyException \
-	    format: @"NSIncrementExtraRefCount() asked to increment too far"]; \
-	} \
-      ((obj)(X))[-1].retained++;            \
-      objc_mutex_unlock(allocationLock); \
-    } \
-  else \
-    { \
-      if (((obj)X)[-1].retained == UINT_MAX - 1) \
-	{ \
-	  [NSException raise: NSInternalInconsistencyException \
-	    format: @"NSIncrementExtraRefCount() asked to increment too far"]; \
-	} \
-      ((obj)X)[-1].retained++; \
-    } \
-})
-
-BOOL
-NSDecrementExtraRefCountWasZero(id anObject)
-{
-  if (allocationLock != 0)
-    {
-      objc_mutex_lock(allocationLock);
-      if (((obj)anObject)[-1].retained == 0)
-	{
-	  objc_mutex_unlock(allocationLock);
-	  return YES;
-	}
-      else
-	{
-	  ((obj)anObject)[-1].retained--;
-	  objc_mutex_unlock(allocationLock);
-	  return NO;
-	}
-    }
-  else
-    {
-      if (((obj)anObject)[-1].retained == 0)
-	{
-	  return YES;
-	}
-      else
-	{
-	  ((obj)anObject)[-1].retained--;
-	  return NO;
-	}
-    }
-}
-
-
-#define	NSExtraRefCount(X)	(((obj)(X))[-1].retained)
-
 #else
-
-#define GSI_MAP_EQUAL(M, X, Y)	(X.obj == Y.obj)
-#define GSI_MAP_HASH(M, X)	(X.uint >> 2)
-#define GSI_MAP_RETAIN_KEY(M, X)
-#define GSI_MAP_RELEASE_KEY(M, X)
-#define GSI_MAP_RETAIN_VAL(M, X)
-#define GSI_MAP_RELEASE_VAL(M, X)
-#define GSI_MAP_KTYPES  GSUNION_OBJ|GSUNION_INT
-#define GSI_MAP_VTYPES  GSUNION_INT
-#define	GSI_MAP_NOCLEAN	1
-
-#include <base/GSIMap.h>
-
-/* The maptable of retain counts on objects */
-static GSIMapTable_t	retain_counts;
-
-void
-NSIncrementExtraRefCount (id anObject)
-{
   GSIMapNode	node;
 
   if (allocationLock != 0)
@@ -368,93 +428,11 @@ NSIncrementExtraRefCount (id anObject)
 	  GSIMapAddPair(&retain_counts, (GSIMapKey)anObject, (GSIMapVal)1);
 	}
     }
+  return;
+#endif
+#endif
 }
 
-BOOL
-NSDecrementExtraRefCountWasZero (id anObject)
-{
-  GSIMapNode	node;
-
-  if (allocationLock != 0)
-    {
-      objc_mutex_lock(allocationLock);
-      node = GSIMapNodeForKey(&retain_counts, (GSIMapKey)anObject);
-      if (node == 0)
-	{
-	  objc_mutex_unlock(allocationLock);
-	  return YES;
-	}
-      if (node->value.uint == 0)
-	{
-	  GSIMapRemoveKey((GSIMapTable)&retain_counts, (GSIMapKey)anObject);
-	  objc_mutex_unlock(allocationLock);
-	  return YES;
-	}
-      else
-	{
-	  (node->value.uint)--;
-	}
-      objc_mutex_unlock(allocationLock);
-    }
-  else
-    {
-      node = GSIMapNodeForKey(&retain_counts, (GSIMapKey)anObject);
-      if (node == 0)
-	{
-	  return YES;
-	}
-      if (node->value.uint) == 0)
-	{
-	  GSIMapRemoveKey((GSIMapTable)&retain_counts, (GSIMapKey)anObject);
-	  return YES;
-	}
-      else
-	{
-	  --(node->value.uint);
-	  return NO;
-	}
-    }
-}
-
-unsigned
-NSExtraRefCount (id anObject)
-{
-  GSIMapNode	node;
-  unsigned	ret;
-
-  if (allocationLock != 0)
-    {
-      objc_mutex_lock(allocationLock);
-      node = GSIMapNodeForKey(&retain_counts, (GSIMapKey)anObject);
-      if (node == 0)
-	{
-	  ret = 0;
-	}
-      else
-	{
-	  ret = node->value.uint;
-	}
-      objc_mutex_unlock(allocationLock);
-    }
-  else
-    {
-      node = GSIMapNodeForKey(&retain_counts, (GSIMapKey)anObject);
-      if (node == 0)
-	{
-	  ret = 0;
-	}
-      else
-	{
-	  ret = node->value.uint;
-	}
-    }
-  return ret;
-}
-
-#endif	/* defined(REFCNT_LOCAL) */
-
-#endif	/* GS_WITH_GC */
-
 
 /*
  *	Now do conditional compilation of memory allocation functions
@@ -463,9 +441,6 @@ NSExtraRefCount (id anObject)
  */
 #if	GS_WITH_GC
 
-#include	<gc.h>
-#include	<gc_typed.h>
-
 inline NSZone *
 GSObjCZone(NSObject *object)
 {