diff options
| -rw-r--r-- | GNUmakefile | 23 | ||||
| -rw-r--r-- | MLKDynamicContext.m | 6 | ||||
| -rw-r--r-- | MLKQuoteReader.h | 27 | ||||
| -rw-r--r-- | MLKQuoteReader.m | 61 |
4 files changed, 105 insertions, 12 deletions
diff --git a/GNUmakefile b/GNUmakefile index 6e7dd64..a080b3b 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -27,17 +27,18 @@ BUNDLE_NAME = Test ADDITIONAL_OBJCFLAGS = -Wall -ToiletKit_OBJC_FILES = MLKCharacter.m MLKCons.m MLKBinding.m \ - MLKDoubleFloat.m MLKDynamicContext.m \ - MLKEndOfFileError.m MLKEnvironment.m MLKFloat.m \ - MLKInteger.m MLKInterpretedClosure.m \ - MLKInterpreter.m MLKLinkedList.m \ - MLKLexicalContext.m MLKLexicalEnvironment.m \ - MLKLispValue.m MLKPackage.m MLKParenReader.m \ - MLKRatio.m MLKReader.m MLKReadtable.m \ - MLKReaderError.m MLKRoot.m MLKSingleFloat.m \ - MLKStream.m MLKStringInputStream.m \ - MLKStringReader.m MLKSymbol.m MLKThrowException.m \ +ToiletKit_OBJC_FILES = MLKCharacter.m MLKCons.m MLKBinding.m \ + MLKDoubleFloat.m MLKDynamicContext.m \ + MLKEndOfFileError.m MLKEnvironment.m MLKFloat.m \ + MLKInteger.m MLKInterpretedClosure.m \ + MLKInterpreter.m MLKLinkedList.m \ + MLKLexicalContext.m MLKLexicalEnvironment.m \ + MLKLispValue.m MLKPackage.m MLKParenReader.m \ + MLKQuoteReader.m MLKRatio.m MLKReader.m \ + MLKReadtable.m MLKReaderError.m MLKRoot.m \ + MLKSingleFloat.m MLKStream.m \ + MLKStringInputStream.m MLKStringReader.m \ + MLKSymbol.m MLKThrowException.m \ NSObject-MLKPrinting.m NSString-MLKPrinting.m ToiletKit_LDFLAGS = -lgmp #LIBRARIES_DEPEND_UPON diff --git a/MLKDynamicContext.m b/MLKDynamicContext.m index 4261da3..2be64e3 100644 --- a/MLKDynamicContext.m +++ b/MLKDynamicContext.m @@ -30,6 +30,7 @@ #import "MLKLinkedList.h" #import "MLKPackage.h" #import "MLKParenReader.h" +#import "MLKQuoteReader.h" #import "MLKReadtable.h" #import "MLKStringReader.h" #import "MLKSymbol.h" @@ -146,7 +147,6 @@ static MLKDynamicContext *global_context; // [readtable setSyntaxType:TERMINATING_MACRO forCharacter:';']; // [readtable setSyntaxType:NONTERMINATING_MACRO forCharacter:'#']; - // [readtable setSyntaxType:TERMINATING_MACRO forCharacter:'\'']; // [readtable setSyntaxType:TERMINATING_MACRO forCharacter:'`']; // [readtable setSyntaxType:TERMINATING_MACRO forCharacter:',']; @@ -161,6 +161,10 @@ static MLKDynamicContext *global_context; [readtable setMacroFunction:AUTORELEASE([[MLKStringReader alloc] init]) forCharacter:'"']; + [readtable setSyntaxType:TERMINATING_MACRO forCharacter:'\'']; + [readtable setMacroFunction:AUTORELEASE([[MLKQuoteReader alloc] init]) + forCharacter:'\'']; + for (ch = '0'; ch <= '9'; ch++) { [readtable setSyntaxType:CONSTITUENT forCharacter:ch]; diff --git a/MLKQuoteReader.h b/MLKQuoteReader.h new file mode 100644 index 0000000..7813226 --- /dev/null +++ b/MLKQuoteReader.h @@ -0,0 +1,27 @@ +/* -*- mode: objc; coding: utf-8 -*- */ +/* Étoilisp/Mulklisp, 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 <http://www.gnu.org/licenses/>. + */ + +#import "MLKFuncallable.h" +#import "MLKLispValue.h" + +#import <Foundation/NSArray.h> + + +@interface MLKQuoteReader : MLKLispValue <MLKFuncallable> +-(NSArray *) applyToArray:(NSArray *)arguments; +@end diff --git a/MLKQuoteReader.m b/MLKQuoteReader.m new file mode 100644 index 0000000..ad43ac8 --- /dev/null +++ b/MLKQuoteReader.m @@ -0,0 +1,61 @@ +/* -*- mode: objc; coding: utf-8 -*- */ +/* Étoilisp/Mulklisp, 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 <http://www.gnu.org/licenses/>. + */ + +#import "MLKQuoteReader.h" + +#import "MLKCons.h" +#import "MLKDynamicContext.h" +#import "MLKReader.h" +#import "MLKReadtable.h" +#import "MLKPackage.h" +#import "MLKStream.h" +#import "runtime-compatibility.h" +#import "util.h" + + +@implementation MLKQuoteReader +-(NSArray *) applyToArray:(NSArray *)arguments +{ + MLKStream *stream; + MLKReadtable *readtable; + MLKPackage *cl; + unichar ch; + id quoted_form; + + cl = [MLKPackage findPackage:@"COMMON-LISP"]; + + stream = [arguments objectAtIndex:0]; + readtable = [[MLKDynamicContext currentContext] + valueForSymbol:[cl intern:@"*READTABLE*"]]; + + while ([readtable isWhitespaceCharacter:(ch = [stream readChar])]); + + [stream unreadChar:ch]; + + quoted_form = [MLKReader readFromStream:stream + eofError:YES + eofValue:nil + recursive:YES + preserveWhitespace:NO]; + + return [NSArray arrayWithObject: + [MLKCons cons:[cl intern:@"QUOTE"] + with:[MLKCons cons:nullify(quoted_form) + with:nil]]]; +} +@end |