From b67f787f7874c4588bebb80b87b275cee05b0e68 Mon Sep 17 00:00:00 2001 From: Matthias Benkard Date: Mon, 11 Aug 2008 13:17:05 +0200 Subject: Remove class MLKLispValue. --- GNUmakefile | 15 +++++++-------- MLKBackquoteReader.h | 3 +-- MLKCharacter.h | 4 +--- MLKClosure.h | 3 +-- MLKCommaReader.h | 4 +--- MLKCompiledProcedure.h | 3 +-- MLKCons.h | 6 ++---- MLKDispatchingMacroCharacterReader.h | 3 +-- MLKEnvironment.h | 3 +-- MLKForeignProcedure.h | 3 +-- MLKFunction.h | 5 +---- MLKInterpretedClosure.h | 3 +-- MLKLexicalContext.h | 3 +-- MLKLispValue.h | 30 ------------------------------ MLKLispValue.m | 23 ----------------------- MLKNumber.h | 4 ++-- MLKPackage.h | 4 +--- MLKParenReader.h | 5 ++--- MLKQuoteReader.h | 3 +-- MLKReadtable.h | 3 +-- MLKSemicolonReader.h | 3 +-- MLKSharpsignColonReader.h | 4 ++-- MLKStream.h | 4 +--- MLKStringReader.h | 3 +-- MLKSymbol.h | 4 +--- MLKValuesFunction.h | 3 +-- Toilet Lisp.xcodeproj/project.pbxproj | 8 -------- 27 files changed, 34 insertions(+), 125 deletions(-) delete mode 100644 MLKLispValue.h delete mode 100644 MLKLispValue.m diff --git a/GNUmakefile b/GNUmakefile index 87076d4..b884e03 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -56,14 +56,13 @@ ToiletKit_OBJC_FILES = functions.m globals.m MLKArray.m \ MLKForeignProcedure.m MLKForm.m MLKInteger.m \ MLKInterpretedClosure.m MLKInterpreter.m \ MLKLexicalContext.m MLKLexicalEnvironment.m \ - MLKLispValue.m MLKNumber.m MLKPackage.m \ - MLKParenReader.m MLKQuoteReader.m MLKRatio.m \ - MLKReader.m MLKReadtable.m MLKReaderError.m \ - MLKRoot.m MLKSemicolonReader.m \ - MLKSharpsignColonReader.m MLKSingleFloat.m \ - MLKStream.m MLKStringInputStream.m \ - MLKStringOutputStream.m MLKStringReader.m \ - MLKSymbol.m MLKThrowException.m \ + MLKNumber.m MLKPackage.m MLKParenReader.m \ + MLKQuoteReader.m MLKRatio.m MLKReader.m \ + MLKReadtable.m MLKReaderError.m MLKRoot.m \ + MLKSemicolonReader.m MLKSharpsignColonReader.m \ + MLKSingleFloat.m MLKStream.m \ + MLKStringInputStream.m MLKStringOutputStream.m \ + MLKStringReader.m MLKSymbol.m MLKThrowException.m \ MLKValuesFunction.m NSObject-MLKPrinting.m \ NSString-MLKPrinting.m ToiletKit_OBJCFLAGS = -Wall diff --git a/MLKBackquoteReader.h b/MLKBackquoteReader.h index 64553d7..9dec542 100644 --- a/MLKBackquoteReader.h +++ b/MLKBackquoteReader.h @@ -17,11 +17,10 @@ */ #import "MLKFuncallable.h" -#import "MLKLispValue.h" #import -@interface MLKBackquoteReader : MLKLispValue +@interface MLKBackquoteReader : NSObject -(NSArray *) applyToArray:(NSArray *)arguments; @end diff --git a/MLKCharacter.h b/MLKCharacter.h index 75e344a..def7142 100644 --- a/MLKCharacter.h +++ b/MLKCharacter.h @@ -16,12 +16,10 @@ * along with this program. If not, see . */ -#import "MLKLispValue.h" - #import -@interface MLKCharacter : MLKLispValue +@interface MLKCharacter : NSObject { unichar unichar; } diff --git a/MLKClosure.h b/MLKClosure.h index 0ccc674..b9ac6b6 100644 --- a/MLKClosure.h +++ b/MLKClosure.h @@ -16,7 +16,6 @@ * along with this program. If not, see . */ -#import "MLKLispValue.h" #import "MLKEnvironment.h" #import "MLKFuncallable.h" #import "MLKFunction.h" @@ -25,7 +24,7 @@ #import -@interface MLKClosure : MLKLispValue +@interface MLKClosure : NSObject { MLKFunction *_code; NSData *_closedOverVariableVector; diff --git a/MLKCommaReader.h b/MLKCommaReader.h index 89c8501..e584e0b 100644 --- a/MLKCommaReader.h +++ b/MLKCommaReader.h @@ -17,11 +17,9 @@ */ #import "MLKFuncallable.h" -#import "MLKLispValue.h" - #import -@interface MLKCommaReader : MLKLispValue +@interface MLKCommaReader : NSObject -(NSArray *) applyToArray:(NSArray *)arguments; @end diff --git a/MLKCompiledProcedure.h b/MLKCompiledProcedure.h index 86809c1..175c085 100644 --- a/MLKCompiledProcedure.h +++ b/MLKCompiledProcedure.h @@ -17,7 +17,6 @@ */ #import "MLKFuncallable.h" -#import "MLKLispValue.h" #import "MLKLexicalContext.h" #import "MLKLexicalEnvironment.h" @@ -25,7 +24,7 @@ #import -@interface MLKCompiledProcedure : MLKLispValue +@interface MLKCompiledProcedure : NSObject { void *_code; } diff --git a/MLKCons.h b/MLKCons.h index eb6b2bd..84d3c56 100644 --- a/MLKCons.h +++ b/MLKCons.h @@ -16,12 +16,10 @@ * along with this program. If not, see . */ -#import "MLKLispValue.h" +#import -@class NSArray; - -@interface MLKCons : MLKLispValue +@interface MLKCons : NSObject { id _car; id _cdr; diff --git a/MLKDispatchingMacroCharacterReader.h b/MLKDispatchingMacroCharacterReader.h index b4c2aba..5701ef1 100644 --- a/MLKDispatchingMacroCharacterReader.h +++ b/MLKDispatchingMacroCharacterReader.h @@ -17,14 +17,13 @@ */ #import "MLKFuncallable.h" -#import "MLKLispValue.h" #import "MLKCharacter.h" #import #import -@interface MLKDispatchingMacroCharacterReader : MLKLispValue +@interface MLKDispatchingMacroCharacterReader : NSObject { NSMutableDictionary *_readerMacros; } diff --git a/MLKEnvironment.h b/MLKEnvironment.h index 9db0e55..bb8a4c8 100644 --- a/MLKEnvironment.h +++ b/MLKEnvironment.h @@ -17,7 +17,6 @@ */ #import "MLKBinding.h" -#import "MLKLispValue.h" #import "MLKSymbol.h" #import @@ -26,7 +25,7 @@ #import -@interface MLKEnvironment : MLKLispValue +@interface MLKEnvironment : NSObject { MLKEnvironment *_parent; NSMutableDictionary *_bindings; diff --git a/MLKForeignProcedure.h b/MLKForeignProcedure.h index b460df3..c01772d 100644 --- a/MLKForeignProcedure.h +++ b/MLKForeignProcedure.h @@ -17,7 +17,6 @@ */ #import "MLKFuncallable.h" -#import "MLKLispValue.h" #import "MLKLexicalContext.h" #import "MLKLexicalEnvironment.h" @@ -27,7 +26,7 @@ #import "functions.h" -@interface MLKForeignProcedure : MLKLispValue +@interface MLKForeignProcedure : NSObject { void *_code; MLKForeignType *_argumentTypes; diff --git a/MLKFunction.h b/MLKFunction.h index 67e62c5..e266e74 100644 --- a/MLKFunction.h +++ b/MLKFunction.h @@ -16,10 +16,7 @@ * along with this program. If not, see . */ -#import "MLKLispValue.h" - - -@interface MLKFunction : MLKLispValue +@interface MLKFunction : NSObject { void (*_function)(); NSDictionary *_closedOverVariableIndices; diff --git a/MLKInterpretedClosure.h b/MLKInterpretedClosure.h index cd97230..4955c4c 100644 --- a/MLKInterpretedClosure.h +++ b/MLKInterpretedClosure.h @@ -17,7 +17,6 @@ */ #import "MLKFuncallable.h" -#import "MLKLispValue.h" #import "MLKLexicalContext.h" #import "MLKLexicalEnvironment.h" @@ -25,7 +24,7 @@ #import -@interface MLKInterpretedClosure : MLKLispValue +@interface MLKInterpretedClosure : NSObject { id bodyForm; MLKSymbol *lambdaListName; diff --git a/MLKLexicalContext.h b/MLKLexicalContext.h index 454df23..0a37a35 100644 --- a/MLKLexicalContext.h +++ b/MLKLexicalContext.h @@ -17,7 +17,6 @@ */ #import "MLKFuncallable.h" -#import "MLKLispValue.h" #import #import @@ -26,7 +25,7 @@ NSMutableDictionary, NSString, MLKCons; -@interface MLKLexicalContext : MLKLispValue +@interface MLKLexicalContext : NSObject { NSMutableSet *_knownMacros; NSMutableSet *_knownCompilerMacros; diff --git a/MLKLispValue.h b/MLKLispValue.h deleted file mode 100644 index ce24253..0000000 --- a/MLKLispValue.h +++ /dev/null @@ -1,30 +0,0 @@ -/* -*- mode: objc; coding: utf-8 -*- */ -/* Toilet Lisp, a Common Lisp subset for the Étoilé runtime. - * Copyright (C) 2008 Matthias Andreas Benkard. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or (at - * your option) any later version. - * - * This program 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 - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import - - -@interface MLKLispValue : NSObject -/* -{ - int typeTag; -} - -+(id) init; -*/ -@end diff --git a/MLKLispValue.m b/MLKLispValue.m deleted file mode 100644 index dd64814..0000000 --- a/MLKLispValue.m +++ /dev/null @@ -1,23 +0,0 @@ -/* -*- mode: objc; coding: utf-8 -*- */ -/* Toilet Lisp, a Common Lisp subset for the Étoilé runtime. - * Copyright (C) 2008 Matthias Andreas Benkard. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or (at - * your option) any later version. - * - * This program 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 - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "MLKLispValue.h" - - -@implementation MLKLispValue -@end diff --git a/MLKNumber.h b/MLKNumber.h index 50a3899..e9c5843 100644 --- a/MLKNumber.h +++ b/MLKNumber.h @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -#import "MLKLispValue.h" +#import -@interface MLKNumber : MLKLispValue +@interface MLKNumber : NSObject -(MLKNumber *) add:(MLKNumber *)arg; -(MLKNumber *) subtract:(MLKNumber *)arg; -(MLKNumber *) multiplyWith:(MLKNumber *)arg; diff --git a/MLKPackage.h b/MLKPackage.h index e0df3af..f4cf995 100644 --- a/MLKPackage.h +++ b/MLKPackage.h @@ -16,8 +16,6 @@ * along with this program. If not, see . */ -#import "MLKLispValue.h" - #import #import #import @@ -26,7 +24,7 @@ @class MLKSymbol; -@interface MLKPackage : MLKLispValue +@interface MLKPackage : NSObject { NSMutableDictionary *_accessible_symbols; NSMutableSet *_present_symbols; diff --git a/MLKParenReader.h b/MLKParenReader.h index 778d2d6..0e16213 100644 --- a/MLKParenReader.h +++ b/MLKParenReader.h @@ -17,11 +17,10 @@ */ #import "MLKFuncallable.h" -#import "MLKLispValue.h" -@class NSArray; +#import -@interface MLKParenReader : MLKLispValue +@interface MLKParenReader : NSObject -(NSArray *) applyToArray:(NSArray *)arguments; @end diff --git a/MLKQuoteReader.h b/MLKQuoteReader.h index 30ef9f6..7b24b91 100644 --- a/MLKQuoteReader.h +++ b/MLKQuoteReader.h @@ -17,11 +17,10 @@ */ #import "MLKFuncallable.h" -#import "MLKLispValue.h" #import -@interface MLKQuoteReader : MLKLispValue +@interface MLKQuoteReader : NSObject -(NSArray *) applyToArray:(NSArray *)arguments; @end diff --git a/MLKReadtable.h b/MLKReadtable.h index 600a22e..5776748 100644 --- a/MLKReadtable.h +++ b/MLKReadtable.h @@ -16,7 +16,6 @@ * along with this program. If not, see . */ -#import "MLKLispValue.h" #import "MLKFuncallable.h" #import @@ -59,7 +58,7 @@ enum MLKConstituentTrait }; -@interface MLKReadtable : MLKLispValue +@interface MLKReadtable : NSObject { NSMutableDictionary *_syntaxTable; NSMutableDictionary *_readerMacros; diff --git a/MLKSemicolonReader.h b/MLKSemicolonReader.h index 4d830c9..7023c68 100644 --- a/MLKSemicolonReader.h +++ b/MLKSemicolonReader.h @@ -17,11 +17,10 @@ */ #import "MLKFuncallable.h" -#import "MLKLispValue.h" #import -@interface MLKSemicolonReader : MLKLispValue +@interface MLKSemicolonReader : NSObject -(NSArray *) applyToArray:(NSArray *)arguments; @end diff --git a/MLKSharpsignColonReader.h b/MLKSharpsignColonReader.h index b6edd95..3fc3af8 100644 --- a/MLKSharpsignColonReader.h +++ b/MLKSharpsignColonReader.h @@ -17,11 +17,11 @@ */ #import "MLKFuncallable.h" -#import "MLKLispValue.h" #import +#import -@interface MLKSharpsignColonReader : MLKLispValue +@interface MLKSharpsignColonReader : NSObject -(NSArray *) applyToArray:(NSArray *)arguments; @end diff --git a/MLKStream.h b/MLKStream.h index 3e4f597..737346c 100644 --- a/MLKStream.h +++ b/MLKStream.h @@ -16,13 +16,11 @@ * along with this program. If not, see . */ -#import "MLKLispValue.h" - #import #import -@interface MLKStream : MLKLispValue +@interface MLKStream : NSObject { NSInputStream *_input; NSOutputStream *_output; diff --git a/MLKStringReader.h b/MLKStringReader.h index 4ad7982..edd54dc 100644 --- a/MLKStringReader.h +++ b/MLKStringReader.h @@ -17,11 +17,10 @@ */ #import "MLKFuncallable.h" -#import "MLKLispValue.h" #import -@interface MLKStringReader : MLKLispValue +@interface MLKStringReader : NSObject -(NSArray *) applyToArray:(NSArray *)arguments; @end diff --git a/MLKSymbol.h b/MLKSymbol.h index f0c4be3..3d5edfe 100644 --- a/MLKSymbol.h +++ b/MLKSymbol.h @@ -16,14 +16,12 @@ * along with this program. If not, see . */ -#import "MLKLispValue.h" - #import @class MLKPackage; -@interface MLKSymbol : MLKLispValue +@interface MLKSymbol : NSObject { NSString *name; MLKPackage *homePackage; diff --git a/MLKValuesFunction.h b/MLKValuesFunction.h index 53e9c5d..d1c1869 100644 --- a/MLKValuesFunction.h +++ b/MLKValuesFunction.h @@ -17,11 +17,10 @@ */ #import "MLKFuncallable.h" -#import "MLKLispValue.h" #import -@interface MLKValuesFunction : MLKLispValue +@interface MLKValuesFunction : NSObject -(NSArray *) applyToArray:(NSArray *)arguments; @end diff --git a/Toilet Lisp.xcodeproj/project.pbxproj b/Toilet Lisp.xcodeproj/project.pbxproj index 3b55f24..f7664df 100644 --- a/Toilet Lisp.xcodeproj/project.pbxproj +++ b/Toilet Lisp.xcodeproj/project.pbxproj @@ -137,8 +137,6 @@ A7E5C4580E21695800A01D81 /* MLKLexicalContext.m in Sources */ = {isa = PBXBuildFile; fileRef = A7E5C4120E21695700A01D81 /* MLKLexicalContext.m */; }; A7E5C4590E21695800A01D81 /* MLKLexicalEnvironment.h in Headers */ = {isa = PBXBuildFile; fileRef = A7E5C4130E21695700A01D81 /* MLKLexicalEnvironment.h */; }; A7E5C45A0E21695800A01D81 /* MLKLexicalEnvironment.m in Sources */ = {isa = PBXBuildFile; fileRef = A7E5C4140E21695700A01D81 /* MLKLexicalEnvironment.m */; }; - A7E5C45D0E21695800A01D81 /* MLKLispValue.h in Headers */ = {isa = PBXBuildFile; fileRef = A7E5C4170E21695700A01D81 /* MLKLispValue.h */; }; - A7E5C45E0E21695800A01D81 /* MLKLispValue.m in Sources */ = {isa = PBXBuildFile; fileRef = A7E5C4180E21695700A01D81 /* MLKLispValue.m */; }; A7E5C4600E21695800A01D81 /* MLKPackage.h in Headers */ = {isa = PBXBuildFile; fileRef = A7E5C41A0E21695700A01D81 /* MLKPackage.h */; }; A7E5C4610E21695800A01D81 /* MLKPackage.m in Sources */ = {isa = PBXBuildFile; fileRef = A7E5C41B0E21695700A01D81 /* MLKPackage.m */; }; A7E5C4620E21695800A01D81 /* MLKParenReader.h in Headers */ = {isa = PBXBuildFile; fileRef = A7E5C41C0E21695700A01D81 /* MLKParenReader.h */; }; @@ -408,8 +406,6 @@ A7E5C4120E21695700A01D81 /* MLKLexicalContext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MLKLexicalContext.m; sourceTree = ""; }; A7E5C4130E21695700A01D81 /* MLKLexicalEnvironment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MLKLexicalEnvironment.h; sourceTree = ""; }; A7E5C4140E21695700A01D81 /* MLKLexicalEnvironment.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MLKLexicalEnvironment.m; sourceTree = ""; }; - A7E5C4170E21695700A01D81 /* MLKLispValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MLKLispValue.h; sourceTree = ""; }; - A7E5C4180E21695700A01D81 /* MLKLispValue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MLKLispValue.m; sourceTree = ""; }; A7E5C4190E21695700A01D81 /* MLKLowLevelTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MLKLowLevelTests.m; sourceTree = ""; }; A7E5C41A0E21695700A01D81 /* MLKPackage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MLKPackage.h; sourceTree = ""; }; A7E5C41B0E21695700A01D81 /* MLKPackage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MLKPackage.m; sourceTree = ""; }; @@ -595,7 +591,6 @@ A7E5C40F0E21695700A01D81 /* MLKInterpreter.h */, A7E5C4110E21695700A01D81 /* MLKLexicalContext.h */, A7E5C4130E21695700A01D81 /* MLKLexicalEnvironment.h */, - A7E5C4170E21695700A01D81 /* MLKLispValue.h */, A7E5C41A0E21695700A01D81 /* MLKPackage.h */, A7E5C41C0E21695700A01D81 /* MLKParenReader.h */, A7E5C41E0E21695700A01D81 /* MLKQuoteReader.h */, @@ -649,7 +644,6 @@ A7E5C4100E21695700A01D81 /* MLKInterpreter.m */, A7E5C4120E21695700A01D81 /* MLKLexicalContext.m */, A7E5C4140E21695700A01D81 /* MLKLexicalEnvironment.m */, - A7E5C4180E21695700A01D81 /* MLKLispValue.m */, A7E5C4190E21695700A01D81 /* MLKLowLevelTests.m */, A7E5C41B0E21695700A01D81 /* MLKPackage.m */, A7E5C41D0E21695700A01D81 /* MLKParenReader.m */, @@ -694,7 +688,6 @@ A7E5C4550E21695800A01D81 /* MLKInterpreter.h in Headers */, A7E5C4570E21695800A01D81 /* MLKLexicalContext.h in Headers */, A7E5C4590E21695800A01D81 /* MLKLexicalEnvironment.h in Headers */, - A7E5C45D0E21695800A01D81 /* MLKLispValue.h in Headers */, A7E5C4600E21695800A01D81 /* MLKPackage.h in Headers */, A7E5C4620E21695800A01D81 /* MLKParenReader.h in Headers */, A7E5C4640E21695800A01D81 /* MLKQuoteReader.h in Headers */, @@ -807,7 +800,6 @@ A7E5C4560E21695800A01D81 /* MLKInterpreter.m in Sources */, A7E5C4580E21695800A01D81 /* MLKLexicalContext.m in Sources */, A7E5C45A0E21695800A01D81 /* MLKLexicalEnvironment.m in Sources */, - A7E5C45E0E21695800A01D81 /* MLKLispValue.m in Sources */, A7E5C4610E21695800A01D81 /* MLKPackage.m in Sources */, A7E5C4630E21695800A01D81 /* MLKParenReader.m in Sources */, A7E5C4650E21695800A01D81 /* MLKQuoteReader.m in Sources */, -- cgit v1.2.3