Squeak-dev April 2011

squeak-dev@lists.squeakfoundation.org

80 participants
387 discussions

[Croquet/Cobalt] Portal
by David Faught 02 Apr '11

02 Apr '11

>>> Em 01-04-2011 16:14, David Faught escreveu: >>> I've been playing the game Portal (http://en.wikipedia.org/wiki/Portal_(video_game)) for the last few months and it has to be one of the best 3D games I have seen, right up there with Spore as far as I am concerned. One of the things that intrigues me about this game is that it looks like it could have been inspired by Croquet, although it wasn't. So now in the next few weeks, a new collaborative version of Portal is coming out, which should prove to be lots of fun. >>> >>> I would think that it would be almost trivial to build the basis of this game in Cobalt/Croquet and thereby have multiplayer capability right in the first iteration. But what kind of puzzles of this type would be interesting for an undetermined number of players greater than 1? This project sounds interesting enough to me that it could be worthwhile to get back into the Croquet/Cobalt community. My concern is that the Cobalt/Croquet base still may not be up to the performance and stability standards that would be needed for a project like this. >>On 01.04.2011, at 21:34, Casimiro de Almeida Barreto wrote: >> Imho, Cobalt lacks some fundamental capabilities to fit the role of RPG/FPS game engine. Among them I would mention the absence of a collision detection system. >On Sat Apr 2 10:20:41 UTC 2011, Bert Freudenberg wrote: >What happened to the sphere-tree used for collision detection in Croquet? Besides, anything lacking could be added if deemed necessary. Hm, I thought that was just used for culling during rendering. Ah but it was something to do with collisions and rays and portals too. Been too long since I looked. Casimiro's point is well taken though, the Portal game and many others are very much more interesting because of their physics engines, which has been a problem for Cobalt/Croquet for a long time. Mostly others and I tried to solve this a few different ways and were not very successfull. It would be very cool to use something like NVidia's PhysX, but that would be too constraining. Did Aik-Siong Koh's group add some physics along with the CAD stuff they did? I guess that the whole physics engine thing would be a pretty large monkey wrench for this project.

1 0

The Trunk: System-ul.429.mcz
by commits＠source.squeak.org 02 Apr '11

02 Apr '11

Levente Uzonyi uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-ul.429.mcz ==================== Summary ==================== Name: System-ul.429 Author: ul Time: 2 April 2011, 2:02:24.802 pm UUID: 2065453c-d28d-d949-9a84-31226ee986bf Ancestors: System-nice.428 - added #newParser and #newCompiler to PseudoClass =============== Diff against System-nice.428 =============== Item was added: + ----- Method: PseudoClass>>newCompiler (in category 'accessing') ----- + newCompiler + "Answer a Compiler suitable for compiling this Behavior" + ^self compilerClass new parser: self newParser! Item was added: + ----- Method: PseudoClass>>newParser (in category 'accessing') ----- + newParser + "Answer a Parser suitable for parsing source code in this Behavior" + ^self parserClass new!

1 0

Scanner changes
by Levente Uzonyi 02 Apr '11

02 Apr '11

Hi, as you probably saw, I pushed my first significant changes to the Compiler package. I hope the compiler experts will take a look at them. While I was changing stuff, I found that some methods of Scanner are unused: #errorMultibyteCharacter #nextLiteral #checkpoint #revertToCheckpoint: They seem to be rather old (~10 years) and I don't think any external code use them. Should we deprecate or just delete them? Cheers, Levente

2 2

Daily Commit Log
by commits＠source.squeak.org 02 Apr '11

02 Apr '11

Changes to Trunk (http://source.squeak.org/trunk.html) in the last 24 hours: http://lists.squeakfoundation.org/pipermail/packages/2011-April/004470.html Name: Tools-eem.304 Ancestors: Tools-nice.303 Debugger: - use the selectedContext's method when browsing senders and implementors. - do not discard changes if the compilation of an edited method fails when in a block. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2011-April/004471.html Name: Collections-ul.436 Ancestors: Collections-nice.435 Improved #beginsWith: and #endsWith: implementations. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2011-April/004472.html Name: Compiler-ul.202 Ancestors: Compiler-nice.201 - reject literals with superfluous # at the beginning, like #$a #123 ##foo ##(1 2 3), etc - introduced #character type for characters instead of #number (part 1) ============================================= http://lists.squeakfoundation.org/pipermail/packages/2011-April/004473.html Name: Compiler-ul.203 Ancestors: Compiler-ul.202 Scanner changes: - introduced #character type for characters instead of #number (part 2) - updated comment - added a new class variable DoItCharacter. All checks for doIt characters (30) should use this. (part 1) - moved TypeTable initialization to a separate method - instance creation uses the common #initialize method instead of #initScanner - removed #initScanner and the class side #new - use #== instead of #= for symbol and character comparison - use #repeat instead of true and #whileTrue for loops - use #and: instead of #& ============================================= http://lists.squeakfoundation.org/pipermail/packages/2011-April/004474.html Name: Compiler-ul.204 Ancestors: Compiler-ul.203 Scanner changes: - added a new class variable DoItCharacter. All checks for doIt characters (30) should use this. (part 2) - reuse buffer in #xDoubleQuote instead of a custom stream ============================================= http://lists.squeakfoundation.org/pipermail/packages/2011-April/004475.html Name: Morphic-ul.527 Ancestors: Morphic-nice.526, Morphic-ul.526 merged ============================================= http://lists.squeakfoundation.org/pipermail/packages/2011-April/004476.html Name: Morphic-ul.526 Ancestors: Morphic-dtl.525 - added an accessor for TextEditor's model - updated TextEditor >> #referencesToIt to find bindings using the model if possible. This makes it possible to find references to variables from a shared pool from a browser. =============================================

1 0

The Trunk: Morphic-ul.526.mcz
by commits＠source.squeak.org 02 Apr '11

02 Apr '11

Levente Uzonyi uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-ul.526.mcz ==================== Summary ==================== Name: Morphic-ul.526 Author: ul Time: 30 March 2011, 4:52:11.048 am UUID: e80a9f4c-0a19-fd4f-9847-2d8834e29558 Ancestors: Morphic-dtl.525 - added an accessor for TextEditor's model - updated TextEditor >> #referencesToIt to find bindings using the model if possible. This makes it possible to find references to variables from a shared pool from a browser. =============== Diff against Morphic-dtl.525 =============== Item was added: + ----- Method: TextEditor>>model (in category 'accessing') ----- + model + + ^model! Item was changed: ----- Method: TextEditor>>referencesToIt (in category 'menu messages') ----- referencesToIt "Open a references browser on the selected symbol" + | symbol environment binding | - | aSymbol | self selectLine. + symbol := self selectedSymbol ifNil: [ ^morph flash ]. + environment := (model respondsTo: #selectedClassOrMetaClass) + ifTrue: [ model selectedClassOrMetaClass ifNil: [ Smalltalk globals ] ] + ifFalse: [ Smalltalk globals ]. + binding := (environment bindingOf: symbol) ifNil: [ ^morph flash ]. + self systemNavigation browseAllCallsOn: binding! - ((aSymbol := self selectedSymbol) == nil or: - [(Smalltalk globals includesKey: aSymbol) not]) - ifTrue: [^ morph flash]. - - self systemNavigation browseAllCallsOn: (Smalltalk globals associationAt: self selectedSymbol)!

1 0

The Trunk: Morphic-ul.527.mcz
by commits＠source.squeak.org 02 Apr '11

02 Apr '11

Levente Uzonyi uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-ul.527.mcz ==================== Summary ==================== Name: Morphic-ul.527 Author: ul Time: 2 April 2011, 1:36:51.526 am UUID: d571ac0f-9ba7-3042-8746-7222f60f5cb5 Ancestors: Morphic-nice.526, Morphic-ul.526 merged =============== Diff against Morphic-nice.526 =============== Item was added: + ----- Method: TextEditor>>model (in category 'accessing') ----- + model + + ^model! Item was changed: ----- Method: TextEditor>>referencesToIt (in category 'menu messages') ----- referencesToIt "Open a references browser on the selected symbol" + | symbol environment binding | - | aSymbol | self selectLine. + symbol := self selectedSymbol ifNil: [ ^morph flash ]. + environment := (model respondsTo: #selectedClassOrMetaClass) + ifTrue: [ model selectedClassOrMetaClass ifNil: [ Smalltalk globals ] ] + ifFalse: [ Smalltalk globals ]. + binding := (environment bindingOf: symbol) ifNil: [ ^morph flash ]. + self systemNavigation browseAllCallsOn: binding! - ((aSymbol := self selectedSymbol) == nil or: - [(Smalltalk globals includesKey: aSymbol) not]) - ifTrue: [^ morph flash]. - - self systemNavigation browseAllCallsOn: (Smalltalk globals associationAt: self selectedSymbol)!

1 0

The Trunk: Compiler-ul.204.mcz
by commits＠source.squeak.org 02 Apr '11

02 Apr '11

Levente Uzonyi uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-ul.204.mcz ==================== Summary ==================== Name: Compiler-ul.204 Author: ul Time: 2 April 2011, 12:53:54.869 am UUID: 9a4461b2-a9c8-1a4e-82bc-40d15ff7ac7c Ancestors: Compiler-ul.203 Scanner changes: - added a new class variable DoItCharacter. All checks for doIt characters (30) should use this. (part 2) - reuse buffer in #xDoubleQuote instead of a custom stream =============== Diff against Compiler-ul.203 =============== Item was changed: ----- Method: Scanner>>scanToken (in category 'expression types') ----- scanToken [(tokenType := self typeTableAt: hereChar) == #xDelimiter] whileTrue: [self step]. "Skip delimiters fast, there almost always is one." + mark := (aheadChar == DoItCharacter and: [source atEnd]) - mark := (aheadChar asciiValue = 30 and: [source atEnd]) ifTrue: [source position] ifFalse: [source position - 1]. (tokenType at: 1) == $x "x as first letter" ifTrue: [self perform: tokenType "means perform to compute token & type"] ifFalse: [token := self step asSymbol "else just unique the first char"]. ^token! Item was changed: ----- Method: Scanner>>step (in category 'expression types') ----- step | c | c := hereChar. hereChar := aheadChar. source atEnd + ifTrue: [aheadChar := DoItCharacter] - ifTrue: [aheadChar := 30 asCharacter "doit"] ifFalse: [aheadChar := source next]. ^c! Item was changed: ----- Method: Scanner>>xDigit (in category 'multi-character scans') ----- xDigit "Form a number." tokenType := #number. + (aheadChar == DoItCharacter and: [source atEnd + and: [source skip: -1. source next ~~ DoItCharacter]]) - (aheadChar asciiValue = 30 and: [source atEnd - and: [source skip: -1. source next asciiValue ~= 30]]) ifTrue: [source skip: -1 "Read off the end last time"] ifFalse: [source skip: -2]. token := (SqNumberParser on: source) failBlock: [:errorString :position | self notify: errorString at:position]; nextNumber. self step; step! Item was changed: ----- Method: Scanner>>xDoubleQuote (in category 'multi-character scans') ----- xDoubleQuote "Collect a comment." "wod 1/10/98: Allow 'empty' comments by testing the first character for $"" rather than blindly adding it to the comment being collected." + + buffer reset. + self step. + [ hereChar == $" ] whileFalse: [ + (hereChar == DoItCharacter and: [ source atEnd ]) ifTrue: [ + ^self offEnd: 'Unmatched comment quote' ]. + buffer nextPut: self step ]. + self step. + (currentComment ifNil: [ + currentComment := OrderedCollection new ]) + add: buffer contents. + self scanToken! - | aStream stopChar | - stopChar := 30 asCharacter. - aStream := WriteStream on: (String new: 200). - self step. - [hereChar == $"] - whileFalse: - [(hereChar == stopChar and: [source atEnd]) - ifTrue: [^self offEnd: 'Unmatched comment quote']. - aStream nextPut: self step.]. - self step. - currentComment == nil - ifTrue: [currentComment := OrderedCollection with: aStream - contents] - ifFalse: [currentComment add: aStream contents]. - self scanToken! Item was changed: ----- Method: Scanner>>xSingleQuote (in category 'multi-character scans') ----- xSingleQuote "String." self step. buffer reset. [hereChar == $' and: [aheadChar == $' ifTrue: [self step. false] ifFalse: [true]]] whileFalse: [buffer nextPut: self step. + (hereChar == DoItCharacter and: [source atEnd]) - (hereChar asciiValue = 30 and: [source atEnd]) ifTrue: [^self offEnd: 'Unmatched string quote']]. self step. token := buffer contents. tokenType := #string!

1 0

The Trunk: Compiler-ul.203.mcz
by commits＠source.squeak.org 02 Apr '11

02 Apr '11

Levente Uzonyi uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-ul.203.mcz ==================== Summary ==================== Name: Compiler-ul.203 Author: ul Time: 2 April 2011, 12:50:39.599 am UUID: 9817f32d-943f-4745-81b8-0ecaeec259d4 Ancestors: Compiler-ul.202 Scanner changes: - introduced #character type for characters instead of #number (part 2) - updated comment - added a new class variable DoItCharacter. All checks for doIt characters (30) should use this. (part 1) - moved TypeTable initialization to a separate method - instance creation uses the common #initialize method instead of #initScanner - removed #initScanner and the class side #new - use #== instead of #= for symbol and character comparison - use #repeat instead of true and #whileTrue for loops - use #and: instead of #& =============== Diff against Compiler-ul.202 =============== Item was changed: Object subclass: #Scanner instanceVariableNames: 'source mark hereChar aheadChar token tokenType currentComment buffer typeTable' + classVariableNames: 'AllowUnderscoreAssignments AllowUnderscoreSelectors DoItCharacter TypeTable' - classVariableNames: 'AllowUnderscoreAssignments AllowUnderscoreSelectors TypeTable' poolDictionaries: '' category: 'Compiler-Kernel'! + !Scanner commentStamp: 'ul 3/27/2011 23:24' prior: 0! + I scan a string or text, picking out Smalltalk syntactic tokens. I look one character ahead. I put each token found into the instance variable, token, and its type (a Symbol) into the variable, tokenType. At the end of the input stream, I pretend to see an endless sequence of special characters called doIts. + + Instance Variables + aheadChar: <Character> + buffer: <WriteStream> + currentComment: <OrderedCollection> + hereChar: <Character> + mark: <Integer> + source: <ReadStream> + token: <Symbol|String|NumberCharacter|Boolean|nil> + tokenType: <Symbol> + typeTable: <Array> + + aheadChar + - the next character in the input stream + + buffer + - a reusable WriteStream on a String which is used for building strings. Shouldn't be used from multiple methods without resetting. + + currentComment + - an OrderedCollection of strings which contain all comments between the current token and the previous token or the beginning of the source. + + hereChar + - the current character + + mark + - the position of the current token in the source stream + + source + - xxxxx + + token + - the current token + + tokenType + - the type of the current token. The possible token types are: #binary, #character, #colon, #doIt, #keyword, #leftArrow, #leftBrace, #leftBracket, #leftParenthesis, #literal, #period, #rightBrace, #rightBracket, #rightParenthesis, #semicolon, #string, #upArrow, #verticalBar, #word, #xBinary, #xColon, #xDelimiter, #xDigit, #xDollar, #xDoubleQuote, #xLetter, #xLitQuote, #xSingleQuote, #xUnderscore + + typeTable + - an array that maps each an evaluable tokenType to each character with asciiValue between 0 and 255! - !Scanner commentStamp: '<historical>' prior: 0! - I scan a string or text, picking out Smalltalk syntactic tokens. I look one character ahead. I put each token found into the instance variable, token, and its type (a Symbol) into the variable, tokenType. At the end of the input stream, I pretend to see an endless sequence of special characters called doits.! Item was changed: ----- Method: Scanner class>>initialize (in category 'initialization') ----- initialize + + self initializeTypeTable. + DoItCharacter := Character value: 30! - | newTable | - newTable := Array new: 256 withAll: #xBinary. "default" - newTable atAll: #(9 10 12 13 32 ) put: #xDelimiter. "tab lf ff cr space" - newTable atAll: ($0 asciiValue to: $9 asciiValue) put: #xDigit. - - 1 to: 255 - do: [:index | - (Character value: index) isLetter - ifTrue: [newTable at: index put: #xLetter]]. - - newTable at: 30 put: #doIt. - newTable at: $" asciiValue put: #xDoubleQuote. - newTable at: $# asciiValue put: #xLitQuote. - newTable at: $$ asciiValue put: #xDollar. - newTable at: $' asciiValue put: #xSingleQuote. - newTable at: $: asciiValue put: #xColon. - newTable at: $( asciiValue put: #leftParenthesis. - newTable at: $) asciiValue put: #rightParenthesis. - newTable at: $. asciiValue put: #period. - newTable at: $; asciiValue put: #semicolon. - newTable at: $[ asciiValue put: #leftBracket. - newTable at: $] asciiValue put: #rightBracket. - newTable at: ${ asciiValue put: #leftBrace. - newTable at: $} asciiValue put: #rightBrace. - newTable at: $^ asciiValue put: #upArrow. - newTable at: $_ asciiValue put: #xUnderscore. - newTable at: $| asciiValue put: #verticalBar. - TypeTable := newTable "bon voyage!!" - - "Scanner initialize"! Item was added: + ----- Method: Scanner class>>initializeTypeTable (in category 'initialization') ----- + initializeTypeTable + "self initializeTypeTable" + + | newTable | + newTable := Array new: 256 withAll: #xBinary. "default" + newTable atAll: #(9 10 12 13 32 ) put: #xDelimiter. "tab lf ff cr space" + newTable atAll: ($0 asciiValue to: $9 asciiValue) put: #xDigit. + + 1 to: 255 + do: [:index | + (Character value: index) isLetter + ifTrue: [newTable at: index put: #xLetter]]. + + newTable at: 30 put: #doIt. + newTable at: $" asciiValue put: #xDoubleQuote. + newTable at: $# asciiValue put: #xLitQuote. + newTable at: $$ asciiValue put: #xDollar. + newTable at: $' asciiValue put: #xSingleQuote. + newTable at: $: asciiValue put: #xColon. + newTable at: $( asciiValue put: #leftParenthesis. + newTable at: $) asciiValue put: #rightParenthesis. + newTable at: $. asciiValue put: #period. + newTable at: $; asciiValue put: #semicolon. + newTable at: $[ asciiValue put: #leftBracket. + newTable at: $] asciiValue put: #rightBracket. + newTable at: ${ asciiValue put: #leftBrace. + newTable at: $} asciiValue put: #rightBrace. + newTable at: $^ asciiValue put: #upArrow. + newTable at: $_ asciiValue put: #xUnderscore. + newTable at: $| asciiValue put: #verticalBar. + TypeTable := newTable "bon voyage!!"! Item was removed: - ----- Method: Scanner class>>new (in category 'instance creation') ----- - new - - ^self basicNew initScanner! Item was removed: - ----- Method: Scanner>>initScanner (in category 'initialize-release') ----- - initScanner - - buffer := WriteStream on: (String new: 40). - typeTable := TypeTable! Item was added: + ----- Method: Scanner>>initialize (in category 'initialize-release') ----- + initialize + + super initialize. + buffer := WriteStream on: (String new: 40). + typeTable := TypeTable! Item was changed: ----- Method: Scanner>>scanAllTokenPositionsInto: (in category 'expression types') ----- scanAllTokenPositionsInto: aBlock "Evaluate aBlock with the start and end positions of all separate non-white-space tokens, including comments." | lastMark | lastMark := 1. [currentComment ifNotNil: [currentComment do: [:cmnt| | idx | idx := source originalContents indexOfSubCollection: cmnt startingAt: lastMark. (idx > 0 and: [idx < mark]) ifTrue: [aBlock value: idx - 1 value: (lastMark := idx + cmnt size)]]. currentComment := nil]. mark ifNotNil: [(token == #- and: [(self typeTableAt: hereChar) == #xDigit]) ifTrue: [| savedMark | savedMark := mark. self scanToken. token := token negated. mark := savedMark]. "Compensate for the fact that the parser uses two character lookahead. Normally we must remove the extra two characters. But this mustn't happen for the last token at the end of stream." aBlock value: mark value: (source atEnd ifTrue: [tokenType := #doIt. "to cause an immediate ^self" source position] ifFalse: [source position - 2])]. (tokenType == #rightParenthesis or: [tokenType == #doIt]) ifTrue: [^self]. tokenType == #leftParenthesis ifTrue: [self scanToken; scanAllTokenPositionsInto: aBlock] ifFalse: + [(tokenType == #word or: [tokenType == #keyword or: [tokenType == #colon]]) - [(tokenType == #word or: [tokenType == #keyword or: [tokenType = #colon]]) ifTrue: [self scanLitWord. token == #true ifTrue: [token := true]. token == #false ifTrue: [token := false]. token == #nil ifTrue: [token := nil]] ifFalse: [(token == #- and: [(self typeTableAt: hereChar) == #xDigit]) ifTrue: [self scanToken. token := token negated]]]. + self scanToken ] repeat! - self scanToken. - true] whileTrue! Item was changed: ----- Method: Scanner>>scanFieldNames: (in category 'public access') ----- scanFieldNames: stringOrArray "Answer an Array of Strings that are the identifiers in the input string, stringOrArray. If passed an Array, just answer with that Array, i.e., assume it has already been scanned." | strm | (stringOrArray isMemberOf: Array) ifTrue: [^stringOrArray]. self scan: (ReadStream on: stringOrArray asString). strm := WriteStream on: (Array new: 10). + [tokenType == #doIt] - [tokenType = #doIt] whileFalse: + [tokenType == #word ifTrue: [strm nextPut: token]. - [tokenType = #word ifTrue: [strm nextPut: token]. self scanToken]. ^strm contents "Scanner new scanFieldNames: 'abc def ghi' ('abc' 'def' 'ghi' )"! Item was changed: ----- Method: Scanner>>scanMessageParts: (in category 'public access') ----- scanMessageParts: sourceString "Return an array of the form (comment keyword comment arg comment keyword comment arg comment) for the message pattern of this method. Courtesy of Ted Kaehler, June 1999" | coll nonKeywords | coll := OrderedCollection new. self scan: (ReadStream on: sourceString asString). nonKeywords := 0. + [tokenType == #doIt] whileFalse: - [tokenType = #doIt] whileFalse: [(currentComment == nil or: [currentComment isEmpty]) ifTrue: [coll addLast: nil] ifFalse: [coll addLast: currentComment removeFirst. [currentComment isEmpty] whileFalse: [coll at: coll size put: (coll last, ' ', currentComment removeFirst)]]. + (token numArgs < 1 or: [token = #| and: [ coll size > 1 ] ]) - (token numArgs < 1 or: [(token = #|) & (coll size > 1)]) ifTrue: [(nonKeywords := nonKeywords + 1) > 1 ifTrue: [^ coll]] "done with header" ifFalse: [nonKeywords := 0]. coll addLast: token. self scanToken]. (currentComment == nil or: [currentComment isEmpty]) ifTrue: [coll addLast: nil] ifFalse: [coll addLast: currentComment removeFirst. [currentComment isEmpty] whileFalse: [ coll at: coll size put: (coll last, ' ', currentComment removeFirst)]]. ^ coll! Item was changed: ----- Method: Scanner>>scanStringStruct (in category 'expression types') ----- scanStringStruct | s | s := WriteStream on: (Array new: 16). + [tokenType == #rightParenthesis or: [tokenType == #doIt]] - [tokenType = #rightParenthesis or: [tokenType = #doIt]] whileFalse: + [tokenType == #leftParenthesis - [tokenType = #leftParenthesis ifTrue: [self scanToken; scanStringStruct] ifFalse: + [tokenType == #word ifFalse: - [tokenType = #word ifFalse: [^self error: 'only words and parens allowed']]. s nextPut: token. self scanToken]. token := s contents! Item was changed: ----- Method: Scanner>>typedScanTokens: (in category 'public access') ----- typedScanTokens: textOrString "Answer an Array that has been tokenized with literals mapped to literals, special characters mapped to symbols and variable names and keywords to strings. This methiod accepts _ (underscore) as an assignment token irrespective of whether the system prefers := as the assignment token." | s | self initScannerForTokenization. self scan: (ReadStream on: textOrString asString). s := WriteStream on: (Array new: 16). + [tokenType == #doIt] whileFalse: - [tokenType = #doIt] whileFalse: [(token == #- + and: [(self typeTableAt: hereChar) == #xDigit]) ifTrue: - and: [(self typeTableAt: hereChar) = #xDigit]) ifTrue: [self scanToken. token := token negated]. s nextPut: token. self scanToken]. ^s contents "Scanner new typedScanTokens: (Scanner sourceCodeAt: #typedScanTokens:)"! Item was changed: ----- Method: Scanner>>xColon (in category 'multi-character scans') ----- xColon "Allow := for assignment" + aheadChar == $= ifTrue: - aheadChar = $= ifTrue: [self step. tokenType := #leftArrow. self step. ^ token := #':=']. "Otherwise, just do what normal scan of colon would do" tokenType := #colon. ^ token := self step asSymbol! Item was changed: ----- Method: Scanner>>xDollar (in category 'multi-character scans') ----- xDollar "Form a Character literal." self step. "pass over $" token := self step. + tokenType := #character! - tokenType := #number "really should be Char, but rest of compiler doesn't know"!

1 0

The Trunk: Compiler-ul.202.mcz
by commits＠source.squeak.org 02 Apr '11

02 Apr '11

Levente Uzonyi uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-ul.202.mcz ==================== Summary ==================== Name: Compiler-ul.202 Author: ul Time: 2 April 2011, 12:44:12.796 am UUID: e7e9151c-c2e9-b14a-bb57-68e6ea8daea5 Ancestors: Compiler-nice.201 - reject literals with superfluous # at the beginning, like #$a #123 ##foo ##(1 2 3), etc - introduced #character type for characters instead of #number (part 1) =============== Diff against Compiler-nice.201 =============== Item was changed: ----- Method: Parser>>pragmaLiteral: (in category 'pragmas') ----- pragmaLiteral: selectorSoFar "Read a pragma literal. As a nicety we allow a variable name (rather than a literal string) as the second argument to primitive:error:" + (hereType == #string or: [ hereType == #literal or: [ hereType == #number or: [ hereType == #character ] ] ]) - (hereType == #string or: [ hereType == #literal or: [ hereType == #number ] ]) ifTrue: [ ^ self advance ]. (here == $# and: [ tokenType == #word ]) ifTrue: [ ^ self advance ]. (here == #- and: [ tokenType == #number ]) ifTrue: [ ^ (self advance; advance) negated ]. (here = 'true' or: [ here = 'false' or: [ here = 'nil' ] ]) ifTrue: [ ^ Compiler evaluate: self advance ]. "This nicety allows one to supply a primitive error temp as a variable name, rather than a string." ((selectorSoFar beginsWith: 'primitive:') and: [(selectorSoFar endsWith: 'error:') and: [hereType == #word]]) ifTrue: [^self advance]. ^self expected: 'Literal constant'! Item was changed: ----- Method: Parser>>primaryExpression (in category 'expression types') ----- primaryExpression hereType == #word ifTrue: [parseNode := self variable. (parseNode isUndefTemp and: [self interactive]) ifTrue: [self queryUndefined]. parseNode nowHasRef. ^ true]. hereType == #leftBracket ifTrue: [self advance. self blockExpression. ^true]. hereType == #leftBrace ifTrue: [self braceExpression. ^true]. hereType == #leftParenthesis ifTrue: [self advance. self expression ifFalse: [^self expected: 'expression']. (self match: #rightParenthesis) ifFalse: [^self expected: 'right parenthesis']. ^true]. + (hereType == #string or: [hereType == #number or: [hereType == #literal or: [hereType == #character]]]) - (hereType == #string or: [hereType == #number or: [hereType == #literal]]) ifTrue: [parseNode := encoder encodeLiteral: self advance. ^true]. (here == #- and: [tokenType == #number and: [1 + hereEnd = mark]]) ifTrue: [self advance. parseNode := encoder encodeLiteral: self advance negated. ^true]. ^false! Item was changed: ----- Method: Scanner>>xLitQuote (in category 'multi-character scans') ----- xLitQuote "Symbols and vectors: #(1 (4 5) 2 3) #ifTrue:ifFalse: #'abc'." | start | start := mark. self step. "litQuote" self scanToken. tokenType == #leftParenthesis ifTrue: [self scanToken; scanLitVec. mark := start + 1. tokenType == #doIt ifTrue: [self offEnd: 'Unmatched parenthesis']] ifFalse: [tokenType == #leftBracket ifTrue: [self scanToken; scanLitByteVec. mark := start + 1. tokenType == #doIt ifTrue: [self offEnd: 'Unmatched bracket']] ifFalse: [(tokenType == #word or: [tokenType == #keyword or: [tokenType == #colon]]) ifTrue: [self scanLitWord] + ifFalse: [tokenType == #string + ifTrue: [token := token asSymbol] + ifFalse: [(tokenType == #binary or: [ tokenType == #verticalBar ]) + ifFalse: [self notify: 'Invalid literal character' at: start + 1]]]]]. - ifFalse: ["tokenType == #literal - ifTrue: [token isSymbol - ifTrue: [""##word"" - token := token - ""May want to move toward ANSI - here ""]] - ifFalse: ["tokenType == #string - ifTrue: [token := token asSymbol]"]"]]]. mark := start. tokenType := #literal "#(Pen) #Pen #'Pen' ##Pen ###Pen "!

1 0

The Trunk: Collections-ul.436.mcz
by commits＠source.squeak.org 01 Apr '11

01 Apr '11

Levente Uzonyi uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-ul.436.mcz ==================== Summary ==================== Name: Collections-ul.436 Author: ul Time: 1 April 2011, 9:25:17.967 pm UUID: f684fc31-c114-bf41-aecb-98f347ccb43e Ancestors: Collections-nice.435 Improved #beginsWith: and #endsWith: implementations. =============== Diff against Collections-nice.435 =============== Item was changed: + ----- Method: ByteString>>beginsWith: (in category 'testing') ----- + beginsWith: sequence + "Answer whether the receiver begins with the given sequence. The comparison is case-sensitive. Overridden for better performance." - ----- Method: ByteString>>beginsWith: (in category 'comparing') ----- - beginsWith: prefix - "Answer whether the receiver begins with the given prefix string. - The comparison is case-sensitive." + | sequenceSize | + sequence class isBytes ifFalse: [ ^super beginsWith: sequence ]. + ((sequenceSize := sequence size) = 0 or: [ self size < sequenceSize ]) ifTrue: [ ^false ]. + "The following method uses a suboptimal algorithm (brute force pattern matching with O(n^2) worst case runtime), but the primitive in C is so fast (assuming large alphabets), that it's still worth using it instead of linear time pure smalltalk implementation. There are some obvious cases when the brute force algorithm is suboptimal, e.g. when the first elements don't match, so let's compare them here before using the primitive." + (self basicAt: 1) = (sequence basicAt: 1) ifFalse: [ ^false ]. + ^(self findSubstring: sequence in: self startingAt: 1 matchTable: CaseSensitiveOrder) = 1! - - "IMPLEMENTATION NOTE: - following algorithm is optimized in primitive only in case self and prefix are bytes like. - Otherwise, if self is wide, then super outperforms, - Otherwise, if prefix is wide, primitive is not correct" - - prefix class isBytes ifFalse: [^super beginsWith: prefix]. - - self size < prefix size ifTrue: [^ false]. - ^ (self findSubstring: prefix in: self startingAt: 1 - matchTable: CaseSensitiveOrder) = 1 - ! Item was changed: + ----- Method: ByteSymbol>>beginsWith: (in category 'testing') ----- + beginsWith: sequence + "Answer whether the receiver begins with the given sequence. The comparison is case-sensitive. Overridden for better performance." - ----- Method: ByteSymbol>>beginsWith: (in category 'comparing') ----- - beginsWith: prefix - "Answer whether the receiver begins with the given prefix string. - The comparison is case-sensitive." + | sequenceSize | + sequence class isBytes ifFalse: [ ^super beginsWith: sequence ]. + ((sequenceSize := sequence size) = 0 or: [ self size < sequenceSize ]) ifTrue: [ ^false ]. + "The following method uses a suboptimal algorithm (brute force pattern matching with O(n^2) worst case runtime), but the primitive in C is so fast (assuming large alphabets), that it's still worth using it instead of linear time pure smalltalk implementation. There are some obvious cases when the brute force algorithm is suboptimal, e.g. when the first elements don't match, so let's compare them here before using the primitive." + (self basicAt: 1) = (sequence basicAt: 1) ifFalse: [ ^false ]. + ^(self findSubstring: sequence in: self startingAt: 1 matchTable: CaseSensitiveOrder) = 1! - - "IMPLEMENTATION NOTE: - following algorithm is optimized in primitive only in case self and prefix are bytes like. - Otherwise, if self is wide, then super outperforms, - Otherwise, if prefix is wide, primitive is not correct" - - prefix class isBytes ifFalse: [^super beginsWith: prefix]. - - self size < prefix size ifTrue: [^ false]. - ^ (self findSubstring: prefix in: self startingAt: 1 - matchTable: CaseSensitiveOrder) = 1 - ! Item was changed: ----- Method: SequenceableCollection>>beginsWith: (in category 'testing') ----- + beginsWith: sequence + "Answer true if the receiver starts with the argument collection." + + | sequenceSize | + ((sequenceSize := sequence size) = 0 or: [ self size < sequence size ]) ifTrue: [ ^false ]. + 1 to: sequenceSize do: [ :index | + (sequence at: index) = (self at: index) ifFalse: [ ^false ] ]. - beginsWith: aSequenceableCollection - "Answer true if the receiver starts with the argument collection" - (aSequenceableCollection isEmpty or: [self size < aSequenceableCollection size]) ifTrue: [^false]. - aSequenceableCollection withIndexDo: [:each :index | (self at: index) ~= each ifTrue: [^false]]. ^true! Item was changed: ----- Method: SequenceableCollection>>endsWith: (in category 'testing') ----- + endsWith: sequence + "Answer true if the receiver ends with the argument collection." + + | sequenceSize offset | + ((sequenceSize := sequence size) = 0 or: [ (offset := self size - sequence size) < 0 ]) ifTrue: [ ^false ]. + 1 to: sequenceSize do: [ :index | + (sequence at: index) = (self at: index + offset) ifFalse: [ ^false ] ]. - endsWith: aSequenceableCollection - "Answer true if the receiver ends with the argument collection" - | start | - (aSequenceableCollection isEmpty or: [self size < aSequenceableCollection size]) ifTrue: [^false]. - start := self size - aSequenceableCollection size. - aSequenceableCollection withIndexDo: [:each :index | (self at: start + index) ~= each ifTrue: [^false]]. ^true! Item was added: + ----- Method: String>>beginsWith: (in category 'testing') ----- + beginsWith: sequence + "Answer true if the receiver starts with the argument collection. The comparison is case-sensitive. Overridden for better performance." + + | sequenceSize | + sequence isString ifFalse: [ ^super beginsWith: sequence ]. + ((sequenceSize := sequence size) = 0 or: [ self size < sequence size ]) ifTrue: [ ^false ]. + 1 to: sequenceSize do: [ :index | + (sequence basicAt: index) = (self basicAt: index) ifFalse: [ ^false ] ]. + ^true! Item was changed: ----- Method: String>>endsWith: (in category 'testing') ----- endsWith: suffix + "Answer true if the receiver ends with the argument collection. The comparison is case-sensitive. Overridden for better performance." - "Answer whether the tail end of the receiver is the same as suffix. - The comparison is case-sensitive." + | offset | + (offset := self size - suffix size) < 0 ifTrue: [ ^false ]. + ^(self findString: suffix startingAt: offset + 1) ~= 0! - | extra | - (extra := self size - suffix size) < 0 ifTrue: [^ false]. - ^ (self findString: suffix startingAt: extra + 1) > 0 - " - 'Elvis' endsWith: 'vis' - "!

1 0

Jump to page: