Squeak-dev January 2013

squeak-dev@lists.squeakfoundation.org

105 participants
332 discussions

The Trunk: Compiler-cwp.247.mcz
by commits＠source.squeak.org 02 Jan '13

02 Jan '13

Colin Putney uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-cwp.247.mcz ==================== Summary ==================== Name: Compiler-cwp.247 Author: cwp Time: 1 January 2013, 6:59:31.461 pm UUID: 22f2cbf1-9186-4d2f-8c9c-dffcc0518ffa Ancestors: Compiler-cwp.246 Environments bootstrap - stage 3 =============== Diff against Compiler-cwp.246 =============== Item was changed: ----- Method: Compiler>>compiledMethodFor:in:to:notifying:ifFail:logged: (in category 'public access') ----- compiledMethodFor: textOrStream in: aContext to: receiver notifying: aRequestor ifFail: failBlock logged: logFlag "Compiles the sourceStream into a parse tree, then generates code into a method, and answers it. If receiver is not nil, then the text can refer to instance variables of that receiver (the Inspector uses this). If aContext is not nil, the text can refer to temporaries in that context (the Debugger uses this). If aRequestor is not nil, then it will receive a notify:at: message before the attempt to evaluate is aborted." + | methodNode method theClass | + theClass := (aContext == nil ifTrue: [receiver] ifFalse: [aContext receiver]) class. + self from: textOrStream class: theClass context: aContext notifying: aRequestor. - | methodNode method | - class := (aContext == nil ifTrue: [receiver] ifFalse: [aContext receiver]) class. - self from: textOrStream class: class context: aContext notifying: aRequestor. methodNode := self translate: sourceStream noPattern: true ifFail: [^failBlock value]. method := self interactive ifTrue: [ methodNode generateWithTempNames ] ifFalse: [methodNode generate]. logFlag ifTrue: [SystemChangeNotifier uniqueInstance evaluated: sourceStream contents context: aContext]. ^method! Item was changed: ----- Method: Compiler>>format:noPattern:ifFail: (in category 'private') ----- format: aStream noPattern: noPattern ifFail: failBlock ^(self parser parse: aStream + cue: cue - class: class noPattern: noPattern - context: context - notifying: requestor ifFail: [^failBlock value]) preen! Item was changed: ----- Method: Compiler>>interactive (in category 'private') ----- interactive "Answer true if compilation is interactive" + ^ cue requestor notNil! - ^requestor notNil! Item was changed: ----- Method: Compiler>>notify:at: (in category 'error handling') ----- notify: aString at: location "Refer to the comment in Object|notify:." + ^ cue requestor == nil - ^requestor == nil ifTrue: [SyntaxErrorNotification + inClass: cue getClass + category: cue category - inClass: class - category: category withCode: (sourceStream contents copyReplaceFrom: location to: location - 1 with: aString) doitFlag: false errorMessage: aString location: location] + ifFalse: [cue requestor - ifFalse: [requestor notify: aString at: location in: sourceStream]! Item was changed: ----- Method: Compiler>>parse:in:notifying: (in category 'public access') ----- parse: textOrStream in: aClass notifying: req "Compile the argument, textOrStream, with respect to the class, aClass, and answer the MethodNode that is the root of the resulting parse tree. Notify the argument, req, if an error occurs. The failBlock is defaulted to an empty block." self from: textOrStream class: aClass context: nil notifying: req. ^self parser parse: sourceStream + cue: cue - class: class noPattern: false - context: context - notifying: requestor ifFail: []! Item was changed: ----- Method: Compiler>>parser (in category 'public access') ----- parser + parser ifNil: [parser := (cue getClass ifNil: [self class]) newParser]. - parser ifNil: [parser := (class ifNil: [self class]) newParser]. ^parser! Item was changed: ----- Method: Compiler>>translate:noPattern:ifFail: (in category 'private') ----- translate: aStream noPattern: noPattern ifFail: failBlock ^self parser parse: aStream + cue: cue - class: class - category: category noPattern: noPattern - context: context - notifying: requestor ifFail: [^failBlock value]! Item was changed: ----- Method: Compiler>>translate:noPattern:ifFail:parser: (in category 'public access') ----- translate: aStream noPattern: noPattern ifFail: failBlock parser: parser | tree | tree := parser parse: aStream + cue: cue - class: class noPattern: noPattern - context: context - notifying: requestor ifFail: [^ failBlock value]. ^ tree! Item was changed: ----- Method: Encoder>>associationForClass (in category 'results') ----- associationForClass | assoc | + assoc := self environment associationAt: cue getClass name ifAbsent: [nil]. + ^assoc value == cue getClass - assoc := self environment associationAt: class name ifAbsent: [nil]. - ^assoc value == class ifTrue: [assoc] + ifFalse: [Association new value: cue getClass]! - ifFalse: [Association new value: class]! Item was changed: ----- Method: Encoder>>bindTemp:in: (in category 'temps') ----- bindTemp: name in: methodSelector "Declare a temporary; error not if a field or class variable." scopeTable at: name ifPresent:[:node| "When non-interactive raise the error only if its a duplicate" (node isTemp or:[requestor interactive]) ifTrue:[^self notify:'Name is already defined'] ifFalse:[Transcript + show: '(', name, ' is shadowed in "' , cue getClass printString , '>>' , methodSelector printString , '")']]. - show: '(', name, ' is shadowed in "' , class printString , '>>' , methodSelector printString , '")']]. ^self reallyBind: name! Item was changed: ----- Method: Encoder>>classEncoding (in category 'private') ----- classEncoding "This is a hack so that the parser may findout what class it was parsing for when it wants to create a syntax error view." + ^ cue getClass! - ^ class! Item was changed: ----- Method: Encoder>>encodeLiteral: (in category 'encoding') ----- encodeLiteral: object ^self name: object + key: (cue literalScannedAs: object notifying: self) - key: (class literalScannedAs: object notifying: self) class: LiteralNode type: LdLitType set: litSet! Item was changed: ----- Method: Encoder>>encodeSelector: (in category 'encoding') ----- + encodeSelector: aSelector - encodeSelector: selector ^self + name: aSelector + key: aSelector - name: selector - key: selector class: SelectorNode type: SendType set: selectorSet! Item was changed: ----- Method: Encoder>>environment (in category 'encoding') ----- environment "Answer the environment of the current compilation context, be it in a class or global (e.g. a workspace)" + ^cue environment! - ^class == nil - ifTrue: [Smalltalk globals] - ifFalse: [class environment]! Item was changed: ----- Method: Encoder>>lookupInPools:ifFound: (in category 'private') ----- lookupInPools: varName ifFound: assocBlock ^Symbol hasInterned: varName ifTrue: [:sym| + (cue bindingOf: sym) - (class bindingOf: sym) ifNil: [^false] ifNotNil: [:assoc| assocBlock value: assoc]]! Item was changed: ----- Method: Encoder>>possibleNamesFor: (in category 'private') ----- possibleNamesFor: proposedName | results | + results := cue getClass + possibleVariablesFor: proposedName + continuedFrom: nil. - results := class possibleVariablesFor: proposedName continuedFrom: nil. ^ proposedName correctAgainst: nil continuedFrom: results. ! Item was changed: ----- Method: Encoder>>possibleVariablesFor: (in category 'private') ----- possibleVariablesFor: proposedVariable | results | results := proposedVariable correctAgainstDictionary: scopeTable continuedFrom: nil. proposedVariable first canBeGlobalVarInitial ifTrue: + [ results := cue getClass possibleVariablesFor: proposedVariable - [ results := class possibleVariablesFor: proposedVariable continuedFrom: results ]. ^ proposedVariable correctAgainst: nil continuedFrom: results. ! Item was changed: ----- Method: Encoder>>undeclared: (in category 'encoding') ----- undeclared: name | sym | requestor interactive ifTrue: [requestor requestor == #error: ifTrue: [requestor error: 'Undeclared']. ^self notify: 'Undeclared']. "Allow knowlegeable clients to squash the undeclared warning if they want (e.g. Diffing pretty printers that are simply formatting text). As this breaks compilation it should only be used by clients that want to discard the result of the compilation. To squash the warning use e.g. [Compiler format: code in: class notifying: nil decorated: false] on: UndeclaredVariableWarning do: [:ex| ex resume: false]" sym := name asSymbol. + ^(UndeclaredVariableWarning new name: name selector: selector class: cue getClass) signal - ^(UndeclaredVariableWarning new name: name selector: selector class: class) signal ifTrue: + [| undeclared | + undeclared := cue environment undeclared. + undeclared at: sym put: nil. + self global: (undeclared associationAt: sym) name: sym] - [Undeclared at: sym put: nil. - self global: (Undeclared associationAt: sym) name: sym] ifFalse: [self global: (Association key: sym) name: sym]! Item was changed: ----- Method: Encoder>>warnAboutShadowed: (in category 'private') ----- warnAboutShadowed: name requestor addWarning: name,' is shadowed'. selector ifNotNil: + [Transcript cr; show: cue getClass name,'>>', selector, '(', name,' is shadowed)']! - [Transcript cr; show: class name,'>>', selector, '(', name,' is shadowed)']! Item was changed: ----- Method: Parser>>ambiguousSelector:inRange: (in category 'error correction') ----- ambiguousSelector: aString inRange: anInterval | correctedSelector userSelection offset intervalWithOffset | self interactive ifFalse: [ "In non interactive mode, compile with backward comapatibility: $- is part of literal argument" Transcript cr; store: encoder classEncoding; nextPutAll:#'>>';store: encoder selector; show: ' would send ' , token , '-'. ^super ambiguousSelector: aString inRange: anInterval]. "handle the text selection" + userSelection := cue requestor selectionInterval. - userSelection := requestor selectionInterval. intervalWithOffset := anInterval first + requestorOffset to: anInterval last + requestorOffset. + cue requestor selectFrom: intervalWithOffset first to: intervalWithOffset last. + cue requestor select. - requestor selectFrom: intervalWithOffset first to: intervalWithOffset last. - requestor select. "Build the menu with alternatives" correctedSelector := AmbiguousSelector signalName: aString inRange: intervalWithOffset. correctedSelector ifNil: [^self fail]. "Execute the selected action" offset := self substituteWord: correctedSelector wordInterval: intervalWithOffset offset: 0. + cue requestor deselect. + cue requestor selectInvisiblyFrom: userSelection first to: userSelection last + offset. - requestor deselect. - requestor selectInvisiblyFrom: userSelection first to: userSelection last + offset. token := (correctedSelector readStream upTo: Character space) asSymbol! Item was changed: ----- Method: Parser>>collectTemporaryDeclarationsFrom: (in category 'error correction') ----- collectTemporaryDeclarationsFrom: methodNode | tempsMarks str | tempsMarks := OrderedCollection new. + str := cue requestor text asString. - str := requestor text asString. methodNode accept: (ParseNodeEnumerator ofBlock: [ :aNode | | mark | (aNode class canUnderstand: #tempsMark) ifTrue: [mark := aNode tempsMark. (mark notNil and: [ mark between: 1 and: str size ] and: [ (str at: mark) = $| ]) ifTrue: [ tempsMarks addLast: aNode ]]]). (tempsMark notNil and: [ tempsMark between: 1 and: str size ] and: [ (str at: tempsMark) = $| ]) ifTrue: [ tempsMarks addLast: self ]. ^ tempsMarks sorted: [ :a :b | a tempsMark > b tempsMark ]! Item was changed: ----- Method: Parser>>correctSelector:wordIntervals:exprInterval:ifAbort: (in category 'error correction') ----- correctSelector: proposedKeyword wordIntervals: spots exprInterval: expInt ifAbort: abortAction "Correct the proposedKeyword to some selector symbol, correcting the original text if such action is indicated. abortAction is invoked if the proposedKeyword couldn't be converted into a valid selector. Spots is an ordered collection of intervals within the test stream of the for each of the keyword parts." | correctSelector userSelection | "If we can't ask the user, assume that the keyword will be defined later" self interactive ifFalse: [^proposedKeyword asSymbol]. + userSelection := cue requestor selectionInterval. + cue requestor selectFrom: spots first first to: spots last last. + cue requestor select. - userSelection := requestor selectionInterval. - requestor selectFrom: spots first first to: spots last last. - requestor select. correctSelector := UnknownSelector name: proposedKeyword. correctSelector ifNil: [^abortAction value]. + cue requestor deselect. + cue requestor selectInvisiblyFrom: userSelection first to: userSelection last. - requestor deselect. - requestor selectInvisiblyFrom: userSelection first to: userSelection last. self substituteSelector: correctSelector keywords wordIntervals: spots. ^(proposedKeyword last ~~ $: and: [correctSelector last == $:]) ifTrue: [abortAction value] ifFalse: [correctSelector]! Item was changed: ----- Method: Parser>>correctVariable:interval: (in category 'error correction') ----- correctVariable: proposedVariable interval: spot "Correct the proposedVariable to a known variable, or declare it as a new variable if such action is requested. We support declaring lowercase variables as temps or inst-vars, and uppercase variables as Globals or ClassVars, depending on whether the context is nil (class=UndefinedObject). Spot is the interval within the test stream of the variable. rr 3/4/2004 10:26 : adds the option to define a new class. " "Check if this is an i-var, that has been corrected already (ugly)" "Display the pop-up menu" | binding userSelection action | (encoder classEncoding instVarNames includes: proposedVariable) ifTrue: [^InstanceVariableNode new name: proposedVariable index: (encoder classEncoding allInstVarNames indexOf: proposedVariable)]. "If we can't ask the user for correction, make it undeclared" self interactive ifFalse: [^encoder undeclared: proposedVariable]. "First check to see if the requestor knows anything about the variable" + (binding := cue requestor bindingOf: proposedVariable) - (binding := requestor bindingOf: proposedVariable) ifNotNil: [^encoder global: binding name: proposedVariable]. + userSelection := cue requestor selectionInterval. + cue requestor selectFrom: spot first to: spot last. + cue requestor select. - userSelection := requestor selectionInterval. - requestor selectFrom: spot first to: spot last. - requestor select. "Build the menu with alternatives" action := UndeclaredVariable signalFor: self name: proposedVariable inRange: spot. action ifNil: [^self fail]. "Execute the selected action" + cue requestor deselect. + cue requestor selectInvisiblyFrom: userSelection first to: userSelection last. - requestor deselect. - requestor selectInvisiblyFrom: userSelection first to: userSelection last. ^action value! Item was changed: ----- Method: Parser>>declareUndeclaredTemps: (in category 'error correction') ----- declareUndeclaredTemps: methodNode "Declare any undeclared temps, declaring them at the smallest enclosing scope." | undeclared userSelection blocksToVars | (undeclared := encoder undeclaredTemps) isEmpty ifTrue: [^self]. + userSelection := cue requestor selectionInterval. - userSelection := requestor selectionInterval. blocksToVars := IdentityDictionary new. undeclared do: [:var| (blocksToVars at: (var tag == #method ifTrue: [methodNode block] ifFalse: [methodNode accept: (VariableScopeFinder new ofVariable: var)]) ifAbsentPut: [SortedCollection new]) add: var name]. (blocksToVars removeKey: methodNode block ifAbsent: []) ifNotNil: [:rootVars| rootVars do: [:varName| self pasteTempAtMethodLevel: varName]]. (blocksToVars keys sorted: [:a :b| a tempsMark < b tempsMark]) do: [:block| | decl | decl := (blocksToVars at: block) reduce: [:a :b| a, ' ', b]. block temporaries isEmpty ifTrue: [self substituteWord: ' | ', decl, ' |' wordInterval: (block tempsMark + 1 to: block tempsMark) offset: requestorOffset] ifFalse: [self substituteWord: decl, ' ' wordInterval: (block tempsMark to: block tempsMark - 1) offset: requestorOffset]]. + cue requestor selectInvisiblyFrom: userSelection first to: userSelection last + requestorOffset. - requestor selectInvisiblyFrom: userSelection first to: userSelection last + requestorOffset. ReparseAfterSourceEditing signal! Item was changed: ----- Method: Parser>>defineClass: (in category 'error correction') ----- defineClass: className "prompts the user to define a new class, asks for it's category, and lets the users edit further the definition" | sym cat def d2 | sym := className asSymbol. cat := UIManager default request: 'Enter class category : ' initialAnswer: self encoder classEncoding theNonMetaClass category. cat ifEmpty: [cat := 'Unknown']. def := 'Object subclass: #' , sym , ' instanceVariableNames: '''' classVariableNames: '''' poolDictionaries: '''' category: ''' , cat , ''''. d2 := UIManager default request: 'Edit class definition : ' initialAnswer: def. d2 ifEmpty: [d2 := def]. Compiler evaluate: d2. ^ encoder + global: (cue environment bindingOf: sym) - global: (Smalltalk globals associationAt: sym) name: sym! Item was changed: ----- Method: Parser>>externalFunctionDeclaration (in category 'primitives') ----- externalFunctionDeclaration "Parse the function declaration for a call to an external library." | descriptorClass callType modifier retType externalName args argType module fn | + descriptorClass := cue environment + valueOf: #ExternalFunction + ifAbsent: [^ false]. - descriptorClass := Smalltalk at: #ExternalFunction ifAbsent:[nil]. - descriptorClass == nil ifTrue:[^false]. callType := descriptorClass callingConventionFor: here. callType == nil ifTrue:[^false]. [modifier := descriptorClass callingConventionModifierFor: token. modifier notNil] whileTrue: [self advance. callType := callType bitOr: modifier]. "Parse return type" self advance. retType := self externalType: descriptorClass. retType == nil ifTrue:[^self expected:'return type']. "Parse function name or index" externalName := here. (self match: #string) ifTrue:[externalName := externalName asSymbol] ifFalse:[(self match:#number) ifFalse:[^self expected:'function name or index']]. (self matchToken: #'(') ifFalse:[^self expected:'argument list']. args := WriteStream on: Array new. [here == #')'] whileFalse:[ argType := self externalType: descriptorClass. argType == nil ifTrue:[^self expected:'argument']. argType isVoid & argType isPointerType not ifFalse:[args nextPut: argType]. ]. (self matchToken: #')') ifFalse:[^self expected:')']. (self matchToken: 'module:') ifTrue:[ module := here. (self match: #string) ifFalse:[^self expected: 'String']. module := module asSymbol]. Smalltalk at: #ExternalLibraryFunction ifPresent:[:xfn| fn := xfn name: externalName module: module callType: callType returnType: retType argumentTypes: args contents. self allocateLiteral: fn. ]. (self matchToken: 'error:') ifTrue: [| errorCodeVariable | errorCodeVariable := here. (hereType == #string or: [hereType == #word]) ifFalse:[^self expected: 'error code (a variable or string)']. self advance. self addPragma: (Pragma keyword: #primitive:error: arguments: (Array with: 120 with: errorCodeVariable)). fn ifNotNil: [fn setErrorCodeName: errorCodeVariable]] ifFalse: [self addPragma: (Pragma keyword: #primitive: arguments: #(120))]. ^true ! Item was changed: ----- Method: Parser>>interactive (in category 'error handling') ----- interactive "Answer true if compilation is interactive" + ^ cue requestor notNil! - ^requestor notNil! Item was changed: ----- Method: Parser>>notify:at: (in category 'error handling') ----- notify: string at: location + cue requestor isNil - requestor isNil ifTrue: [(encoder == self or: [encoder isNil]) ifTrue: [^ self fail "failure setting up syntax error"]. SyntaxErrorNotification inClass: encoder classEncoding + category: cue category - category: category withCode: (source contents asText copyReplaceFrom: location to: location - 1 with: ((string , ' ->') asText allBold addAttribute: TextColor red; yourself)) doitFlag: doitFlag errorMessage: string location: location] + ifFalse: [cue requestor - ifFalse: [requestor notify: string , ' ->' at: location in: source]. ^self fail! Item was changed: ----- Method: Parser>>pasteTempAtMethodLevel: (in category 'error correction') ----- pasteTempAtMethodLevel: name | insertion delta theTextString characterBeforeMark | + theTextString := cue requestor text string. - theTextString := requestor text string. characterBeforeMark := theTextString at: tempsMark-1 ifAbsent: [$ ]. (theTextString at: tempsMark) = $| ifTrue: [ "Paste it before the second vertical bar" insertion := name, ' '. characterBeforeMark isSeparator ifFalse: [insertion := ' ', insertion]. delta := 0. ] ifFalse: [ "No bars - insert some with CR, tab" insertion := '| ' , name , ' |',String cr. delta := 2. "the bar and CR" characterBeforeMark = Character tab ifTrue: [ insertion := insertion , String tab. delta := delta + 1. "the tab" ]. ]. tempsMark := tempsMark + (self substituteWord: insertion wordInterval: (tempsMark to: tempsMark-1) offset: 0) - delta! Item was changed: ----- Method: Parser>>queryUndefined (in category 'error correction') ----- queryUndefined | varStart varName | varName := parseNode key. varStart := self endOfLastToken + requestorOffset - varName size + 1. + cue requestor selectFrom: varStart to: varStart + varName size - 1; select. - requestor selectFrom: varStart to: varStart + varName size - 1; select. (UndefinedVariable name: varName) ifFalse: [^ self fail]! Item was changed: ----- Method: Parser>>removeEmptyTempDeclarationsFrom: (in category 'error correction') ----- removeEmptyTempDeclarationsFrom: methodNode | sourceCode madeChanges tempsMarkHolder | + sourceCode := cue requestor text asString. - sourceCode := requestor text asString. tempsMarkHolder := self collectTemporaryDeclarationsFrom: methodNode. madeChanges := false. tempsMarkHolder do: [ :currentBlock | | tempsMarkChar0 tempsMarkChar1 tempsMarkChar2 end start | tempsMarkChar0 := (sourceCode at: currentBlock tempsMark). tempsMarkChar1 := (sourceCode at: currentBlock tempsMark - 1). tempsMarkChar2 := (sourceCode at: currentBlock tempsMark - 2). tempsMarkChar0 = $| & tempsMarkChar1 = $| ifTrue: [ end := currentBlock tempsMark. start := end - 1]. tempsMarkChar0 = $| & tempsMarkChar1 = $ & tempsMarkChar2 = $| ifTrue: [ end := currentBlock tempsMark. start := end - 2]. start notNil & end notNil ifTrue: [ | lineStart lineEnd | lineStart := 1 + (sourceCode lastIndexOf: Character cr startingAt: start - 1 ifAbsent: [ 0 ]). lineEnd := sourceCode indexOf: Character cr startingAt: end + 1 ifAbsent: [ sourceCode size ]. ((sourceCode indexOfAnyOf: CharacterSet nonSeparators startingAt: lineStart) >= start and: [ (sourceCode indexOfAnyOf: CharacterSet nonSeparators startingAt: end + 1) > lineEnd ]) ifTrue: [ start := lineStart. end := lineEnd ]. + cue requestor correctFrom: start to: end with: ''. - requestor correctFrom: start to: end with: ''. madeChanges := true. currentBlock tempsMark: nil ] ]. madeChanges ifTrue: [ReparseAfterSourceEditing signal]! Item was changed: ----- Method: Parser>>removeUnusedTemporaryNamed:from:lookingAt:movingTempMarksOf: (in category 'error correction') ----- removeUnusedTemporaryNamed: temp from: str lookingAt: currentBlock movingTempMarksOf: someBlocks | start end | end := currentBlock tempsMark - 1. ["Beginning at right temp marker..." start := end - temp size + 1. end < temp size or: [ (str at: start) = $| ] or: [ temp = (str copyFrom: start to: end) and: [ ((str at: start - 1) = $| | (str at: start - 1) isSeparator) & ((str at: end + 1) = $| | (str at: end + 1) isSeparator) ] ]] whileFalse: [ "Search left for the unused temp" + end := cue requestor nextTokenFrom: end direction: -1 ]. - end := requestor nextTokenFrom: end direction: -1 ]. (end < temp size or: [ (str at: start) = $| ]) ifFalse: [(str at: start - 1) = $ ifTrue: [ start := start - 1 ]. + cue requestor correctFrom: start to: end with: ''. - requestor correctFrom: start to: end with: ''. someBlocks do: [ :aBlock | aBlock tempsMark: aBlock tempsMark - (end - start + 1)]. ^true ]. ^false! Item was changed: ----- Method: Parser>>removeUnusedTemps: (in category 'error correction') ----- removeUnusedTemps: methodNode "Scan for unused temp names, and prompt the user about the prospect of removing each one found" | madeChanges tempsMarkHolder unusedTempNames tempMarkHoldersToChange | madeChanges := false. tempMarkHoldersToChange := OrderedCollection new. tempsMarkHolder := self collectTemporaryDeclarationsFrom: methodNode. unusedTempNames := encoder unusedTempNames select: [ :temp | (encoder lookupVariable: temp ifAbsent: [ ]) isUndefTemp and: [ self queriedUnusedTemporaries at: temp ifAbsentPut: [UnusedVariable name: temp] ]]. tempsMarkHolder do: [ :currentBlock | tempMarkHoldersToChange add: currentBlock. unusedTempNames do: [ :temp | (self removeUnusedTemporaryNamed: temp + from: cue requestor text asString - from: requestor text asString lookingAt: currentBlock movingTempMarksOf: tempMarkHoldersToChange) ifTrue: [ madeChanges := true ]]]. madeChanges ifTrue: [ self removeEmptyTempDeclarationsFrom: methodNode. ReparseAfterSourceEditing signal ]! Item was changed: ----- Method: Parser>>substituteWord:wordInterval:offset: (in category 'error correction') ----- substituteWord: correctWord wordInterval: spot offset: o "Substitute the correctSelector into the (presumed interactive) receiver. Update requestorOffset based on the delta size and answer the updated offset." + cue requestor correctFrom: spot first + o to: spot last + o with: correctWord. - requestor correctFrom: spot first + o to: spot last + o with: correctWord. requestorOffset := requestorOffset + correctWord size - spot size. ^o + correctWord size - spot size! Item was changed: ----- Method: Parser>>temporaries (in category 'expression types') ----- temporaries " [ '|' (variable)* '|' ]" | vars theActualText | (self match: #verticalBar) ifFalse: ["no temps" doitFlag ifTrue: [tempsMark := self interactive + ifTrue: [cue requestor selectionInterval first] - ifTrue: [requestor selectionInterval first] ifFalse: [1]. ^ #()]. tempsMark := hereMark "formerly --> prevMark + prevToken". tempsMark > 0 ifTrue: [theActualText := source contents. [tempsMark < theActualText size and: [(theActualText at: tempsMark) isSeparator]] whileTrue: [tempsMark := tempsMark + 1]]. ^ #()]. vars := OrderedCollection new. [hereType == #word] whileTrue: [vars addLast: (encoder bindTemp: self advance)]. (self match: #verticalBar) ifTrue: [tempsMark := prevMark. ^ vars]. ^ self expected: 'Vertical bar' ! Item was changed: ----- Method: Parser>>temporariesIn: (in category 'expression types') ----- temporariesIn: methodSelector " [ '|' (variable)* '|' ]" | vars theActualText | (self match: #verticalBar) ifFalse: ["no temps" doitFlag ifTrue: [tempsMark := self interactive + ifTrue: [cue requestor selectionInterval first] - ifTrue: [requestor selectionInterval first] ifFalse: [1]. ^ #()]. tempsMark := hereMark "formerly --> prevMark + prevToken". tempsMark > 0 ifTrue: [theActualText := source contents. [tempsMark < theActualText size and: [(theActualText at: tempsMark) isSeparator]] whileTrue: [tempsMark := tempsMark + 1]]. ^ #()]. vars := OrderedCollection new. [hereType == #word] whileTrue: [vars addLast: (encoder bindTemp: self advance in: methodSelector)]. (self match: #verticalBar) ifTrue: [tempsMark := prevMark. ^ vars]. ^ self expected: 'Vertical bar'!

1 0

The Trunk: Compiler-cwp.246.mcz
by commits＠source.squeak.org 02 Jan '13

02 Jan '13

Colin Putney uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-cwp.246.mcz ==================== Summary ==================== Name: Compiler-cwp.246 Author: cwp Time: 1 January 2013, 6:57:00.489 pm UUID: 54460c3c-db04-4159-8269-3bd83cc3c9f3 Ancestors: Compiler-cwp.245 Environments bootstrap - stage 2 =============== Diff against Compiler-cwp.245 =============== Item was changed: ----- Method: Compiler>>evaluate:in:to:notifying:ifFail:logged: (in category 'public access') ----- evaluate: textOrStream in: aContext to: receiver notifying: aRequestor ifFail: failBlock logged: logFlag "Compiles the sourceStream into a parse tree, then generates code into a method. If aContext is not nil, the text can refer to temporaries in that context (the Debugger uses this). If aRequestor is not nil, then it will receive a notify:at: message before the attempt to evaluate is aborted. Finally, the compiled method is invoked from here via withArgs:executeMethod:, hence the system no longer creates Doit method litter on errors." + + | theClass | + theClass := ((aContext == nil ifTrue: [receiver] ifFalse: [aContext receiver]) class). + self setCue: (CompilationCue + source: textOrStream + context: aContext + receiver: receiver + class: theClass + environment: theClass environment + category: nil + requestor: aRequestor). + ^ self evaluate: textOrStream cue: cue ifFail: failBlock logged: logFlag! - - | methodNode method value toLog itsSelection itsSelectionString | - class := (aContext == nil ifTrue: [receiver] ifFalse: [aContext receiver]) class. - self from: textOrStream class: class context: aContext notifying: aRequestor. - methodNode := self translate: sourceStream noPattern: true ifFail: [^failBlock value]. - - method := self interactive - ifTrue: [methodNode generateWithTempNames] - ifFalse: [methodNode generate]. - - value := receiver - withArgs: (context ifNil: [#()] ifNotNil: [{context}]) - executeMethod: method. - - logFlag ifTrue: - [toLog := ((requestor respondsTo: #selection) - and:[(itsSelection := requestor selection) notNil - and:[(itsSelectionString := itsSelection asString) isEmptyOrNil not]]) - ifTrue:[itsSelectionString] - ifFalse:[sourceStream contents]. - SystemChangeNotifier uniqueInstance evaluated: toLog context: aContext]. - ^ value! Item was changed: ----- Method: Compiler>>from:class:classified:context:notifying: (in category 'public access') ----- from: textOrStream class: aClass classified: aCategory context: aContext notifying: req + self source: textOrStream. + self setCue: + (CompilationCue + source: textOrStream + context: aContext + class: aClass + category: aCategory + requestor: req)! - - sourceStream := (textOrStream isKindOf: PositionableStream) - ifTrue: [textOrStream] - ifFalse: [ReadStream on: textOrStream asString]. - class := aClass. - context := aContext. - requestor := req. - category := aCategory - ! Item was changed: ----- Method: Compiler>>from:class:context:notifying: (in category 'private') ----- from: textOrStream class: aClass context: aContext notifying: req + self source: textOrStream. + self setCue: + (CompilationCue + source: textOrStream + context: aContext + class: aClass + requestor: req) + ! - - (textOrStream isKindOf: PositionableStream) - ifTrue: [sourceStream := textOrStream] - ifFalse: [sourceStream := ReadStream on: textOrStream asString]. - class := aClass. - context := aContext. - requestor := req! Item was changed: ----- Method: Encoder>>init:context:notifying: (in category 'initialize-release') ----- + init: aClass context: aContext notifying: anObject + | c | + c := CompilationCue + context: aContext + class: aClass + requestor: nil. + self init: c notifying: anObject! - init: aClass context: aContext notifying: req - requestor := req. - class := aClass. - nTemps := 0. - supered := false. - self initScopeAndLiteralTables. - class variablesAndOffsetsDo: - [:variable "<String|CFieldDefinition>" :offset "<Integer|nil>" | - offset isNil - ifTrue: [scopeTable at: variable name put: (FieldNode new fieldDefinition: variable)] - ifFalse: [scopeTable - at: variable - put: (offset >= 0 - ifTrue: [InstanceVariableNode new - name: variable index: offset] - ifFalse: [MaybeContextInstanceVariableNode new - name: variable index: offset negated])]]. - aContext ~~ nil ifTrue: - [| homeNode | - homeNode := self bindTemp: self doItInContextName. - "0th temp = aContext passed as arg" - aContext tempNames withIndexDo: - [:variable :index| - scopeTable - at: variable - put: (MessageAsTempNode new - receiver: homeNode - selector: #namedTempAt: - arguments: (Array with: (self encodeLiteral: index)) - precedence: 3 - from: self)]]. - sourceRanges := Dictionary new: 32. - globalSourceRanges := OrderedCollection new: 32! Item was changed: ----- Method: Encoder>>temps:literals:class: (in category 'initialize-release') ----- temps: tempVars literals: lits class: cl "Initialize this encoder for decompilation." + self setCue: (CompilationCue class: cl). supered := false. - class := cl. nTemps := tempVars size. tempVars do: [:node | scopeTable at: node name put: node]. literalStream := WriteStream on: (Array new: lits size). literalStream nextPutAll: lits. sourceRanges := Dictionary new: 32. globalSourceRanges := OrderedCollection new: 32.! Item was changed: ----- Method: Parser>>initPattern:notifying:return: (in category 'private') ----- initPattern: aString notifying: req return: aBlock | result | self init: (ReadStream on: aString asString) + cue: (CompilationCue source: aString requestor: req) - notifying: req failBlock: [^nil]. encoder := self. result := aBlock value: (self pattern: false inContext: nil). encoder := failBlock := nil. "break cycles" ^result! Item was changed: ----- Method: Parser>>parse:class:category:noPattern:context:notifying:ifFail: (in category 'public access') ----- + parse: sourceStream class: class category: aCategory noPattern: noPattern context: aContext notifying: req ifFail: aBlock + | c | + c := CompilationCue + source: sourceStream + context: aContext + class: class + category: aCategory + requestor: req. + ^ self + parse: sourceStream + cue: c + noPattern: noPattern + ifFail: aBlock! - parse: sourceStream class: class category: aCategory noPattern: noPattern context: ctxt notifying: req ifFail: aBlock - "Answer a MethodNode for the argument, sourceStream, that is the root of - a parse tree. Parsing is done with respect to the argument, class, to find - instance, class, and pool variables; and with respect to the argument, - ctxt, to find temporary variables. Errors in parsing are reported to the - argument, req, if not nil; otherwise aBlock is evaluated. The argument - noPattern is a Boolean that is true if the the sourceStream does not - contain a method header (i.e., for DoIts)." - - | methNode repeatNeeded myStream s p subSelection | - category := aCategory. - myStream := sourceStream. - [repeatNeeded := false. - p := myStream position. - s := myStream upToEnd. - myStream position: p. - subSelection := req notNil and: [req selectionInterval = (p + 1 to: p + s size)]. - self encoder init: class context: ctxt notifying: self. - self init: myStream notifying: req failBlock: [^ aBlock value]. - doitFlag := noPattern. - failBlock:= aBlock. - [methNode := self - method: noPattern - context: ctxt] - on: ReparseAfterSourceEditing - do: [ :ex | - repeatNeeded := true. - myStream := subSelection - ifTrue: - [ReadStream - on: requestor text string - from: requestor selectionInterval first - to: requestor selectionInterval last] - ifFalse: - [ReadStream on: requestor text string]]. - repeatNeeded] whileTrue: - [encoder := self encoder class new]. - methNode sourceText: s. - ^methNode!

1 0

Daily Commit Log
by commits＠source.squeak.org 02 Jan '13

02 Jan '13

Changes to Trunk (http://source.squeak.org/trunk.html) in the last 24 hours: http://lists.squeakfoundation.org/pipermail/packages/2013-January/005607.ht… Name: Kernel-nice.723 Ancestors: Kernel-nice.720 Speed-up LargeInteger asFloat when highBit > Float precision. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2013-January/005608.ht… Name: Kernel-nice.722 Ancestors: Kernel-nice.720 Let 0.0 negated answer Float negativeZero. This let following code work: self assert: (Compiler evaluate: '-0.0') hex = Float negativeZero hex ============================================= http://lists.squeakfoundation.org/pipermail/packages/2013-January/005609.ht… Name: Kernel-nice.724 Ancestors: Kernel-nice.723, Kernel-nice.722 Merge 0.0 negated ============================================= http://lists.squeakfoundation.org/pipermail/packages/2013-January/005610.ht… Name: Kernel-nice.725 Ancestors: Kernel-nice.724 Fast-up large integer modulo operations (\\ and rem:) Implementation notes: Quotient and remainder are computed in a single LargeIntegersPlugin primitive (see digitDiv:neg:) so it's faster to just use it. For LargeInteger with 64 bits or less, LargeInteger primitives (31 32 33) are faster than the plugin (especially in COG) so try them first. This results in a 2x speed up of modulo operations in 4.2.5 VM (whatever bit length), and a 2x speed up in COG VM for bit length > 64. There is a penalty of 15% in COG for #rem: when bit length <= 64 because there is no primitiveRem... Well, I added primitiveRem and it is in both VM branches, but it has no primitive number assigned. If we assign a primitive number (20 ?) we can expect a 5x speed up for rem and bitLength <= 64. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2013-January/005611.ht… Name: ReleaseBuilder-fbs.90 Ancestors: ReleaseBuilder-fbs.89 Basic ReleaseBuilder for Squeak 4.5. Note that its releaseRepository is trunk. This is so that the 4.5 alpha builds will update from the right place. At release time, this must be changed to 'squeak45'. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2013-January/005612.ht… Name: Tests-fbs.178 Ancestors: Tests-ar.176 Now that we're in 4.5, it's time to think about fixing this. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2013-January/005613.ht… Name: Compiler-cwp.245 Ancestors: Compiler-eem.243 Environments bootstrap - stage 1 ============================================= http://lists.squeakfoundation.org/pipermail/packages/2013-January/005614.ht… Name: Kernel-cwp.726 Ancestors: Kernel-nice.725 Environments bootstrap - stage 1 ============================================= http://lists.squeakfoundation.org/pipermail/packages/2013-January/005615.ht… Name: System-cwp.507 Ancestors: System-fbs.506 Environments bootstrap - stage 1 ============================================= http://lists.squeakfoundation.org/pipermail/packages/2013-January/005616.ht… Name: Environments-cwp.7 Ancestors: Environments-cwp.6 Environments bootstrap - stage 1 =============================================

1 0

The Trunk: Environments-cwp.7.mcz
by commits＠source.squeak.org 02 Jan '13

02 Jan '13

Colin Putney uploaded a new version of Environments to project The Trunk: http://source.squeak.org/trunk/Environments-cwp.7.mcz ==================== Summary ==================== Name: Environments-cwp.7 Author: cwp Time: 1 January 2013, 6:53:18.035 pm UUID: de965a02-dce2-4ece-9299-c73b235a251d Ancestors: Environments-cwp.6 Environments bootstrap - stage 1 =============== Diff against Environments-cwp.6 =============== Item was changed: ----- Method: Environment class>>initialize (in category 'as yet unclassified') ----- initialize + self install! - self uninstall!

1 0

The Trunk: System-cwp.507.mcz
by commits＠source.squeak.org 02 Jan '13

02 Jan '13

Colin Putney uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-cwp.507.mcz ==================== Summary ==================== Name: System-cwp.507 Author: cwp Time: 1 January 2013, 6:50:59.79 pm UUID: cba427fe-eae7-47a5-9178-8a188aec1afe Ancestors: System-fbs.506 Environments bootstrap - stage 1 =============== Diff against System-fbs.506 =============== Item was added: + ----- Method: ImageSegment>>scanFrom:environment: (in category 'fileIn/Out') ----- + scanFrom: aStream environment: anEnvironment + ^ self scanFrom: aStream! Item was added: + ----- Method: InternalTranslator>>scanFrom:environment: (in category 'fileIn/fileOut') ----- + scanFrom: aStream environment: anEnvironment + "Read a definition of dictionary. + Make sure current locale corresponds my locale id" + | aString newTranslations assoc currentPlatform | + newTranslations := Dictionary new. + currentPlatform := Locale currentPlatform. + [Locale + currentPlatform: (Locale localeID: id). + [aString := aStream nextChunk withSqueakLineEndings. + aString size > 0] whileTrue: + [assoc := Compiler evaluate: aString environment: anEnvironment. + assoc value = '' + ifTrue: [self class registerPhrase: assoc key] + ifFalse: [newTranslations add: assoc]]] + ensure: [Locale currentPlatform: currentPlatform]. + self mergeTranslations: newTranslations! Item was added: + ----- Method: NaturalLanguageTranslator>>scanFrom:environment: (in category 'fileIn/fileOut') ----- + scanFrom: aStream environment: anEnvironment + "Read a definition of dictionary. + Make sure current locale corresponds my locale id" + | newTranslations currentPlatform | + newTranslations := Dictionary new. + currentPlatform := Locale currentPlatform. + [| aString assoc | + Locale currentPlatform: (Locale localeID: id). + [aString := aStream nextChunk withSqueakLineEndings. + aString size > 0] whileTrue: + [assoc := Compiler evaluate: aString environment: anEnvironment. + assoc value = '' + ifTrue: [self class registerPhrase: assoc key] + ifFalse: [newTranslations add: assoc]]] + ensure: [Locale currentPlatform: currentPlatform]. + self mergeTranslations: newTranslations! Item was added: + ----- Method: ObjectScanner>>scanFrom:environment: (in category 'scanning') ----- + scanFrom: aByteStream environment: anEnvironment + "This should probably be reimplemented using an environment + for compilation. For now, don't change anything" + ^ self scanFrom: aByteStream! Item was added: + ----- Method: PseudoClass>>literalScannedAs:environment:notifying: (in category 'printing') ----- + literalScannedAs: scannedLiteral environment: anEnvironment notifying: requestor + ^ scannedLiteral! Item was added: + ----- Method: SmartRefStream class>>scanFrom:environment: (in category 'i/o') ----- + scanFrom: aByteStream environment: anEnvironment + ^ self scanFrom: aByteStream! Item was added: + ----- Method: SmartRefStream>>scanFrom:environment: (in category 'read write') ----- + scanFrom: aByteStream environment: anEnvironment + ^ self scanFrom: aByteStream! Item was added: + ----- Method: SystemDictionary>>bindingOf:ifAbsent: (in category 'accessing') ----- + bindingOf: varName ifAbsent: aBlock + "SystemDictionary includes Symbols only" + ^super bindingOf: varName asSymbol ifAbsent: aBlock! Item was added: + ----- Method: SystemDictionary>>undeclared (in category 'accessing') ----- + undeclared + ^ self at: #Undeclared!

1 0

The Trunk: Kernel-cwp.726.mcz
by commits＠source.squeak.org 02 Jan '13

02 Jan '13

Colin Putney uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-cwp.726.mcz ==================== Summary ==================== Name: Kernel-cwp.726 Author: cwp Time: 1 January 2013, 6:49:20.367 pm UUID: f9e0f27b-a0ec-4827-a765-1b85d58cbfe8 Ancestors: Kernel-nice.725 Environments bootstrap - stage 1 =============== Diff against Kernel-nice.725 =============== Item was added: + ----- Method: Behavior>>bindingOf:environment: (in category 'testing method dictionary') ----- + bindingOf: varName environment: anEnvironment + ^superclass bindingOf: varName environment: anEnvironment! Item was added: + ----- Method: Behavior>>classBindingOf:environment: (in category 'testing method dictionary') ----- + classBindingOf: varName environment: anEnvironment + ^self bindingOf: varName environment: anEnvironment! Item was added: + ----- Method: Behavior>>literalScannedAs:environment:notifying: (in category 'printing') ----- + literalScannedAs: scannedLiteral environment: anEnvironment notifying: requestor + "Postprocesses a literal scanned by Scanner scanToken (esp. xLitQuote). + If scannedLiteral is not an association, answer it. + Else, if it is of the form: + nil->#NameOfMetaclass + answer nil->theMetaclass, if any has that name, else report an error. + Else, if it is of the form: + #NameOfGlobalVariable->anythiEng + answer the global, class, or pool association with that nameE, if any, else + add it to Undeclared a answer the new Association." + + | key value | + (scannedLiteral isVariableBinding) + ifFalse: [^ scannedLiteral]. + key := scannedLiteral key. + value := scannedLiteral value. + key ifNil: "###<metaclass soleInstance name>" + [(self bindingOf: value environment: anEnvironment) ifNotNil: + [:assoc| + (assoc value isKindOf: Behavior) ifTrue: + [^ nil->assoc value class]]. + requestor notify: 'No such metaclass'. + ^false]. + (key isSymbol) ifTrue: "##<global var name>" + [(self bindingOf: key environment: anEnvironment) ifNotNil: + [:assoc | ^assoc]. + ^ anEnvironment undeclared: key]. + requestor notify: '## must be followed by a non-local variable name'. + ^false + + " Form literalScannedAs: 14 notifying: nil 14 + Form literalScannedAs: #OneBitForm notiEfying: nil OneBitForm + Form literalScannedAs: ##OneBitForm notifying: nil OneBitForm->a Form + Form literalScannedAs: ##Form notifying: nil Form->Form + Form literalScannedAs: ###Form notifying: nil nilE->Form class + "! Item was added: + ----- Method: Categorizer>>scanFrom:environment: (in category 'fileIn/Out') ----- + scanFrom: aStream environment: anEnvironment + ^ self scanFrom: aStream! Item was added: + ----- Method: Class>>bindingOf:environment: (in category 'compiling') ----- + bindingOf: varName environment: anEnvironment + "Answer the binding of some variable resolved in the scope of the receiver" + | aSymbol binding | + aSymbol := varName asSymbol. + + "First look in classVar dictionary." + binding := self classPool bindingOf: aSymbol. + binding ifNotNil:[^binding]. + + "Next look in shared pools." + self sharedPools do:[:pool | + binding := pool bindingOf: aSymbol. + binding ifNotNil:[^binding]. + ]. + + "Next look in declared environment." + binding := anEnvironment bindingOf: aSymbol. + binding ifNotNil:[^binding]. + + "Finally look higher up the superclass chain and fail at the end." + superclass == nil + ifTrue: [^ nil] + ifFalse: [^ superclass bindingOf: aSymbol]. + + ! Item was added: + ----- Method: ClassCategoryReader>>scanFrom:environment: (in category 'fileIn/Out') ----- + scanFrom: aStream environment: anEnvironment + "File in methods from the stream, aStream." + | methodText | + [methodText := aStream nextChunkText. + methodText size > 0] whileTrue: + [class + compile: methodText + environment: anEnvironment + classified: category + withStamp: changeStamp + notifying: nil]! Item was added: + ----- Method: ClassCommentReader>>scanFrom:environment: (in category 'as yet unclassified') ----- + scanFrom: aStream environment: anEnvironment + ^ self scanFrom: aStream! Item was added: + ----- Method: ClassDescription>>compile:environment:classified:withStamp:notifying: (in category 'compiling') ----- + compile: text environment: anEnvironment classified: category withStamp: changeStamp notifying: requestor + ^ self + compile: text + environment: anEnvironment + classified: category + withStamp: changeStamp + notifying: requestor + logSource: self acceptsLoggingOfCompilation! Item was added: + ----- Method: ClassDescription>>compile:environment:classified:withStamp:notifying:logSource: (in category 'compiling') ----- + compile: text environment: anEnvironment classified: category withStamp: changeStamp notifying: requestor logSource: logSource + | methodAndNode context methodNode | + context := CompilationCue + source: text + class: self + environment: anEnvironment + category: category + requestor: requestor. + methodNode := self newCompiler compile: context ifFail: [^ nil]. + methodAndNode := CompiledMethodWithNode + generateMethodFromNode: methodNode + trailer: self defaultMethodTrailer. + + logSource ifTrue: [ + self logMethodSource: text forMethodWithNode: methodAndNode + inCategory: category withStamp: changeStamp notifying: requestor. + ]. + self addAndClassifySelector: methodAndNode selector withMethod: methodAndNode + method inProtocol: category notifying: requestor. + self instanceSide noteCompilationOf: methodAndNode selector meta: self isClassSide. + ^ methodAndNode selector! Item was added: + ----- Method: Metaclass>>bindingOf:environment: (in category 'compiling') ----- + bindingOf: varName environment: anEnvironment + ^ thisClass classBindingOf: varName environment: anEnvironment! Item was added: + ----- Method: UndefinedObject>>literalScannedAs:environment:notifying: (in category 'class hierarchy') ----- + literalScannedAs: scannedLiteral environment: anEnvironment notifying: requestor + ^ scannedLiteral!

1 0

The Trunk: Compiler-cwp.245.mcz
by commits＠source.squeak.org 02 Jan '13

02 Jan '13

Colin Putney uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-cwp.245.mcz ==================== Summary ==================== Name: Compiler-cwp.245 Author: cwp Time: 1 January 2013, 6:47:22.812 pm UUID: ded24bcc-aeee-4129-94fa-2b2da294e964 Ancestors: Compiler-eem.243 Environments bootstrap - stage 1 =============== Diff against Compiler-eem.243 =============== Item was added: + Object subclass: #CompilationCue + instanceVariableNames: 'source context receiver class environment category requestor' + classVariableNames: '' + poolDictionaries: '' + category: 'Compiler-Kernel'! Item was added: + ----- Method: CompilationCue class>>class: (in category 'instance creation') ----- + class: aClass + ^ self + context: nil + class: aClass + requestor: nil! Item was added: + ----- Method: CompilationCue class>>context:class:requestor: (in category 'instance creation') ----- + context: aContext class: aClass requestor: anObject + ^ self + source: nil + context: aContext + receiver: nil + class: aClass + environment: (aClass ifNotNil: [aClass environment]) + category: nil + requestor: anObject! Item was added: + ----- Method: CompilationCue class>>source:class:environment:category:requestor: (in category 'instance creation') ----- + source: aTextOrStream class: aClass environment: anEnvironment category: aString requestor: anObject + ^ self + source: aTextOrStream + context: nil + receiver: nil + class: aClass + environment: anEnvironment + category: aString + requestor: anObject! Item was added: + ----- Method: CompilationCue class>>source:context:class:category:requestor: (in category 'instance creation') ----- + source: aTextOrStream context: aContext class: aClass category: aString requestor: anObject + ^ self + source: aTextOrStream + context: aContext + receiver: (aContext ifNotNil: [aContext receiver]) + class: aClass + environment: (aClass ifNotNil: [aClass environment]) + category: aString + requestor: anObject! Item was added: + ----- Method: CompilationCue class>>source:context:class:requestor: (in category 'instance creation') ----- + source: aTextOrStream context: aContext class: aClass requestor: anObject + ^ self + source: aTextOrStream + context: aContext + class: aClass + category: nil + requestor: anObject! Item was added: + ----- Method: CompilationCue class>>source:context:receiver:class:environment:category:requestor: (in category 'instance creation') ----- + source: aTextOrStream context: aContext receiver: recObject class: aClass environment: anEnvironment category: aString requestor: reqObject + ^ self basicNew + initializeWithSource: aTextOrStream + context: aContext + receiver: recObject + class: aClass + environment: anEnvironment + category: aString + requestor: reqObject! Item was added: + ----- Method: CompilationCue class>>source:environment: (in category 'instance creation') ----- + source: aString environment: anEnvironment + ^ self + source: aString + context: nil + receiver: nil + class: UndefinedObject + environment: anEnvironment + category: nil + requestor: nil! Item was added: + ----- Method: CompilationCue class>>source:requestor: (in category 'instance creation') ----- + source: aTextOrStream requestor: anObject + ^ self + source: aTextOrStream + context: nil + class: nil + requestor: anObject! Item was added: + ----- Method: CompilationCue>>bindingOf: (in category 'binding') ----- + bindingOf: aSymbol + ^ class bindingOf: aSymbol environment: environment! Item was added: + ----- Method: CompilationCue>>category (in category 'accessing') ----- + category + ^ category! Item was added: + ----- Method: CompilationCue>>context (in category 'accessing') ----- + context + ^ context! Item was added: + ----- Method: CompilationCue>>environment (in category 'accessing') ----- + environment + ^ environment! Item was added: + ----- Method: CompilationCue>>getClass (in category 'accessing') ----- + getClass + ^ class! Item was added: + ----- Method: CompilationCue>>initializeWithSource:context:receiver:class:environment:category:requestor: (in category 'initialization') ----- + initializeWithSource: aTextOrString context: aContext receiver: recObject class: aClass environment: anEnvironment category: aString requestor: reqObject + self initialize. + source := aTextOrString isStream ifTrue: [aTextOrString contents] ifFalse: [aTextOrString]. + context := aContext. + receiver := recObject. + class := aClass. + environment := anEnvironment. + category := aString. + requestor := reqObject! Item was added: + ----- Method: CompilationCue>>literalScannedAs:notifying: (in category 'binding') ----- + literalScannedAs: anObject notifying: anEncoder + ^ class literalScannedAs: anObject environment: environment notifying: anEncoder! Item was added: + ----- Method: CompilationCue>>receiver (in category 'accessing') ----- + receiver + ^ receiver! Item was added: + ----- Method: CompilationCue>>requestor (in category 'accessing') ----- + requestor + ^ requestor! Item was added: + ----- Method: CompilationCue>>source (in category 'accessing') ----- + source + ^ source! Item was added: + ----- Method: CompilationCue>>sourceStream (in category 'accessing') ----- + sourceStream + ^ source readStream! Item was changed: Object subclass: #Compiler + instanceVariableNames: 'sourceStream requestor class category context parser cue' - instanceVariableNames: 'sourceStream requestor class category context parser' classVariableNames: '' poolDictionaries: '' category: 'Compiler-Kernel'! + !Compiler commentStamp: 'cwp 12/26/2012 23:17' prior: 0! - !Compiler commentStamp: '<historical>' prior: 0! The compiler accepts Smalltalk source code and compiles it with respect to a given class. The user of the compiler supplies a context so that temporary variables are accessible during compilation. If there is an error, a requestor (usually a kind of StringHolderController) is sent the message notify:at:in: so that the error message can be displayed. If there is no error, then the result of compilation is a MethodNode, which is the root of a parse tree whose nodes are kinds of ParseNodes. The parse tree can be sent messages to (1) generate code for a CompiledMethod (this is done for compiling methods or evaluating expressions); (2) pretty-print the code (for formatting); or (3) produce a map from object code back to source code (used by debugger program-counter selection). See also Parser, Encoder, ParseNode.! Item was added: + ----- Method: Compiler class>>evaluate:environment: (in category 'evaluating') ----- + evaluate: aString environment: anEnvironment + ^ self + evaluate: aString + environment: anEnvironment + logged: false! Item was added: + ----- Method: Compiler class>>evaluate:environment:logged: (in category 'evaluating') ----- + evaluate: aString environment: anEnvironment logged: aBoolean + | cue | + cue := CompilationCue + source: aString + environment: anEnvironment. + + ^ self new + evaluate: aString + cue: cue + ifFail: [^ nil] + logged: aBoolean! Item was added: + ----- Method: Compiler>>compile:ifFail: (in category 'public access') ----- + compile: aCue ifFail: failBlock + "Answer a MethodNode. If the MethodNode can not be created, notify + the requestor in the contxt. If the requestor is nil, evaluate failBlock + instead. The MethodNode is the root of a parse tree. It can be told + to generate a CompiledMethod to be installed in the method dictionary + of the class specified by the context." + + self setCue: aCue. + self source: cue source. + ^self + translate: sourceStream + noPattern: false + ifFail: failBlock! Item was added: + ----- Method: Compiler>>evaluate:cue:ifFail:logged: (in category 'public access') ----- + evaluate: textOrStream cue: aCue ifFail: failBlock logged: logFlag + "Compiles the sourceStream into a parse tree, then generates code into + a method. Finally, the compiled method is invoked from here via withArgs:executeMethod:, hence the system no longer creates Doit method + litter on errors." + + | methodNode method value toLog itsSelection itsSelectionString | + self setCue: aCue. + self source: textOrStream. + methodNode := self translate: sourceStream noPattern: true ifFail: [^failBlock value]. + + method := self interactive + ifTrue: [methodNode generateWithTempNames] + ifFalse: [methodNode generate]. + + value := cue receiver + withArgs: (cue context ifNil: [#()] ifNotNil: [{cue context}]) + executeMethod: method. + + logFlag ifTrue: + [toLog := ((cue requestor respondsTo: #selection) + and:[(itsSelection := cue requestor selection) notNil + and:[(itsSelectionString := itsSelection asString) isEmptyOrNil not]]) + ifTrue:[itsSelectionString] + ifFalse:[sourceStream contents]. + SystemChangeNotifier uniqueInstance evaluated: toLog context: cue context]. + ^ value + ! Item was added: + ----- Method: Compiler>>setCue: (in category 'private') ----- + setCue: aCue + cue := aCue. + + "Set legacy instance variables for methods that don't use cue yet." + requestor := cue requestor. + class := cue getClass. + category := cue category. + context := cue context.! Item was added: + ----- Method: Compiler>>source: (in category 'private') ----- + source: textOrStream + sourceStream := (textOrStream isKindOf: PositionableStream) + ifTrue: [ textOrStream ] + ifFalse: [ ReadStream on: textOrStream asString ]! Item was added: + ----- Method: Dictionary>>bindingOf:ifAbsent: (in category '*Compiler') ----- + bindingOf: varName ifAbsent: aBlock + + ^self associationAt: varName ifAbsent: aBlock! Item was changed: ParseNode subclass: #Encoder + instanceVariableNames: 'scopeTable nTemps supered requestor class selector literalStream selectorSet litIndSet litSet sourceRanges globalSourceRanges addedSelectorAndMethodClassLiterals optimizedSelectors cue' - instanceVariableNames: 'scopeTable nTemps supered requestor class selector literalStream selectorSet litIndSet litSet sourceRanges globalSourceRanges addedSelectorAndMethodClassLiterals optimizedSelectors' classVariableNames: '' poolDictionaries: '' category: 'Compiler-Kernel'! + !Encoder commentStamp: 'cwp 12/26/2012 23:29' prior: 0! - !Encoder commentStamp: '<historical>' prior: 0! I encode names and literals into tree nodes with byte codes for the compiler. Byte codes for literals are not assigned until the tree-sizing pass of the compiler, because only then is it known which literals are actually needed. I also keep track of sourceCode ranges during parsing and code generation so I can provide an inverse map for the debugger.! Item was added: + ----- Method: Encoder>>init:notifying: (in category 'initialize-release') ----- + init: aCue notifying: anObject + "The use of the variable requestor is a bit confusing here. This is + *not* the original requestor, which is available through the cue. + It's the Parser instance that is using the encoder." + + self setCue: aCue. + requestor := anObject. + nTemps := 0. + supered := false. + self initScopeAndLiteralTables. + cue getClass variablesAndOffsetsDo: + [:variable "<String|CFieldDefinition>" :offset "<Integer|nil>" | + offset isNil + ifTrue: [scopeTable at: variable name put: (FieldNode new fieldDefinition: variable)] + ifFalse: [scopeTable + at: variable + put: (offset >= 0 + ifTrue: [InstanceVariableNode new + name: variable index: offset] + ifFalse: [MaybeContextInstanceVariableNode new + name: variable index: offset negated])]]. + cue context ~~ nil ifTrue: + [| homeNode | + homeNode := self bindTemp: self doItInContextName. + "0th temp = aContext passed as arg" + cue context tempNames withIndexDo: + [:variable :index| + scopeTable + at: variable + put: (MessageAsTempNode new + receiver: homeNode + selector: #namedTempAt: + arguments: (Array with: (self encodeLiteral: index)) + precedence: 3 + from: self)]]. + sourceRanges := Dictionary new: 32. + globalSourceRanges := OrderedCollection new: 32 + ! Item was added: + ----- Method: Encoder>>setCue: (in category 'private') ----- + setCue: aCue + cue := aCue. + + "Also set legacy instance variables for methods that + don't use cue yet" + class := cue getClass.! Item was changed: Scanner subclass: #Parser + instanceVariableNames: 'here hereType hereMark hereEnd prevMark prevEnd encoder requestor parseNode failBlock requestorOffset tempsMark doitFlag properties category queriedUnusedTemporaries cue' - instanceVariableNames: 'here hereType hereMark hereEnd prevMark prevEnd encoder requestor parseNode failBlock requestorOffset tempsMark doitFlag properties category queriedUnusedTemporaries' classVariableNames: '' poolDictionaries: '' category: 'Compiler-Kernel'! + !Parser commentStamp: 'cwp 12/26/2012 23:34' prior: 0! - !Parser commentStamp: '<historical>' prior: 0! I parse Smalltalk syntax and create a MethodNode that is the root of the parse tree. I look one token ahead.! Item was added: + ----- Method: Parser>>init:cue:failBlock: (in category 'private') ----- + init: sourceStream cue: aCue failBlock: aBlock + + self setCue: aCue. + failBlock := aBlock. + requestorOffset := 0. + super scan: sourceStream. + prevMark := hereMark := mark. + self advance + ! Item was added: + ----- Method: Parser>>parse:cue:noPattern:ifFail: (in category 'public access') ----- + parse: sourceStream cue: aCue noPattern: noPattern ifFail: aBlock + "Answer a MethodNode for the argument, sourceStream, that is the root of + a parse tree. Parsing is done with respect to the CompilationCue to + resolve variables. Errors in parsing are reported to the cue's requestor; + otherwise aBlock is evaluated. The argument noPattern is a Boolean that is + true if the the sourceStream does not contain a method header (i.e., for DoIts)." + + | methNode repeatNeeded myStream s p subSelection | + myStream := sourceStream. + [repeatNeeded := false. + p := myStream position. + s := myStream upToEnd. + myStream position: p. + subSelection := aCue requestor notNil and: [aCue requestor selectionInterval = (p + 1 to: p + s size)]. + self encoder init: aCue notifying: self. + self init: myStream cue: aCue failBlock: [^ aBlock value]. + doitFlag := noPattern. + failBlock:= aBlock. + [methNode := self method: noPattern context: cue context] + on: ReparseAfterSourceEditing + do: [ :ex | + repeatNeeded := true. + myStream := subSelection + ifTrue: + [ReadStream + on: cue requestor text string + from: cue requestor selectionInterval first + to: cue requestor selectionInterval last] + ifFalse: + [ReadStream on: cue requestor text string]]. + repeatNeeded] whileTrue: + [encoder := self encoder class new]. + methNode sourceText: s. + ^methNode + ! Item was added: + ----- Method: Parser>>setCue: (in category 'private') ----- + setCue: aCue + cue := aCue. + + "Also set legacy variables for methods that don't use cue yet." + requestor := cue requestor. + category := cue category.!

1 0

Re: [squeak-dev] The Trunk: Tests-fbs.178.mcz
by Nicolas Cellier 01 Jan '13

01 Jan '13

Not for faint hearted ;) 2013/1/1 <commits(a)source.squeak.org>: > Frank Shearar uploaded a new version of Tests to project The Trunk: > http://source.squeak.org/trunk/Tests-fbs.178.mcz > > ==================== Summary ==================== > > Name: Tests-fbs.178 > Author: fbs > Time: 1 January 2013, 10:15:57.146 pm > UUID: 3e9553ec-4ba4-4863-b513-f8c864334d67 > Ancestors: Tests-ar.176 > > Now that we're in 4.5, it's time to think about fixing this. > > =============== Diff against Tests-ar.176 =============== > > Item was changed: > ----- Method: ExceptionTests>>expectedFailures (in category 'testing-outer') ----- > expectedFailures > + ^ #().! > - ^ #(testHandlerFromAction).! > >

1 0

The Trunk: Tests-fbs.178.mcz
by commits＠source.squeak.org 01 Jan '13

01 Jan '13

Frank Shearar uploaded a new version of Tests to project The Trunk: http://source.squeak.org/trunk/Tests-fbs.178.mcz ==================== Summary ==================== Name: Tests-fbs.178 Author: fbs Time: 1 January 2013, 10:15:57.146 pm UUID: 3e9553ec-4ba4-4863-b513-f8c864334d67 Ancestors: Tests-ar.176 Now that we're in 4.5, it's time to think about fixing this. =============== Diff against Tests-ar.176 =============== Item was changed: ----- Method: ExceptionTests>>expectedFailures (in category 'testing-outer') ----- expectedFailures + ^ #().! - ^ #(testHandlerFromAction).!

1 0

Cog + CI = win!
by Frank Shearar 01 Jan '13

01 Jan '13

http://squeakci.org/job/SqueakTrunkOnBleedingEdgeCog/3/console shows what happens when one can piggyback on David Lewis' hard work: that's the output you get running Squeak's full test suite on a bleeding-edge Cog VM. frank

1 0

Jump to page: