diff -r ebfddc82b8bb -r 439c4057517f compiler/PPCTokenizingConfiguration.st --- a/compiler/PPCTokenizingConfiguration.st Mon Aug 24 22:32:15 2015 +0100 +++ b/compiler/PPCTokenizingConfiguration.st Mon Aug 24 23:42:53 2015 +0100 @@ -11,8 +11,8 @@ !PPCTokenizingConfiguration methodsFor:'compiling'! -arguments: args - super arguments: args. +options: args + super options: args. ! buildClass: clazz @@ -53,11 +53,11 @@ !PPCTokenizingConfiguration methodsFor:'initialization'! fillInClazzes - parserClazz name: arguments parserName. + parserClazz name: options parserName. parserClazz superclass: PPTokenizingCompiledParser. - scannerClazz name: arguments scannerName. - scannerClazz superclass: arguments scannerSuperclass. + scannerClazz name: options scannerName. + scannerClazz superclass: options scannerSuperclass. ! @@ -82,7 +82,7 @@ | rootMethod | rootMethod := PPCTokenizingCodeGenerator new clazz: parserClazz; - arguments: arguments; + options: options; visit: ir. parserClazz propertyAt: #rootMethod put: rootMethod @@ -99,7 +99,7 @@ generator := PPCScannerCodeGenerator new clazz: scannerClazz; - arguments: arguments; + options: options; yourself. fsas do: [ :fsa | generator generate: fsa ]. @@ -109,7 +109,7 @@ | generator | generator := PPCTokenCodeGenerator new clazz: scannerClazz; - arguments: arguments; + options: options; yourself. generator visit: ir. @@ -127,7 +127,7 @@ self flag: 'This phase needs revisit and update'. ir := PPCLL1Visitor new - arguments: arguments; + options: options; visit: ir. self remember: (self copyTree: ir) as: #LL1 @@ -135,11 +135,11 @@ generateParser | parserClass rootMethod | - arguments generate ifFalse: [ ^ self ]. + options generate ifFalse: [ ^ self ]. rootMethod := parserClazz propertyAt: #rootMethod. - parserClazz name: arguments parserName. - parserClazz superclass: arguments parserSuperclass. + parserClazz name: options parserName. + parserClazz superclass: options parserSuperclass. parserClass := self buildClass: parserClazz. parserClass startSymbol: rootMethod methodName. @@ -152,10 +152,10 @@ generateScanner | scanner | - arguments generate ifFalse: [ ^ self ]. + options generate ifFalse: [ ^ self ]. - scannerClazz name: arguments scannerName. - scannerClazz superclass: arguments scannerSuperclass. + scannerClazz name: options scannerName. + scannerClazz superclass: options scannerSuperclass. scanner := (self buildClass: scannerClazz). parserClazz addConstant: scanner as: #scannerClass. @@ -169,10 +169,10 @@ " This will try transform the parser into the tokenizing parser " - arguments tokenize ifFalse: [ ^ self ] . + options tokenize ifFalse: [ ^ self ] . ir := PPCTokenizingVisitor new - arguments: arguments; + options: options; visit: ir.