[Skim-app-commit] SF.net SVN: skim-app: [2852] trunk/SKFDFParser.m

[hofman]

Revision: 2852
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2852&view=rev
Author:   hofman
Date:     2007-09-08 11:50:36 -0700 (Sat, 08 Sep 2007)

Log Message:
-----------
Implement hash for direct object and use unsigned for ivars.

Modified Paths:
--------------
    trunk/SKFDFParser.m

Modified: trunk/SKFDFParser.m
===================================================================
--- trunk/SKFDFParser.m 2007-09-08 16:47:47 UTC (rev 2851)
+++ trunk/SKFDFParser.m 2007-09-08 18:50:36 UTC (rev 2852)
@@ -55,13 +55,13 @@
 #pragma mark -
 
 @interface SKIndirectObject : NSObject <NSCopying> {
-    int objectNumber;
-    int generationNumber;
+    unsigned int objectNumber;
+    unsigned int generationNumber;
 }
-+ (id)indirectObjectWithNumber:(int)objNumber generation:(int)genNumber;
-- (id)initWithNumber:(int)objNumber generation:(int)genNumber;
-- (int)objectNumber;
-- (int)generationNumber;
++ (id)indirectObjectWithNumber:(unsigned int)objNumber generation:(unsigned 
int)genNumber;
+- (id)initWithNumber:(unsigned int)objNumber generation:(unsigned 
int)genNumber;
+- (unsigned int)objectNumber;
+- (unsigned int)generationNumber;
 @end
 
 #pragma mark -
@@ -631,11 +631,11 @@
 
 @implementation SKIndirectObject : NSObject
 
-+ (id)indirectObjectWithNumber:(int)objNumber generation:(int)genNumber {
++ (id)indirectObjectWithNumber:(unsigned int)objNumber generation:(unsigned 
int)genNumber {
     return [[[self alloc] initWithNumber:objNumber generation:genNumber] 
autorelease];
 }
 
-- (id)initWithNumber:(int)objNumber generation:(int)genNumber {
+- (id)initWithNumber:(unsigned int)objNumber generation:(unsigned 
int)genNumber {
     if (self = [super init]) {
         objectNumber = objNumber;
         generationNumber = genNumber;
@@ -651,11 +651,15 @@
     return [self isMemberOfClass:[other class]] && [self objectNumber] == 
[other objectNumber] && [self generationNumber] == [other generationNumber];
 }
 
-- (int)objectNumber {
+- (unsigned int)hash {
+    return (objectNumber << 16) | generationNumber;
+}
+
+- (unsigned int)objectNumber {
     return objectNumber;
 }
 
-- (int)generationNumber {
+- (unsigned int)generationNumber {
     return generationNumber;
 }
 


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit