Info.plist TDParseKit.steam @@ -3,7 +3,7 @@ TDAssemblyDefaultDelimiter = @"/"; -@interface TDAssembly : CPObject +@implementation TDAssembly : CPObject { CPArray stack; id target; @@ -24,7 +24,7 @@ TDAssemblyDefaultDelimiter = @"/"; - (id)initWithString:(CPString)s { - if self = [super init] { + if (self = [super init]) { stack = []; string = s; } @@ -101,7 +101,7 @@ TDAssemblyDefaultDelimiter = @"/"; - (id)pop { var result = nil; - if (stack.count) { + if (stack.length) { result = [stack lastObject]; [stack removeLastObject]; } @@ -116,10 +116,9 @@ TDAssemblyDefaultDelimiter = @"/"; } - (BOOL)isStackEmpty { - return 0 === stack.count; + return 0 === stack.length; } - - (CPArray)objectsAbove:(id)fence { var result = []; TDAssembly.j @@ -30,8 +30,8 @@ - (id)next { - id obj = [self peek]; - if (obj) { + var obj = [self peek]; + if (obj !== nil && obj !== undefined) { index++; } return obj; TDCharacterAssembly.j @@ -1,59 +1,34 @@ -@import <Foundation/Foundation.j> - -// io -//@import <TDParseKit/TDReader.j> - -// parse -//@import <TDParseKit/TDParser.j> -//@import <TDParseKit/TDAssembly.j> -//@import <TDParseKit/TDSequence.j> -//@import <TDParseKit/TDCollectionParser.j> -//@import <TDParseKit/TDAlternation.j> -//@import <TDParseKit/TDRepetition.j> -//@import <TDParseKit/TDEmpty.j> -//@import <TDParseKit/TDTerminal.j> -//@import <TDParseKit/TDTrack.j> -//@import <TDParseKit/TDTrackException.j> -// factory -//@import <TDParseKit/TDParserFactory.j> - -//chars -//@import <TDParseKit/TDCharacterAssembly.j> -//@import <TDParseKit/TDChar.j> -//@import <TDParseKit/TDSpecificChar.j> -//@import <TDParseKit/TDLetter.j> -//@import <TDParseKit/TDDigit.j> - -// tokens -//@import <TDParseKit/TDToken.j> -//@import <TDParseKit/TDTokenizer.j> -//@import <TDParseKit/TDTokenArraySource.j> -//@import <TDParseKit/TDTokenAssembly.j> -//@import <TDParseKit/TDTokenizerState.j> -//@import <TDParseKit/TDNumberState.j> -//@import <TDParseKit/TDQuoteState.j> -//@import <TDParseKit/TDCommentState.j> -//@import <TDParseKit/TDSingleLineCommentState.j> -//@import <TDParseKit/TDMultiLineCommentState.j> -//@import <TDParseKit/TDSymbolNode.j> -//@import <TDParseKit/TDSymbolRootNode.j> -//@import <TDParseKit/TDSymbolState.j> -//@import <TDParseKit/TDWordState.j> -//@import <TDParseKit/TDWhitespaceState.j> -//@import <TDParseKit/TDWord.j> -//@import <TDParseKit/TDNum.j> -//@import <TDParseKit/TDQuotedString.j> -//@import <TDParseKit/TDSymbol.j> -//@import <TDParseKit/TDComment.j> -//@import <TDParseKit/TDLiteral.j> -//@import <TDParseKit/TDCaseInsensitiveLiteral.j> -//@import <TDParseKit/TDAny.j> +@import <Foundation/Foundation.j> -// ext -//@import <TDParseKit/TDScientificNumberState.j> -//@import <TDParseKit/TDWordOrReservedState.j> -//@import <TDParseKit/TDUppercaseWord.j> -//@import <TDParseKit/TDLowercaseWord.j> -//@import <TDParseKit/TDReservedWord.j> -//@import <TDParseKit/TDNonReservedWord.j> +@import "TDAlternation.j" +@import "TDAssembly.j" +@import "TDCharTerminals.j" +@import "TDCharacterAssembly.j" +@import "TDCollectionParser.j" +@import "TDCommentState.j" +@import "TDEmpty.j" +@import "TDMultiLineCommentState.j" +@import "TDNumberState.j" +@import "TDParser.j" +@import "TDQuoteState.j" +@import "TDReader.j" +@import "TDRepetition.j" +@import "TDScientificNumberState.j" +@import "TDSequence.j" +@import "TDSingleLineCommentState.j" +@import "TDSymbolNode.j" +@import "TDSymbolRootNode.j" +@import "TDSymbolState.j" +@import "TDTerminal.j" +@import "TDToken.j" +@import "TDTokenArraySource.j" +@import "TDTokenAssembly.j" +@import "TDTokenTerminals.j" +@import "TDTokenTerminalsExtensions.j" +@import "TDTokenizer.j" +@import "TDTokenizerState.j" +@import "TDTrack.j" +@import "TDWhitespaceState.j" +@import "TDWordOrReservedState.j" +@import "TDWordState.j" TDParseKit.j @@ -2,7 +2,7 @@ @import <Foundation/Foundation.j> @import "TDAssembly.j" -@interface TDParser : CPObject +@implementation TDParser : CPObject { id assembler; SEL selector; TDParser.j @@ -1,7 +1,7 @@ @import "TDSymbolNode.j" -@interface TDSymbolRootNode : TDSymbolNode +@implementation TDSymbolRootNode : TDSymbolNode { } TDSymbolRootNode.j @@ -53,7 +53,7 @@ [commentState addSingleLineStartSymbol:@"//"]; [commentState addMultiLineStartSymbol:@"/*" endSymbol:@"*/"]; - tokenizerStates = [[NSMutableArray alloc] initWithCapacity:256]; + tokenizerStates = []; [self addTokenizerState:whitespaceState from: 0 to: ' ']; // From: 0 to: 32 From:0x00 to:0x20 [self addTokenizerState:symbolState from: 33 to: 33]; @@ -72,7 +72,7 @@ [self addTokenizerState:symbolState from: 91 to: 96]; [self addTokenizerState:wordState from: 'a' to: 'z']; // From: 97 to:122 From:0x61 to:0x7A [self addTokenizerState:symbolState from: 123 to: 191]; - [self addTokenizerState:wordState from:0xC0 to:0xFF]; // From:192 to:255 From:0xC0 to:0xFF + [self addTokenizerState:wordState from: 192 to: 255]; // From:192 to:255 From:0xC0 to:0xFF } return self; TDTokenizer.j @@ -22,7 +22,7 @@ [self setWordChars:YES from: '-' to: '-']; [self setWordChars:YES from: '_' to: '_']; [self setWordChars:YES from:'\'' to:'\'']; - [self setWordChars:YES from:0xC0 to:0xFF]; + [self setWordChars:YES from: 192 to: 255]; } return self; TDWordState.j 7aa6b9d645eb70535727b688a4720fe26264c85a Ross Boucher ross@280north.com http://github.com/boucher/tdparsekit/commit/94e84d94e42a39d1b2b5e02151efcb11b5285fcf 94e84d94e42a39d1b2b5e02151efcb11b5285fcf 2009-03-06T21:30:21-08:00 2009-03-06T21:30:21-08:00 Fix the build errors. 54a0b9fff7f4b42ba54de91da0d062f58a83672d Ross Boucher ross@280north.com