* Headers/Foundation/Foundation.h

* Headers/Foundation/NSScriptWhoseTests.h
	* Source/GNUmakefile
	* Source/NSObject+NSComparisonMethods.m: Move the
	comparison methods to the header for NSScriptWhoseTests.h,
	but don't define the abstract class since we don't support
	Apple script.



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@35570 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
gcasa 2012-09-17 16:05:06 +00:00
parent adc4c8d5e6
commit 9407f87dea
5 changed files with 56 additions and 12 deletions

View file

@ -1,3 +1,14 @@
2012-09-17 12:03-EDT Gregory John Casamento <greg.casamento@gmail.com>
Merged from the testplant branch.
* Headers/Foundation/Foundation.h
* Headers/Foundation/NSScriptWhoseTests.h
* Source/GNUmakefile
* Source/NSObject+NSComparisonMethods.m: Move the
comparison methods to the header for NSScriptWhoseTests.h,
but don't define the abstract class since we don't support
Apple script.
2012-09-16 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSURL.m:

View file

@ -103,6 +103,7 @@
#import <Foundation/NSRange.h>
#import <Foundation/NSRunLoop.h>
#import <Foundation/NSScanner.h>
#import <Foundation/NSScriptWhoseTests.h>
#import <Foundation/NSSerialization.h>
#import <Foundation/NSSet.h>
#import <Foundation/NSSortDescriptor.h>

View file

@ -0,0 +1,43 @@
/*
Global include file for the GNUstep Base Library.
Copyright (C) 1997 Free Software Foundation, Inc.
Date: Sep 2012
This file is part of the GNUstep Base Library.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free
Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02111 USA.
*/
#ifndef __NSScriptWhoseTests_h_GNUSTEP_BASE_INCLUDE
#define __NSScriptWhoseTests_h_GNUSTEP_BASE_INCLUDE
#import <Foundation/NSObject.h>
@interface NSObject (NSComparisonMethods)
- (BOOL) doesContain: (id) object;
- (BOOL) isCaseInsensitiveLike: (id) object;
- (BOOL) isEqualTo: (id) object;
- (BOOL) isGreaterThan: (id) object;
- (BOOL) isGreaterThanOrEqualTo: (id) object;
- (BOOL) isLessThan: (id) object;
- (BOOL) isLessThanOrEqualTo: (id) object;
- (BOOL) isLike: (NSString *)object;
- (BOOL) isNotEqualTo: (id) object;
@end
#endif /* __NSScriptWhoseTests_h_GNUSTEP_BASE_INCLUDE */

View file

@ -410,6 +410,7 @@ NSRange.h \
NSRegularExpression.h\
NSRunLoop.h \
NSScanner.h \
NSScriptWhoseTests.h \
NSSerialization.h \
NSSet.h \
NSSortDescriptor.h \

View file

@ -29,18 +29,6 @@
#import "Foundation/NSArray.h"
#import "GNUstepBase/NSObject+GNUstepBase.h"
@interface NSObject (NSComparisonMethods)
- (BOOL) doesContain: (id) object;
- (BOOL) isCaseInsensitiveLike: (id) object;
- (BOOL) isEqualTo: (id) object;
- (BOOL) isGreaterThan: (id) object;
- (BOOL) isGreaterThanOrEqualTo: (id) object;
- (BOOL) isLessThan: (id) object;
- (BOOL) isLessThanOrEqualTo: (id) object;
- (BOOL) isLike: (NSString *)object;
- (BOOL) isNotEqualTo: (id) object;
@end
@implementation NSObject (NSComparisonMethods)
- (BOOL) doesContain: (id) object
{