hg/stx-libcomp: comparison Parser.st

equal deleted inserted replaced

-:0fddfcdca37b
+:7084ae99ced7
 homeContext := aContext methodHome.
 sel := homeContext selector.
 method := homeContext method.
 "/ #doIt needs special handling below
-isDoIt := (sel == #doIt) or:[sel == #doIt:].
+isDoIt := (sel == #'doIt') or:[sel == #'doIt:'].
 aContext isBlockContext ifFalse:[
 isDoIt ifTrue:[
 method notNil ifTrue:[
 "/ special for #doIt
 m := nil.
 how := how , #( MethodVariable ).
 ].
 (classToCompileFor notNil
 and:[classToCompileFor isMeta not
 and:[classToCompileFor isBuiltInClass not
-and:[selector notNil and:[selector ~~ #doIt]]]]) ifTrue:[
+and:[(self isDoIt not)]]]) ifTrue:[
 l := l copyWith:'Instance Variable'.
 how := how copyWith: #InstanceVariable.
 ].
 ] ifFalse:[
 l := l , #( 'New Class' 'Global' 'NameSpace' ).
 how := how , #( NewClass GlobalVariable NameSpace ).
 (classToCompileFor notNil
 and:[classToCompileFor isBuiltInClass not
-and:[selector notNil and:[selector ~~ #doIt]]]) ifTrue:[
+and:[self isDoIt not]]) ifTrue:[
 classToCompileFor isMeta ifTrue:[
 l := l , #('Class Instance Variable').
 how := how , #( ClassInstanceVariable).
 ].
 l := l , #('Class Variable' ).
 how := how , #( ClassVariable).
 ]
 ].
-(selector isNil or:[selector == #doIt]) ifTrue:[
+self isDoIt ifTrue:[
 l size > 0 ifTrue:[
 l := l ,  #( '-' ).
 how := how , #( nil ).
 ].
 l := l , #( 'Workspace Variable' 'DoIt Temporary').
 selectorCheck:aSelectorString for:receiver positions:posVector
 "just a quick check: if a selector is totally unknown as a symbol,
 has the same name as a variable, cannot be understood or is obsolete.
 Simple, but catches many typos"
-|err sym rec names recType selClass newSelector nm nowhereImplemented pos1 pos2|
+|err sym rec names recType selClass newSelector nm nowhereImplemented pos1 pos2 canDefine|
+canDefine := false.
 pos1 := posVector first start.
 pos2 := posVector last stop.
 "
 ].
 subErr notNil ifTrue:[
 err := subErr, ' in this class, superclass chain or all subclasses'
 ] ifFalse:[
 err := err, ' in this class or superclass chain'.
 ].
+canDefine := true.
 ].
 ] ifFalse:[(receiver isUnaryMessage
 and:[receiver selector == #class
 and:[receiver receiver isSelf]]) ifTrue:[
 "its a message to self class - can check this too ..."
 self isSyntaxHighlighter ifTrue:[
 posVector do:[:p |
 self markUnknownIdentifierFrom:(p start) to:(p stop).
 ].
 ].
-err := err , '\\This is a warning from the compiler - the code has not yet been executed/compiled'.
+err := err , '\\This is a warning from the compiler - the code has not yet been executed/compiled.'.
 newSelector := self correctSelector:aSelectorString
 message:err withCRs positions:posVector in:selClass for:receiver.
 "/        self warning:('#' , aSelectorString , '\\' , err) withCRs position:pos1 to:pos2.
 ^ newSelector.
 ].
 method checked:true.
 value := method
 valueWithReceiver:anObject
 arguments:nil  "/ (Array with:m)
-selector:(requestor isNil ifTrue:#doItX ifFalse:#doIt) "/ #doIt:
+selector:(requestor isNil ifTrue:#'doItX' ifFalse:#'doIt') "/ #doIt:
 search:nil
 sender:nil.
 ] ifFalse:[
 self evalExitBlock:[:value | self release. ^ value].
 value := tree evaluate.
 pos1 := tokenPosition.
 pos2 := tokenPosition + tokenName size - 1.
 varName := tokenName.
-((selector isNil or:[selector == #doIt])
+(self isDoIt
 and:[currentBlock isNil
 and:[(requestor askFor:#isWorkspace)
 and:[(autoHow := requestor autoDefineVariables) notNil]]]) ifTrue:[
 var := self variableOrError:varName.
 self nextToken.
 (requestor notNil and:[requestor isStream not]) ifTrue:[
 "/ when parsing doits, this is done twice;
 "/ first, for the parse, then as a block-code
 "/ for the code.
 "/ We only care for WorkspaceVars in doIts
-(selector isNil or:[selector == #doIt]) ifTrue:[
+(self isDoIt) ifTrue:[
 (Workspace notNil
 and:[(holder := Workspace workspaceVariableAt:varName) notNil])
 ifTrue:[
 ^ VariableNode type:#WorkspaceVariable holder:holder name:varName
 ]
 "/ when parsing doits, this is done twice;
 "/ first, for the parse, then as a block-code
 "/ for the code.
 "/ We only care for WorkspaceVars in doIts
-(selector isNil or:[selector == #doIt]) ifTrue:[
+(self isDoIt) ifTrue:[
 (doItTemporaries notNil
 and:[(holder := doItTemporaries at:varName asSymbol ifAbsent:nil) notNil])
 ifTrue:[
 ^ VariableNode type:#DoItTemporary holder:holder name:varName
 ]
 "return true if there was any ST/X style primitive code (valid after parsing)"
 ^ hasPrimitiveCode
 !
+isDoIt
+^ (selector isNil or:[selector == #'doIt' or:[selector == #'doIt:']])
+!
 isSyntaxHighlighter
 ^ false
 !
 lineNumberInfo
 ! !
 !Parser class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libcomp/Parser.st,v 1.400 2003-07-02 10:48:09 cg Exp $'
+^ '$Header: /cvs/stx/stx/libcomp/Parser.st,v 1.401 2003-07-14 07:42:45 cg Exp $'
 ! !
 Parser initialize!

changeset 1440	7084ae99ced7
parent 1439	0fddfcdca37b
child 1441	7ebe4e486524