Squeak-dev August 2015

squeak-dev@lists.squeakfoundation.org

50 participants
218 discussions

The Trunk: Collections-ul.640.mcz
by commits＠source.squeak.org 14 Aug '15

14 Aug '15

Levente Uzonyi uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-ul.640.mcz ==================== Summary ==================== Name: Collections-ul.640 Author: ul Time: 12 August 2015, 10:35:29.572 pm UUID: 1065564d-36c5-43a1-842b-3be19ce91a3e Ancestors: Collections-cmm.639 Character: - sped up various methods by storing and reusing the result of #asInteger in a temporary variable. - sped up #isSeparator by eliminating the last branch. Swapped the tab and cr checks, because source code has more tabs than crs. - unified methods with mixed #asInteger and #asciiValue sends - #isAscii uses #< instead of #between:and:, like #isOctetCharacter does. - #asUnicode uses the same shortcut as #encodedCharSet does - quick return in #printOn: and #storeOn: String: - added identity check (should help with Text comparison) and quick returns to #= - spaceship operator uses #compare: if the argument is a string - added a fast #asSignedInteger implementation Text: - removed the identity check from Text >> #=, because String >> #= does it - the spaceship operator uses String's spaceship operator =============== Diff against Collections-cmm.639 =============== Item was changed: ----- Method: Character>>< (in category 'comparing') ----- < aCharacter "Answer true if the receiver's value < aCharacter's value." + ^self asInteger < aCharacter asInteger! - ^self asInteger < aCharacter asciiValue! Item was changed: ----- Method: Character>><= (in category 'comparing') ----- <= aCharacter "Answer true if the receiver's value <= aCharacter's value." + ^self asInteger <= aCharacter asInteger! - ^self asInteger <= aCharacter asciiValue! Item was changed: ----- Method: Character>>> (in category 'comparing') ----- > aCharacter "Answer true if the receiver's value > aCharacter's value." + ^self asInteger > aCharacter asInteger! - ^self asInteger > aCharacter asciiValue! Item was changed: ----- Method: Character>>>= (in category 'comparing') ----- >= aCharacter "Answer true if the receiver's value >= aCharacter's value." + ^self asInteger >= aCharacter asInteger! - ^self asInteger >= aCharacter asciiValue! Item was changed: ----- Method: Character>>asLowercase (in category 'converting') ----- asLowercase "Answer the receiver's matching lowercase Character." + | integerValue | + (integerValue := self asInteger) > 255 ifFalse: [ - self asInteger > 255 ifFalse: [ | result | + (result := (ClassificationTable at: integerValue + 1) bitAnd: 16rFF) > 0 - (result := (ClassificationTable at: self asInteger + 1) bitAnd: 16rFF) > 0 ifTrue: [ ^self class value: result ] ]. + ^self class value: (self encodedCharSet toLowercaseCode: integerValue)! - ^self class value: (self encodedCharSet toLowercaseCode: self asInteger)! Item was changed: ----- Method: Character>>asUnicode (in category 'converting') ----- asUnicode "Answer the unicode encoding of the receiver" + + | integerValue | + (integerValue := self asInteger) <= 16r3FFFFF ifTrue: [ ^integerValue ]. + ^self encodedCharSet charsetClass convertToUnicode: (integerValue bitAnd: 16r3FFFFF) - self leadingChar = 0 ifTrue: [^ self asInteger]. - ^self encodedCharSet charsetClass convertToUnicode: self charCode ! Item was changed: ----- Method: Character>>asUppercase (in category 'converting') ----- asUppercase "Answer the receiver's matching uppercase Character." + | integerValue | + (integerValue := self asInteger) > 255 ifFalse: [ - self asInteger > 255 ifFalse: [ | result | + (result := ((ClassificationTable at: integerValue + 1) bitShift: -8) bitAnd: 16rFF) > 0 - (result := ((ClassificationTable at: self asInteger + 1) bitShift: -8) bitAnd: 16rFF) > 0 ifTrue: [ ^self class value: result ] ]. + ^self class value: (self encodedCharSet toUppercaseCode: integerValue)! - ^self class value: (self encodedCharSet toUppercaseCode: self asInteger)! Item was changed: ----- Method: Character>>digitValue (in category 'accessing') ----- digitValue "Answer 0-9 if the receiver is $0-$9, 10-35 if it is $A-$Z, and < 0 otherwise. This is used to parse literal numbers of radix 2-36." + | integerValue | + (integerValue := self asInteger) > 16rFF ifTrue: [^self encodedCharSet digitValueOf: self]. + ^DigitValues at: integerValue + 1! - self asInteger > 16rFF ifTrue: [^self encodedCharSet digitValueOf: self]. - ^DigitValues at: 1 + self asInteger! Item was changed: ----- Method: Character>>isAlphaNumeric (in category 'testing') ----- isAlphaNumeric "Answer whether the receiver is a letter or a digit." + | integerValue | + (integerValue := self asInteger) > 255 ifFalse: [ + ^((ClassificationTable at: integerValue + 1) bitAnd: AlphaNumericMask) > 0 ]. - self asInteger > 255 ifFalse: [ ^((ClassificationTable at: self asInteger + 1) bitAnd: AlphaNumericMask) > 0 ]. ^self encodedCharSet isAlphaNumeric: self! Item was changed: ----- Method: Character>>isAscii (in category 'testing') ----- isAscii + + ^self asInteger < 128! - ^ self asInteger between: 0 and: 127! Item was changed: ----- Method: Character>>isDigit (in category 'testing') ----- isDigit + | integerValue | + (integerValue := self asInteger) > 255 ifFalse: [ + ^((ClassificationTable at: integerValue + 1) bitAnd: DigitBit) > 0 ]. - self asInteger > 255 ifFalse: [ ^((ClassificationTable at: self asInteger + 1) bitAnd: DigitBit) > 0 ]. ^self encodedCharSet isDigit: self. ! Item was changed: ----- Method: Character>>isLetter (in category 'testing') ----- isLetter + | integerValue | + (integerValue := self asInteger) > 255 ifFalse: [ + ^((ClassificationTable at: integerValue + 1) bitAnd: LetterMask) > 0 ]. - self asInteger > 255 ifFalse: [ ^((ClassificationTable at: self asInteger + 1) bitAnd: LetterMask) > 0 ]. ^self encodedCharSet isLetter: self! Item was changed: ----- Method: Character>>isLowercase (in category 'testing') ----- isLowercase + | integerValue | + (integerValue := self asInteger) > 255 ifFalse: [ + ^((ClassificationTable at: integerValue + 1) bitAnd: LowercaseBit) > 0 ]. - self asInteger > 255 ifFalse: [ ^((ClassificationTable at: self asInteger + 1) bitAnd: LowercaseBit) > 0 ]. ^self encodedCharSet isLowercase: self. ! Item was changed: ----- Method: Character>>isSeparator (in category 'testing') ----- isSeparator "Answer whether the receiver is one of the separator characters--space, cr, tab, line feed, or form feed." + | integerValue | + (integerValue := self asInteger) = 32 ifTrue: [ ^true ]. "space" + integerValue = 9 ifTrue: [ ^true ]. "tab" + integerValue = 13 ifTrue: [ ^true ]. "cr" + integerValue = 10 ifTrue: [ ^true ]. "line feed" + ^integerValue = 12 "form feed"! - self asInteger = 32 ifTrue: [^true]. "space" - self asInteger = 13 ifTrue: [^true]. "cr" - self asInteger = 9 ifTrue: [^true]. "tab" - self asInteger = 10 ifTrue: [^true]. "line feed" - self asInteger = 12 ifTrue: [^true]. "form feed" - ^false! Item was changed: ----- Method: Character>>isUppercase (in category 'testing') ----- isUppercase + | integerValue | + (integerValue := self asInteger) > 255 ifFalse: [ + ^((ClassificationTable at: integerValue + 1) bitAnd: UppercaseBit) > 0 ]. - self asInteger > 255 ifFalse: [ ^((ClassificationTable at: self asInteger + 1) bitAnd: UppercaseBit) > 0 ]. ^self encodedCharSet isUppercase: self. ! Item was changed: ----- Method: Character>>printOn: (in category 'printing') ----- printOn: aStream + + | integerValue | + ((integerValue := self asInteger) > 32 and: [ integerValue ~= 127 ]) ifTrue: [ + aStream nextPut: $$; nextPut: self. + ^self ]. + (self class constantNameFor: self) + ifNotNil: [ :name | aStream nextPutAll: self class name; space; nextPutAll: name ] + ifNil: [ aStream nextPutAll: self class name; nextPutAll: ' value: '; print: integerValue ]! - | name | - (self asInteger > 32 and: [self asInteger ~= 127]) - ifTrue: [ aStream nextPut: $$; nextPut: self ] - ifFalse: [ - name := self class constantNameFor: self. - name notNil - ifTrue: [ aStream nextPutAll: self class name; space; nextPutAll: name ] - ifFalse: [ aStream nextPutAll: self class name; nextPutAll: ' value: '; print: self asInteger ] ].! Item was changed: ----- Method: Character>>shouldBePrintedAsLiteral (in category 'testing') ----- shouldBePrintedAsLiteral + | integerValue | + ^((integerValue := self asInteger) between: 33 and: 255) and: [self asInteger ~= 127]! - ^(self asInteger between: 33 and: 255) and: [self asInteger ~= 127]! Item was changed: ----- Method: Character>>storeBinaryOn: (in category 'printing') ----- storeBinaryOn: aStream "Store the receiver on a binary (file) stream" + | integerValue | + (integerValue := self asInteger) < 256 - self asInteger < 256 ifTrue: [ aStream basicNextPut: self ] + ifFalse: [ aStream nextInt32Put: integerValue ]! - ifFalse: [ aStream nextInt32Put: self asInteger ]! Item was changed: ----- Method: Character>>storeDataOn: (in category 'object fileIn') ----- storeDataOn: aDataStream " Store characters in reference-like way, with value like instvar. This is compatible with various Squeak Memory Systems" aDataStream beginInstance: self class + size: 1; + nextPut: self asInteger! - size: 1. - aDataStream nextPut: self asInteger.! Item was changed: ----- Method: Character>>storeOn: (in category 'printing') ----- storeOn: aStream "Common character literals are preceded by '$', however special need to be encoded differently: for some this might be done by using one of the shortcut constructor methods for the rest we have to create them by ascii-value." + self shouldBePrintedAsLiteral ifTrue: [ + aStream nextPut: $$; nextPut: self. + ^self ]. + (self class constantNameFor: self) ifNotNil: [ :name | + aStream nextPutAll: self class name; space; nextPutAll: name. + ^self ]. + aStream + nextPut: $(; nextPutAll: self class name; + nextPutAll: ' value: '; print: self asInteger; nextPut: $)! - | name | - self shouldBePrintedAsLiteral - ifTrue: [ aStream nextPut: $$; nextPut: self ] - ifFalse: [ - name := self class constantNameFor: self. - name notNil - ifTrue: [ aStream nextPutAll: self class name; space; nextPutAll: name ] - ifFalse: [ - aStream - nextPut: $(; nextPutAll: self class name; - nextPutAll: ' value: '; print: self asInteger; nextPut: $) ] ].! Item was changed: ----- Method: CharacterSet>>includes: (in category 'collection ops') ----- includes: aCharacter + + | index | + (index := aCharacter asInteger + 1) > 256 ifTrue: [ ^false ]. + ^(map at: index) > 0! - aCharacter asciiValue >= 256 - ifTrue: ["Guard against wide characters" - ^false]. - ^(map at: aCharacter asciiValue + 1) > 0! Item was changed: ----- Method: String>><=> (in category 'sorting') ----- <=> aCharacterArray "Return a collation order of -1, 0, or 1, indicating whether I should be collated before the receiver, am equal, or after. See also: http://en.wikipedia.org/wiki/Spaceship_operator" + aCharacterArray isString ifTrue: [ ^(self compare: aCharacterArray) - 2 ]. + self = aCharacterArray ifTrue: [ ^0 ]. + self < aCharacterArray ifTrue: [ ^-1 ]. + ^1! - ^self = aCharacterArray - ifTrue: [ 0 ] - ifFalse: [self < aCharacterArray - ifTrue: [ -1 ] - ifFalse: [ 1 ]]! Item was changed: ----- Method: String>>= (in category 'comparing') ----- = aString "Answer whether the receiver sorts equally as aString. The collation order is simple ascii (with case differences)." + self == aString ifTrue: [ ^true ]. + aString isString ifFalse: [ ^false ]. + self size = aString size ifFalse: [ ^false ]. - (aString isString - and: [self size = aString size]) ifFalse: [^ false]. ^ (self compare: self with: aString collated: AsciiOrder) = 2! Item was changed: ----- Method: String>>asSignedInteger (in category 'converting') ----- asSignedInteger "Returns the first signed integer it can find or nil." + | result character index negative | + (self at: 1) isDigit + ifTrue: [ index := 1 ] + ifFalse: [ + index := self findFirst: [ :char | char isDigit ]. + index = 0 ifTrue: [ ^nil ] ]. + negative := index > 1 and: [ (self at: index - 1) == $- ]. + result := 0. + [ index <= self size and: [ (character := self at: index) isDigit ] ] whileTrue: [ + result := result * 10 + character asciiValue - 48 "$0 asciiValue". + index := index + 1 ]. + negative ifTrue: [ ^0 - result ]. + ^result + ! - | start | - start := self findFirst: [:char | char isDigit]. - start isZero ifTrue: [^ nil]. - (start > 1 and: [self at: start - 1]) = $- ifTrue: [start := start - 1]. - ^ Integer readFrom: (ReadStream on: self from: start to: self size)! Item was changed: ----- Method: Text>><=> (in category 'sorting') ----- <=> aCharacterArray "Return a collation order of -1, 0, or 1, indicating whether I should be collated before the receiver, am equal, or after. See also: http://en.wikipedia.org/wiki/Spaceship_operator" + aCharacterArray isString ifTrue: [ ^string <=> aCharacterArray ]. + ^string <=> aCharacterArray asString! - ^string = aCharacterArray - ifTrue: [ 0 ] - ifFalse: [string < aCharacterArray asString - ifTrue: [ -1 ] - ifFalse: [ 1 ]]! Item was changed: ----- Method: Text>>= (in category 'comparing') ----- = other "Am I equal to the other Text or String? ***** Warning ***** Two Texts are considered equal if they have the same characters in them. They might have completely different emphasis, fonts, sizes, text actions, or embedded morphs. If you need to find out if one is a true copy of the other, you must do (text1 = text2 and: [text1 runs = text2 runs])." + other isText ifTrue: [ ^string = other string ]. + other isString ifTrue: [ ^string = other ]. + ^false! - other isText ifTrue: ["This is designed to run fast even for megabytes" - ^ string == other string or: [string = other string]]. - other isString ifTrue: [^ string == other or: [string = other]]. - ^ false!

1 0

[ANN] Magma 1.5
by Chris Muller 14 Aug '15

14 Aug '15

I am pleased to announce version 1.5 of Magma for Squeak 5, now available on SqueakMap. Magma allows multiple Squeak images to collaborate on a single, large object model, with the robustness and control expected from a database. It offers the most transparent db access possible for Smalltalk, affording the user the ability to develop complex, performant designs, iteratively, on-the-fly. It has been designed for "continuous flow" development, the way Smalltalkers like and expect to work. For example, I could have connections open to 3 separate databases, open transactions in any of them, and having restructured a class hierarchy in the model, and stepping through the debugger when that "final boarding call" for my flight is announced. Thanks to the image, this scenario has never been a problem for Smalltalkers and Magma is deliberate to ensure this flow is maintained. Once at 10K feet, I can resume stepping through that same debugger within 5 seconds of restarting the image, DB connections intact, commit my transactions when I'm ready, done. Magma handles every aspect of that use-case correctly even in multi-user environments, and has so many safety and integrity features, it is the safest way to develop and keep a model in Squeak. This release coincides with the release of Squeak 5, and has many improvements and fixes over Magma 1.4. Detailed notes about these improvements are available at http://wiki.squeak.org/squeak/6209. - Chris

5 6

Suggestion for a performance analysis project, suitable for a masters student
by Eliot Miranda 13 Aug '15

13 Aug '15

Hi All, I had occasion to compare VW (vw7.7nc) and Spur recently and was pleasantly surprised to see that Spur is on average -40% faster than VW on a large subset of the benchmarks from the shootout (I didn't include three because of Regex syntax issues). Now Spur gets some of its speed from having direct pointers vs VisualWorks' object header/table indirection, but it could get other speedups from various other differences. It would be great to know exactly how much speedup comes from what, and indeed how much cost Sour pays for its lazy become:. I'd like to propose a project to exactly determine the costs of an explicit read barrier and of lazy forwarding compared to no check at all. Spur, part of VMMaker.oscog, is implemented by a hierarchy of classes that implement a 32-bit and a 64-bit memory manager. Spur is a sibling to the old ObjectMemory class that implements the V3 object representation. The current Spur does "lazy forwarding" where two objects are become by cloning each object, making the old versions point to the opposite copy, and relying on send-time checks to lazily follow forwarding pointers when sends to forwarded objects fail a message lookup. The project would create two additional variations on Spur, both of which dispense with the lazy check. One would explicitly test for a forwarding pointers on every access, and one would never check, not need send-time checking either and would reimplement become: like the old ObjectMemory, by scanning the entire heap to exchange all references. These variations could be implemented as subclasses or siblings of Spur. The project isn't trivial because it also means making changes to the JIT, albeit within its framework for multiple object representations. Because this is probably some months' work I can't do it myself but I'm extremely interested in the results and I think it would make a really good paper, e.g. for ISMM, or one of the dynamic language workshops. If what I've said makes any sense at all to any academics out there who are looking for a challenging but nicely contained and far from open ended Masters project then please get in touch and we can see if we can take this any further. _,,,^..^,,,_ best, Eliot

2 2

Re: [Pharo-dev] [BUG]: Pharo 4.0: Pull Up Inst Var Loses Data
by Eliot Miranda 13 Aug '15

13 Aug '15

Hi Sean, On Thu, Aug 13, 2015 at 8:58 AM, Sean P. DeNigris <sean(a)clipperadams.com> wrote: > This is a nasty one. If you pull up an inst var via Nautilus menus, any > data > in that variable is nil-ed out in all instances. Ouch, not fun :/ Anyone > else experience this? Same on 5.0? > This is a bug in as many refactoring implementations as I'm aware of. Essentially pull up ivar and push down ivar are decomposed into separate class modifications, and with this approach, without some effort taken at a higher level, ivar state is going to get lost. The observation is that with pull up and pull down affected instances don't need to be become, simply some of their instance variables may need to be permuted. For example if we have C (ivx) with subclasses SCA (ivy) SCB (ivz) and we pull up ivy to get C (ivx ivy) and SCA () and SCB (ivz) then instances of SCA don't need to be changed at all, and instances of SCB change from (ivx,ivz) to (ivx,ivy,ivz). But if we have C (ivi) with subclasses SCA (ivj ivk) SCB (ivl ivm) and we pull up ivk then instances of SCA change from (ivi,ivj,ivk) to (ivi,ivk,ivj). I think I'm right in thinking that in all cases the refactoring can be done by modifying classes *without* doing a become on general instances of the class from which the iv is pulled up; instead all that may be needed is a permute. The situation is analogous on push down, but even simpler. No instances change side; all that may happen is that ivars may need to be permuted if there is more than one ivar in the class from which the ivar is pushed down, and that ivar is not the last in the class definition. ----- > Cheers, > Sean > _,,,^..^,,,_ best, Eliot

1 0

[ANN] Squeak 5
by Chris Muller 13 Aug '15

13 Aug '15

In the 17 months since Squeak 4.5 was released, a huge development effort took place to create the next generation virtual-machine for the Squeak / Pharo / Newspeak family of programming systems. Squeak is the modern incarnation of the Smalltalk-80 programming environment originally developed at the Xerox PARC. "Squeak 5" introduces this new VM and associated new memory model, collectively referred to as "Spur". Presented [1] by Eliot Miranda and Clément Béra at the 2015 International Symposium on Memory Management, this new VM affords Squeak applications a significant boost in performance and memory management. Among other optimizations, the #become operation no longer requires a memory scan. Object pinning and ephemerons are also now supported. The release notes [2] provide more details. The new memory model requires a new image file format. Although this new format results in about a 15% increased memory requirement for the same number of 4.x objects, a new segmented heap allows memory to be given back to the OS when its no longer needed, a great benefit for application servers. As forward compatibility is as important to the Squeak community as backward compatibility, Squeak 5 is delivers an image with identical content as the recent 4.6 release. Although this new Squeak 5 VM cannot open images saved under the prior 4.x Cog format, objects and code can be easily exported from the 4.x image and then imported into Squeak 5. Applications whose code runs strictly above the Smalltalk meta layer will prove remarkably compatible with the new format, most applications will require no changes whatsotever. Squeak 5 is the result of monumental effort by a tiny group of very talented people, but its also just the beginning of yet a new effort; Spur is just a stepping stone to a more ambitious goals planned over the next five years. [1] -- A Partial Read Barrier for Efficient Support of Live Object-oriented Programming http://conf.researchr.org/event/ismm-2015/ismm-2015-papers-a-partial-read-b… [2] -- Squeak 5 Release Notes http://wiki.squeak.org/squeak/6207

11 20

A stab at explaining Spur
by Chris Cunnington 13 Aug '15

13 Aug '15

On 12/08/15 05:23, Chris Muller wrote: > [1] -- A Partial Read Barrier for Efficient Support of Live > Object-oriented Programming > http://conf.researchr.org/event/ismm-2015/ismm-2015-papers-a-partial-read-b… <http://conf.researchr.org/event/ismm-2015/ismm-2015-papers-a-partial-read-b…> >For the paywall-free version: >https://hal.inria.fr/hal-01152610 <https://hal.inria.fr/hal-01152610> >Stephan I’m going to take a stab at explaining what I just read (as far as I read it). You’re an instance of Rectangle. You have an ivar with a Point in it. The point has ivars x and y. This great because you can get the values of the instance of Point’s x and y when you need to. Funny thing, though, Point was just recompiled to add methods or change ivars. Now all the instances, including yours, are junk. Not to worry, the system has a plan and two tools to deal with it: two primitives fronted by #allInstances and #become:. The system will find all the instances of Point with #allInstances. It will then find each and apply #become: to switch the old version with the new. In Rectangle we get a new number in our ivar slot for the Point instance. And things are caught up. But how does that actually work? The #become: part? I think that’s the story of three approaches to the problem with the last one being Spur. The first way is the way used by Cincom’s VisualWorks now. It’s a two step process. To get from Rectangle to the value of x in an instance of Point we need to make two object pointer calls. The first goes to the head object of the class Point. A second goes from there to the “body” which is a basket of slots, which in our case includes x an y. The beauty of this is that it gives #become: a focal point. a become: b at the location of the header object and you’ve neatly swapped the address from Rectangle’s ivar to where the x and y values are. There’s a problem. There’s trouble in paradise. We are not happy. It could be faster. We don’t want two steps. We don’t want a bridge between Rectangle and the “body” of values with the header object as the cornerstone. We want one step, not two. That’s faster. To do that, the first thing we do is fuse the header object with the “body”. They are no longer in separate places. One word for the header and the next word is slot 1, which is for us x. The next word will have y. The system is faster, but we have a problem. Where are all those references we need to renumber? We no longer have a neat nexus in the header object that #become: can use. No problem, we’ll sweep all of memory (aka “the heap”) to find them again. We’re getting such a boost from one step instead of two that we can afford to brute force the problem with a sweep. And we’re happy. For a while. And then we’re not. This does not scale. We find that the larger the memory gets, then the closer we get to where sweeping the heap becomes more expensive than the gains we’re getting. There’s a plateau point, a location on the graph beyond which the memory sweep is so costly it’s eating our gains. What to do? We want the speed of the one-step process, but we want it to scale. We create a solution called Spur. The salient passage here in the paper is: "This paper describes the design and implementation of efficient schema migration using direct pointers [That’s the “one step” business I’ve been talking about above], which consists mainly in hiding the cost of checking for forwarding pointers behind other checking operations that the system performs as part of its normal processing.” Did you get that part? Let’s repeat it: "hiding the cost of checking for forwarding pointers behind other checking operations that the system performs as part of its normal processing.” Normal processing. We want to be prepared. We want to do as much as we can in anticipation of the requirement that slows things down when the memory gets big. Anticipate. Do as much as you can beforehand. A little vague? OK, I’ll try again. Read this: "Become is therefore implemented lazily; copies of the pair of objects are created, and each original is forwarded to the matching copy; the forwarding pointer is followed when the object is encountered.” I don’t understand all of that, but I did catch “lazily”. In the first of our three systems, the system is preparing all possible avenues. In Spur, I think, it is only opening avenues that need to be opened when they need to be opened. They are being opened “lazily.” There seems to me a commonality to Spur, Cog and Sista. Don’t set the table for ten people. Wait to see how many show up. Don’t do unnecessary work. I think that’s what “lazily” means. These three also like to pay attention to what is happening over and over again and cache it for speed. One last thing. It seems to me the reason Spur and 64-bit are related has to do with fusing the header object with the “body” object. By definition that requires a new object format, does it not? That’s as far as I could make out. I’m sort of a big picture guy, so the details of “forwarding objects” and “partial read barriers” doesn’t interest me all that much. I like it more as a story of three versions with the last one being Spur. FWIW, Chris

1 0

Daily Commit Log
by commits＠source.squeak.org 12 Aug '15

12 Aug '15

Changes to Trunk (http://source.squeak.org/trunk.html) in the last 24 hours: http://lists.squeakfoundation.org/pipermail/packages/2015-August/008838.html Name: Kernel-eem.938 Ancestors: Kernel-cmm.937 Have ClassDescription>>moveChangesTo: write the class's definition before the changes if there are any so that the changes file is a potential application recovery vehicle, not just a crash recovery vehicle. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2015-August/008839.html Name: ShoutCore-ul.53 Ancestors: ShoutCore-ul.52 In SHMCClassDefinition >> #sharedPools, the global should be added to the result instead of a block. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2015-August/008840.html Name: ShoutCore-ul.54 Ancestors: ShoutCore-ul.53 - added missing #shoutParserClass to PseudoClass - faster SHTextStylerST80>>setAttributesIn:fromRanges: ============================================= http://lists.squeakfoundation.org/pipermail/packages/2015-August/008841.html Name: Kernel-ul.939 Ancestors: Kernel-eem.938 - Magnitude's spaceship operator uses quick returns. - Number >> #raisedTo: uses #negative and #isZero, which is faster for LargeIntegers than pure comparison with SmallIntegers. - faster #primesUpTo:do:, and #largePrimesUpTo:do: =============================================

1 0

The Trunk: Kernel-ul.939.mcz
by commits＠source.squeak.org 12 Aug '15

12 Aug '15

Levente Uzonyi uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-ul.939.mcz ==================== Summary ==================== Name: Kernel-ul.939 Author: ul Time: 12 August 2015, 10:38:42.576 pm UUID: 6595484c-9c41-45fe-82f3-c689f7ddffa8 Ancestors: Kernel-eem.938 - Magnitude's spaceship operator uses quick returns. - Number >> #raisedTo: uses #negative and #isZero, which is faster for LargeIntegers than pure comparison with SmallIntegers. - faster #primesUpTo:do:, and #largePrimesUpTo:do: =============== Diff against Kernel-eem.938 =============== Item was changed: ----- Method: Integer class>>largePrimesUpTo:do: (in category 'prime numbers') ----- largePrimesUpTo: max do: aBlock "Evaluate aBlock with all primes up to maxValue. The Algorithm is adapted from http://www.rsok.com/~jrm/printprimes.html It encodes prime numbers much more compactly than #primesUpTo: 38.5 integer per byte (2310 numbers per 60 byte) allow for some fun large primes. (all primes up to SmallInteger maxVal can be computed within ~27MB of memory; + the regular #primesUpTo: would require one *GIGA*byte). - the regular #primesUpTo: would require 4 *GIGA*bytes). Note: The algorithm could be re-written to produce the first primes (which require the longest time to sieve) faster but only at the cost of clarity." + | n limit flags maskBitIndex bitIndex maskBit byteIndex index primesUpTo2310 indexLimit increments incrementIndex | - | limit flags maskBitIndex bitIndex maskBit byteIndex index primesUpTo2310 indexLimit | limit := max asInteger - 1. indexLimit := max asInteger sqrtFloor + 1. "Create the array of flags." flags := ByteArray new: (limit + 2309) // 2310 * 60 + 60. flags atAllPut: 16rFF. "set all to true" "Compute the primes up to 2310" primesUpTo2310 := self primesUpTo: 2310. "Create a mapping from 2310 integers to 480 bits (60 byte)" maskBitIndex := Array new: 2310. bitIndex := -1. "for pre-increment" maskBitIndex at: 1 put: (bitIndex := bitIndex + 1). maskBitIndex at: 2 put: (bitIndex := bitIndex + 1). + index := 1. + [ index <= 5 ] whileTrue: [ + aBlock value: (primesUpTo2310 at: index). + index := index + 1 ]. + + n := 2. + [ n <= 2309 ] whileTrue: [ - 1 to: 5 do:[:i| aBlock value: (primesUpTo2310 at: i)]. - - index := 6. - 2 to: 2309 do:[:n| [(primesUpTo2310 at: index) < n] whileTrue:[index := index + 1]. n = (primesUpTo2310 at: index) ifTrue:[ maskBitIndex at: n+1 put: (bitIndex := bitIndex + 1). ] ifFalse:[ "if modulo any of the prime factors of 2310, then could not be prime" (n \\ 2 = 0 or:[n \\ 3 = 0 or:[n \\ 5 = 0 or:[n \\ 7 = 0 or:[n \\ 11 = 0]]]]) ifTrue:[maskBitIndex at: n+1 put: 0] ifFalse:[maskBitIndex at: n+1 put: (bitIndex := bitIndex + 1)]. ]. + n := n + 1 ]. - ]. "Now the real work begins... Start with 13 since multiples of 2,3,5,7,11 are handled by the storage method; + increment by iterating through increments, which enables us to only check about 20.77% of all numbers." + n := 13. + increments := #[4 2 4 6 2 6 4 2 4 6 6 2 6 4 2 6 4 6 8 4 2 4 2 4 14 4 6 2 10 2 6 6 4 2 4 6 2 10 2 4 2 12 10 2 4 2 4 6 2 6 4 6 6 6 2 6 4 2 6 4 6 8 4 2 4 6 8 6 10 2 4 6 2 6 6 4 2 4 6 2 6 4 2 6 10 2 10 2 4 2 4 6 8 4 2 4 12 2 6 4 2 6 4 6 12 2 4 2 4 8 6 4 6 2 4 6 2 6 10 2 4 6 2 6 4 2 4 2 10 2 10 2 4 6 6 2 6 6 4 6 6 2 6 4 2 6 4 6 8 4 2 6 4 8 6 4 6 2 4 6 8 6 4 2 10 2 6 4 2 4 2 10 2 10 2 4 2 4 8 6 4 2 4 6 6 2 6 4 8 4 6 8 4 2 4 2 4 8 6 4 6 6 6 2 6 6 4 2 4 6 2 6 4 2 4 2 10 2 10 2 6 4 6 2 6 4 2 4 6 6 8 4 2 6 10 8 4 2 4 2 4 8 10 6 2 4 8 6 6 4 2 4 6 2 6 4 6 2 10 2 10 2 4 2 4 6 2 6 4 2 4 6 6 2 6 6 6 4 6 8 4 2 4 2 4 8 6 4 8 4 6 2 6 6 4 2 4 6 8 4 2 4 2 10 2 10 2 4 2 4 6 2 10 2 4 6 8 6 4 2 6 4 6 8 4 6 2 4 8 6 4 6 2 4 6 2 6 6 4 6 6 2 6 6 4 2 10 2 10 2 4 2 4 6 2 6 4 2 10 6 2 6 4 2 6 4 6 8 4 2 4 2 12 6 4 6 2 4 6 2 12 4 2 4 8 6 4 2 4 2 10 2 10 6 2 4 6 2 6 4 2 4 6 6 2 6 4 2 10 6 8 6 4 2 4 8 6 4 6 2 4 6 2 6 6 6 4 6 2 6 4 2 4 2 10 12 2 4 2 10 2 6 4 2 4 6 6 2 10 2 6 4 14 4 2 4 2 4 8 6 4 6 2 4 6 2 6 6 4 2 4 6 2 6 4 2 4 12 2 12]. + incrementIndex := 1. + [ n <= limit ] whileTrue: [ - increment by 2 for odd numbers only." - 13 to: limit by: 2 do:[:n| (maskBit := maskBitIndex at: (n \\ 2310 + 1)) = 0 ifFalse:["not a multiple of 2,3,5,7,11" byteIndex := n // 2310 * 60 + (maskBit-1 bitShift: -3) + 1. bitIndex := 1 bitShift: (maskBit bitAnd: 7). ((flags at: byteIndex) bitAnd: bitIndex) = 0 ifFalse:["not marked -- n is prime" aBlock value: n. "Start with n*n since any integer < n has already been sieved (e.g., any multiple of n with a number k < n has been cleared + when k was sieved); add 2 * n to avoid even numbers and - when k was sieved); add 2 * i to avoid even numbers and mark all multiples of this prime. Note: n < indexLimit below limits running into LargeInts -- nothing more." n < indexLimit ifTrue:[ index := n * n. [index <= limit] whileTrue:[ (maskBit := maskBitIndex at: (index \\ 2310 + 1)) = 0 ifFalse:[ byteIndex := (index // 2310 * 60) + (maskBit-1 bitShift: -3) + 1. maskBit := 255 - (1 bitShift: (maskBit bitAnd: 7)). flags at: byteIndex put: ((flags at: byteIndex) bitAnd: maskBit). ]. + index := index + n + n ]. - index := index + (2 * n)]. ]. ]. ]. + n := n + (increments at: incrementIndex). + incrementIndex := incrementIndex + 1. + incrementIndex > increments size ifTrue: [ incrementIndex := 1 ] ]! - ]. - ! Item was changed: ----- Method: Integer class>>primesUpTo:do: (in category 'prime numbers') ----- primesUpTo: max do: aBlock "Compute aBlock with all prime integers up to the given integer." "Integer primesUpTo: 100" + | index sieve increment limit limitSqrtFloor | - | index limit limitSqrtFloor sieve increment | limit := max asInteger. - limit <= 1 ifTrue: [ ^self ]. "Fall back into #largePrimesUpTo:do: if we'd require more than 100k of memory; + the alternative will only requre 2/77th of the amount we need here and is almost as fast." + limit <= 100000 ifFalse: [ ^self largePrimesUpTo: limit do: aBlock ]. - the alternative will only requre 1/154th of the amount we need here and is almost as fast." - limit > 25000 ifTrue:[ ^self largePrimesUpTo: limit do: aBlock ]. limit := limit - 1. "upTo:" + limit <= 1 ifTrue: [ ^self ]. + aBlock value: 2. + limit <= 2 ifTrue: [ ^self ]. + aBlock value: 3. + sieve := ByteArray new: limit withAll: 1. "1 = prime, 0 = not prime" + sieve at: 1 put: 0. + "Filter multiples of 2." + index := 4. + [ index <= limit ] whileTrue: [ + sieve at: index put: 0. + index := index + 2 ]. + "Filter multiples of 3." + index := 9. + [ index <= limit ] whileTrue: [ + sieve at: index put: 0. + index := index + 3 ]. + "Filter the rest of the primes." - sieve := Array new: limit withAll: true. - sieve at: 1 put: false. - index := 2. limitSqrtFloor := limit sqrtFloor. + index := 5. + increment := 2. - increment := 1. [ index <= limitSqrtFloor ] whileTrue: [ + (sieve at: index) = 1 ifTrue: [ + | originalIndex originalIncrement | - (sieve at: index) ifTrue: [ - | notPrimeIndex notPrimeIncrement | aBlock value: index. + originalIndex := index. + originalIncrement := increment. + increment := index + index. + index := index * index. + [ index <= limit ] whileTrue: [ + sieve at: index put: 0. + index := index + increment ]. + index := originalIndex. + increment := originalIncrement ]. - notPrimeIndex := index * index. - notPrimeIncrement := increment * index. - [ notPrimeIndex <= limit ] whileTrue: [ - sieve at: notPrimeIndex put: false. - notPrimeIndex := notPrimeIndex + notPrimeIncrement ] ]. index := index + increment. + increment := 6 - increment ]. + "No more new primes here." - increment := 2]. [ index <= limit ] whileTrue: [ + (sieve at: index) = 1 ifTrue: [ - (sieve at: index) ifTrue: [ aBlock value: index ]. index := index + increment. + increment := 6 - increment ]! - increment := 2]! Item was changed: ----- Method: Magnitude>><=> (in category 'sorting') ----- <=> anotherObject "Return a collation order of -1, 0, or 1, indicating whether I should be collated before the receiver, am equal, or after. See also: http://en.wikipedia.org/wiki/Spaceship_operator" + self = anotherObject ifTrue: [ ^0 ]. + self < anotherObject ifTrue: [ ^-1 ]. + ^1! - ^self = anotherObject - ifTrue: [0] - ifFalse: [self < anotherObject ifTrue: [-1] ifFalse: [1]]! Item was changed: ----- Method: Number>>raisedTo: (in category 'mathematical functions') ----- raisedTo: aNumber "Answer the receiver raised to aNumber." aNumber isInteger ifTrue: [ "Do the special case of integer power" ^ self raisedToInteger: aNumber]. aNumber isFraction ifTrue: [ "Special case for fraction power" ^ (self nthRoot: aNumber denominator) raisedToInteger: aNumber numerator ]. + self negative ifTrue: [ - self < 0 ifTrue: [ ^ ArithmeticError signal: 'Negative numbers can''t be raised to float powers.' ]. + aNumber isZero ifTrue: [^ self class one]. "Special case of exponent=0" - 0 = aNumber ifTrue: [^ self class one]. "Special case of exponent=0" 1 = aNumber ifTrue: [^ self]. "Special case of exponent=1" + self isZero ifTrue: [ "Special case of self = 0" + aNumber negative - 0 = self ifTrue: [ "Special case of self = 0" - aNumber < 0 ifTrue: [^ (ZeroDivide dividend: self) signal] ifFalse: [^ self]]. ^ (aNumber * self ln) exp "Otherwise use logarithms"!

1 0

The Inbox: Collections-ul.640.mcz
by commits＠source.squeak.org 12 Aug '15

12 Aug '15

Levente Uzonyi uploaded a new version of Collections to project The Inbox: http://source.squeak.org/inbox/Collections-ul.640.mcz ==================== Summary ==================== Name: Collections-ul.640 Author: ul Time: 12 August 2015, 10:35:29.572 pm UUID: 1065564d-36c5-43a1-842b-3be19ce91a3e Ancestors: Collections-cmm.639 Character: - sped up various methods by storing and reusing the result of #asInteger in a temporary variable. - sped up #isSeparator by eliminating the last branch. Swapped the tab and cr checks, because source code has more tabs than crs. - unified methods with mixed #asInteger and #asciiValue sends - #isAscii uses #< instead of #between:and:, like #isOctetCharacter does. - #asUnicode uses the same shortcut as #encodedCharSet does - quick return in #printOn: and #storeOn: String: - added identity check (should help with Text comparison) and quick returns to #= - spaceship operator uses #compare: if the argument is a string - added a fast #asSignedInteger implementation Text: - removed the identity check from Text >> #=, because String >> #= does it - the spaceship operator uses String's spaceship operator =============== Diff against Collections-cmm.639 =============== Item was changed: ----- Method: Character>>< (in category 'comparing') ----- < aCharacter "Answer true if the receiver's value < aCharacter's value." + ^self asInteger < aCharacter asInteger! - ^self asInteger < aCharacter asciiValue! Item was changed: ----- Method: Character>><= (in category 'comparing') ----- <= aCharacter "Answer true if the receiver's value <= aCharacter's value." + ^self asInteger <= aCharacter asInteger! - ^self asInteger <= aCharacter asciiValue! Item was changed: ----- Method: Character>>> (in category 'comparing') ----- > aCharacter "Answer true if the receiver's value > aCharacter's value." + ^self asInteger > aCharacter asInteger! - ^self asInteger > aCharacter asciiValue! Item was changed: ----- Method: Character>>>= (in category 'comparing') ----- >= aCharacter "Answer true if the receiver's value >= aCharacter's value." + ^self asInteger >= aCharacter asInteger! - ^self asInteger >= aCharacter asciiValue! Item was changed: ----- Method: Character>>asLowercase (in category 'converting') ----- asLowercase "Answer the receiver's matching lowercase Character." + | integerValue | + (integerValue := self asInteger) > 255 ifFalse: [ - self asInteger > 255 ifFalse: [ | result | + (result := (ClassificationTable at: integerValue + 1) bitAnd: 16rFF) > 0 - (result := (ClassificationTable at: self asInteger + 1) bitAnd: 16rFF) > 0 ifTrue: [ ^self class value: result ] ]. + ^self class value: (self encodedCharSet toLowercaseCode: integerValue)! - ^self class value: (self encodedCharSet toLowercaseCode: self asInteger)! Item was changed: ----- Method: Character>>asUnicode (in category 'converting') ----- asUnicode "Answer the unicode encoding of the receiver" + + | integerValue | + (integerValue := self asInteger) <= 16r3FFFFF ifTrue: [ ^integerValue ]. + ^self encodedCharSet charsetClass convertToUnicode: (integerValue bitAnd: 16r3FFFFF) - self leadingChar = 0 ifTrue: [^ self asInteger]. - ^self encodedCharSet charsetClass convertToUnicode: self charCode ! Item was changed: ----- Method: Character>>asUppercase (in category 'converting') ----- asUppercase "Answer the receiver's matching uppercase Character." + | integerValue | + (integerValue := self asInteger) > 255 ifFalse: [ - self asInteger > 255 ifFalse: [ | result | + (result := ((ClassificationTable at: integerValue + 1) bitShift: -8) bitAnd: 16rFF) > 0 - (result := ((ClassificationTable at: self asInteger + 1) bitShift: -8) bitAnd: 16rFF) > 0 ifTrue: [ ^self class value: result ] ]. + ^self class value: (self encodedCharSet toUppercaseCode: integerValue)! - ^self class value: (self encodedCharSet toUppercaseCode: self asInteger)! Item was changed: ----- Method: Character>>digitValue (in category 'accessing') ----- digitValue "Answer 0-9 if the receiver is $0-$9, 10-35 if it is $A-$Z, and < 0 otherwise. This is used to parse literal numbers of radix 2-36." + | integerValue | + (integerValue := self asInteger) > 16rFF ifTrue: [^self encodedCharSet digitValueOf: self]. + ^DigitValues at: integerValue + 1! - self asInteger > 16rFF ifTrue: [^self encodedCharSet digitValueOf: self]. - ^DigitValues at: 1 + self asInteger! Item was changed: ----- Method: Character>>isAlphaNumeric (in category 'testing') ----- isAlphaNumeric "Answer whether the receiver is a letter or a digit." + | integerValue | + (integerValue := self asInteger) > 255 ifFalse: [ + ^((ClassificationTable at: integerValue + 1) bitAnd: AlphaNumericMask) > 0 ]. - self asInteger > 255 ifFalse: [ ^((ClassificationTable at: self asInteger + 1) bitAnd: AlphaNumericMask) > 0 ]. ^self encodedCharSet isAlphaNumeric: self! Item was changed: ----- Method: Character>>isAscii (in category 'testing') ----- isAscii + + ^self asInteger < 128! - ^ self asInteger between: 0 and: 127! Item was changed: ----- Method: Character>>isDigit (in category 'testing') ----- isDigit + | integerValue | + (integerValue := self asInteger) > 255 ifFalse: [ + ^((ClassificationTable at: integerValue + 1) bitAnd: DigitBit) > 0 ]. - self asInteger > 255 ifFalse: [ ^((ClassificationTable at: self asInteger + 1) bitAnd: DigitBit) > 0 ]. ^self encodedCharSet isDigit: self. ! Item was changed: ----- Method: Character>>isLetter (in category 'testing') ----- isLetter + | integerValue | + (integerValue := self asInteger) > 255 ifFalse: [ + ^((ClassificationTable at: integerValue + 1) bitAnd: LetterMask) > 0 ]. - self asInteger > 255 ifFalse: [ ^((ClassificationTable at: self asInteger + 1) bitAnd: LetterMask) > 0 ]. ^self encodedCharSet isLetter: self! Item was changed: ----- Method: Character>>isLowercase (in category 'testing') ----- isLowercase + | integerValue | + (integerValue := self asInteger) > 255 ifFalse: [ + ^((ClassificationTable at: integerValue + 1) bitAnd: LowercaseBit) > 0 ]. - self asInteger > 255 ifFalse: [ ^((ClassificationTable at: self asInteger + 1) bitAnd: LowercaseBit) > 0 ]. ^self encodedCharSet isLowercase: self. ! Item was changed: ----- Method: Character>>isSeparator (in category 'testing') ----- isSeparator "Answer whether the receiver is one of the separator characters--space, cr, tab, line feed, or form feed." + | integerValue | + (integerValue := self asInteger) = 32 ifTrue: [ ^true ]. "space" + integerValue = 9 ifTrue: [ ^true ]. "tab" + integerValue = 13 ifTrue: [ ^true ]. "cr" + integerValue = 10 ifTrue: [ ^true ]. "line feed" + ^integerValue = 12 "form feed"! - self asInteger = 32 ifTrue: [^true]. "space" - self asInteger = 13 ifTrue: [^true]. "cr" - self asInteger = 9 ifTrue: [^true]. "tab" - self asInteger = 10 ifTrue: [^true]. "line feed" - self asInteger = 12 ifTrue: [^true]. "form feed" - ^false! Item was changed: ----- Method: Character>>isUppercase (in category 'testing') ----- isUppercase + | integerValue | + (integerValue := self asInteger) > 255 ifFalse: [ + ^((ClassificationTable at: integerValue + 1) bitAnd: UppercaseBit) > 0 ]. - self asInteger > 255 ifFalse: [ ^((ClassificationTable at: self asInteger + 1) bitAnd: UppercaseBit) > 0 ]. ^self encodedCharSet isUppercase: self. ! Item was changed: ----- Method: Character>>printOn: (in category 'printing') ----- printOn: aStream + + | integerValue | + ((integerValue := self asInteger) > 32 and: [ integerValue ~= 127 ]) ifTrue: [ + aStream nextPut: $$; nextPut: self. + ^self ]. + (self class constantNameFor: self) + ifNotNil: [ :name | aStream nextPutAll: self class name; space; nextPutAll: name ] + ifNil: [ aStream nextPutAll: self class name; nextPutAll: ' value: '; print: integerValue ]! - | name | - (self asInteger > 32 and: [self asInteger ~= 127]) - ifTrue: [ aStream nextPut: $$; nextPut: self ] - ifFalse: [ - name := self class constantNameFor: self. - name notNil - ifTrue: [ aStream nextPutAll: self class name; space; nextPutAll: name ] - ifFalse: [ aStream nextPutAll: self class name; nextPutAll: ' value: '; print: self asInteger ] ].! Item was changed: ----- Method: Character>>shouldBePrintedAsLiteral (in category 'testing') ----- shouldBePrintedAsLiteral + | integerValue | + ^((integerValue := self asInteger) between: 33 and: 255) and: [self asInteger ~= 127]! - ^(self asInteger between: 33 and: 255) and: [self asInteger ~= 127]! Item was changed: ----- Method: Character>>storeBinaryOn: (in category 'printing') ----- storeBinaryOn: aStream "Store the receiver on a binary (file) stream" + | integerValue | + (integerValue := self asInteger) < 256 - self asInteger < 256 ifTrue: [ aStream basicNextPut: self ] + ifFalse: [ aStream nextInt32Put: integerValue ]! - ifFalse: [ aStream nextInt32Put: self asInteger ]! Item was changed: ----- Method: Character>>storeDataOn: (in category 'object fileIn') ----- storeDataOn: aDataStream " Store characters in reference-like way, with value like instvar. This is compatible with various Squeak Memory Systems" aDataStream beginInstance: self class + size: 1; + nextPut: self asInteger! - size: 1. - aDataStream nextPut: self asInteger.! Item was changed: ----- Method: Character>>storeOn: (in category 'printing') ----- storeOn: aStream "Common character literals are preceded by '$', however special need to be encoded differently: for some this might be done by using one of the shortcut constructor methods for the rest we have to create them by ascii-value." + self shouldBePrintedAsLiteral ifTrue: [ + aStream nextPut: $$; nextPut: self. + ^self ]. + (self class constantNameFor: self) ifNotNil: [ :name | + aStream nextPutAll: self class name; space; nextPutAll: name. + ^self ]. + aStream + nextPut: $(; nextPutAll: self class name; + nextPutAll: ' value: '; print: self asInteger; nextPut: $)! - | name | - self shouldBePrintedAsLiteral - ifTrue: [ aStream nextPut: $$; nextPut: self ] - ifFalse: [ - name := self class constantNameFor: self. - name notNil - ifTrue: [ aStream nextPutAll: self class name; space; nextPutAll: name ] - ifFalse: [ - aStream - nextPut: $(; nextPutAll: self class name; - nextPutAll: ' value: '; print: self asInteger; nextPut: $) ] ].! Item was changed: ----- Method: CharacterSet>>includes: (in category 'collection ops') ----- includes: aCharacter + + | index | + (index := aCharacter asInteger + 1) > 256 ifTrue: [ ^false ]. + ^(map at: index) > 0! - aCharacter asciiValue >= 256 - ifTrue: ["Guard against wide characters" - ^false]. - ^(map at: aCharacter asciiValue + 1) > 0! Item was changed: ----- Method: String>><=> (in category 'sorting') ----- <=> aCharacterArray "Return a collation order of -1, 0, or 1, indicating whether I should be collated before the receiver, am equal, or after. See also: http://en.wikipedia.org/wiki/Spaceship_operator" + aCharacterArray isString ifTrue: [ ^(self compare: aCharacterArray) - 2 ]. + self = aCharacterArray ifTrue: [ ^0 ]. + self < aCharacterArray ifTrue: [ ^-1 ]. + ^1! - ^self = aCharacterArray - ifTrue: [ 0 ] - ifFalse: [self < aCharacterArray - ifTrue: [ -1 ] - ifFalse: [ 1 ]]! Item was changed: ----- Method: String>>= (in category 'comparing') ----- = aString "Answer whether the receiver sorts equally as aString. The collation order is simple ascii (with case differences)." + self == aString ifTrue: [ ^true ]. + aString isString ifFalse: [ ^false ]. + self size = aString size ifFalse: [ ^false ]. - (aString isString - and: [self size = aString size]) ifFalse: [^ false]. ^ (self compare: self with: aString collated: AsciiOrder) = 2! Item was changed: ----- Method: String>>asSignedInteger (in category 'converting') ----- asSignedInteger "Returns the first signed integer it can find or nil." + | result character index negative | + (self at: 1) isDigit + ifTrue: [ index := 1 ] + ifFalse: [ + index := self findFirst: [ :char | char isDigit ]. + index = 0 ifTrue: [ ^nil ] ]. + negative := index > 1 and: [ (self at: index - 1) == $- ]. + result := 0. + [ index <= self size and: [ (character := self at: index) isDigit ] ] whileTrue: [ + result := result * 10 + character asciiValue - 48 "$0 asciiValue". + index := index + 1 ]. + negative ifTrue: [ ^0 - result ]. + ^result + ! - | start | - start := self findFirst: [:char | char isDigit]. - start isZero ifTrue: [^ nil]. - (start > 1 and: [self at: start - 1]) = $- ifTrue: [start := start - 1]. - ^ Integer readFrom: (ReadStream on: self from: start to: self size)! Item was changed: ----- Method: Text>><=> (in category 'sorting') ----- <=> aCharacterArray "Return a collation order of -1, 0, or 1, indicating whether I should be collated before the receiver, am equal, or after. See also: http://en.wikipedia.org/wiki/Spaceship_operator" + aCharacterArray isString ifTrue: [ ^string <=> aCharacterArray ]. + ^string <=> aCharacterArray asString! - ^string = aCharacterArray - ifTrue: [ 0 ] - ifFalse: [string < aCharacterArray asString - ifTrue: [ -1 ] - ifFalse: [ 1 ]]! Item was changed: ----- Method: Text>>= (in category 'comparing') ----- = other "Am I equal to the other Text or String? ***** Warning ***** Two Texts are considered equal if they have the same characters in them. They might have completely different emphasis, fonts, sizes, text actions, or embedded morphs. If you need to find out if one is a true copy of the other, you must do (text1 = text2 and: [text1 runs = text2 runs])." + other isText ifTrue: [ ^string = other string ]. + other isString ifTrue: [ ^string = other ]. + ^false! - other isText ifTrue: ["This is designed to run fast even for megabytes" - ^ string == other string or: [string = other string]]. - other isString ifTrue: [^ string == other or: [string = other]]. - ^ false!

1 0

The Inbox: Regex-Tests-Core-ul.1.mcz
by commits＠source.squeak.org 12 Aug '15

12 Aug '15

Levente Uzonyi uploaded a new version of Regex-Tests-Core to project The Inbox: http://source.squeak.org/inbox/Regex-Tests-Core-ul.1.mcz ==================== Summary ==================== Name: Regex-Tests-Core-ul.1 Author: ul Time: 12 August 2015, 10:43:52.346 pm UUID: 2538aebb-3e78-4bb8-ad6f-2b0df63e564b Ancestors: - tests from Pharo ==================== Snapshot ==================== SystemOrganization addCategory: #'Regex-Tests-Core'! TestCase subclass: #RxMatcherTest instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'Regex-Tests-Core'! !RxMatcherTest commentStamp: 'Tbn 11/12/2010 22:31' prior: 0! This class provides tests for the regular expression matcher.! ----- Method: RxMatcherTest class>>packageNamesUnderTest (in category 'accessing') ----- packageNamesUnderTest ^ #('VB-Regex')! ----- Method: RxMatcherTest>>compileRegex: (in category 'utilties') ----- compileRegex: aString "Compile the regex and answer the matcher, or answer nil if compilation fails." | syntaxTree | syntaxTree := RxParser safelyParse: aString. ^ syntaxTree isNil ifFalse: [ self matcherClass for: syntaxTree ]! ----- Method: RxMatcherTest>>henryReadme (in category 'testing-henry') ----- henryReadme self error: 'The tests in this category are based on the ones in Henry Spencer''s regexp.c package.'! ----- Method: RxMatcherTest>>matcherClass (in category 'accessing') ----- matcherClass ^ RxMatcher! ----- Method: RxMatcherTest>>runMatcher:with:expect:withSubexpressions: (in category 'utilties') ----- runMatcher: aMatcher with: aString expect: aBoolean withSubexpressions: anArray | copy got | copy := aMatcher copy: aString translatingMatchesUsing: [ :each | each ]. self assert: copy = aString description: 'Copying: expected ' , aString printString , ', but got ' , copy printString. got := aMatcher search: aString. self assert: got = aBoolean description: 'Searching: expected ' , aBoolean printString , ', but got ' , got printString. (anArray isNil or: [ aMatcher supportsSubexpressions not ]) ifTrue: [ ^ self ]. 1 to: anArray size by: 2 do: [ :index | | sub subExpect subGot | sub := anArray at: index. subExpect := anArray at: index + 1. subGot := aMatcher subexpression: sub. self assert: subExpect = subGot description: 'Subexpression ' , sub printString , ': expected ' , subExpect printString , ', but got ' , subGot printString ]! ----- Method: RxMatcherTest>>runRegex: (in category 'utilties') ----- runRegex: anArray "Run a clause anArray against a set of tests. Each clause is an array with a regex source string followed by sequence of 3-tuples. Each three-element group is one test to try against the regex, and includes: 1) test string; 2) expected result; 3) expected subexpression as an array of (index, substring), or nil." | source matcher | source := anArray first. matcher := self compileRegex: source. matcher isNil ifTrue: [ (anArray at: 2) isNil ifFalse: [ self signalFailure: 'Compilation failed, should have succeeded: ' , source printString ] ] ifFalse: [ (anArray at: 2) isNil ifTrue: [ self signalFailure: 'Compilation succeeded, should have failed: ' , source printString ] ifFalse: [ 2 to: anArray size by: 3 do: [ :index | self runMatcher: matcher with: (anArray at: index) expect: (anArray at: index + 1) withSubexpressions: (anArray at: index + 2) ] ] ]! ----- Method: RxMatcherTest>>testCaseInsensitive (in category 'testing-protocol') ----- testCaseInsensitive | matcher | matcher := self matcherClass forString: 'the quick brown fox' ignoreCase: true. self assert: (matcher search: 'the quick brown fox'). self assert: (matcher search: 'The quick brown FOX'). self assert: (matcher search: 'What do you know about the quick brown fox?'). self assert: (matcher search: 'What do you know about THE QUICK BROWN FOX?')! ----- Method: RxMatcherTest>>testCaseSensitive (in category 'testing-protocol') ----- testCaseSensitive | matcher | matcher := self matcherClass forString: 'the quick brown fox' ignoreCase: false. self assert: (matcher search: 'the quick brown fox'). self deny: (matcher search: 'The quick brown FOX'). self assert: (matcher search: 'What do you know about the quick brown fox?'). self deny: (matcher search: 'What do you know about THE QUICK BROWN FOX?')! ----- Method: RxMatcherTest>>testCopyReplacingMatches (in category 'testing-protocol') ----- testCopyReplacingMatches "See that the match context is preserved while copying stuff between matches:" | matcher | matcher := self matcherClass forString: '\<\d\D+'. self assert: (matcher copy: '9aaa1bbb 8ccc' replacingMatchesWith: 'foo') = 'foo1bbb foo'! ----- Method: RxMatcherTest>>testCopyTranslatingMatches (in category 'testing-protocol') ----- testCopyTranslatingMatches | matcher | matcher := self matcherClass forString: '\w+'. self assert: (matcher copy: 'now is the time ' translatingMatchesUsing: [ :each | each reversed ]) = 'won si eht emit '! ----- Method: RxMatcherTest>>testEmptyStringAtBeginningOfLine (in category 'testing-empty') ----- testEmptyStringAtBeginningOfLine | matcher | matcher := self matcherClass forString: '^'. self assert: (matcher copy: 'foo1 bar1' , String cr , 'foo2 bar2' replacingMatchesWith: '*') = ('*foo1 bar1' , String cr , '*foo2 bar2') description: 'An empty string at the beginning of a line'! ----- Method: RxMatcherTest>>testEmptyStringAtBeginningOfWord (in category 'testing-empty') ----- testEmptyStringAtBeginningOfWord | matcher | matcher := self matcherClass forString: '\<'. self assert: (matcher copy: 'foo bar' replacingMatchesWith: '*') = '*foo *bar' description: 'An empty string at the beginning of a word'! ----- Method: RxMatcherTest>>testEmptyStringAtEndOfLine (in category 'testing-empty') ----- testEmptyStringAtEndOfLine | matcher | matcher := self matcherClass forString: '$'. self assert: (matcher copy: 'foo1 bar1' , String cr , 'foo2 bar2' replacingMatchesWith: '*') = ('foo1 bar1*', String cr , 'foo2 bar2*') description: 'An empty string at the end of a line'! ----- Method: RxMatcherTest>>testEmptyStringAtEndOfWord (in category 'testing-empty') ----- testEmptyStringAtEndOfWord | matcher | matcher := self matcherClass forString: '\>'. self assert: (matcher copy: 'foo bar' replacingMatchesWith: '*') = 'foo* bar*' description: 'An empty string at the end of a word'! ----- Method: RxMatcherTest>>testEmptyStringAtWordBoundary (in category 'testing-empty') ----- testEmptyStringAtWordBoundary | matcher | matcher := self matcherClass forString: '\b'. self assert: (matcher copy: 'foo bar' replacingMatchesWith: '*') = '*foo* *bar*' description: 'An empty string at a word boundary'! ----- Method: RxMatcherTest>>testEmptyStringNotAtWordBoundary (in category 'testing-empty') ----- testEmptyStringNotAtWordBoundary | matcher | matcher := self matcherClass forString: '\B'. self assert: (matcher copy: 'foo bar' replacingMatchesWith: '*') = 'f*o*o b*a*r' description: 'An empty string not at a word boundary'! ----- Method: RxMatcherTest>>testHenry001 (in category 'testing-henry') ----- testHenry001 self runRegex: #('abc' 'abc' true (1 'abc') 'xbc' false nil 'axc' false nil 'abx' false nil 'xabcy' true (1 'abc') 'ababc' true (1 'abc'))! ----- Method: RxMatcherTest>>testHenry002 (in category 'testing-henry') ----- testHenry002 self runRegex: #('ab*c' 'abc' true (1 'abc'))! ----- Method: RxMatcherTest>>testHenry003 (in category 'testing-henry') ----- testHenry003 self runRegex: #('ab*bc' 'abc' true (1 'abc') 'abbc' true (1 'abbc') 'abbbbc' true (1 'abbbbc'))! ----- Method: RxMatcherTest>>testHenry004 (in category 'testing-henry') ----- testHenry004 self runRegex: #('ab+bc' 'abbc' true (1 'abbc') 'abc' false nil 'abq' false nil 'abbbbc' true (1 'abbbbc'))! ----- Method: RxMatcherTest>>testHenry005 (in category 'testing-henry') ----- testHenry005 self runRegex: #('ab?bc' 'abbc' true (1 'abbc') 'abc' true (1 'abc') 'abbbbc' false nil 'abc' true (1 'abc'))! ----- Method: RxMatcherTest>>testHenry006 (in category 'testing-henry') ----- testHenry006 self runRegex: #('^abc$' 'abc' true (1 'abc') 'abcc' false nil 'aabc' false nil)! ----- Method: RxMatcherTest>>testHenry007 (in category 'testing-henry') ----- testHenry007 self runRegex: #('^abc' 'abcc' true (1 'abc'))! ----- Method: RxMatcherTest>>testHenry008 (in category 'testing-henry') ----- testHenry008 self runRegex: #('abc$' 'aabc' true (1 'abc'))! ----- Method: RxMatcherTest>>testHenry009 (in category 'testing-henry') ----- testHenry009 self runRegex: #('^' 'abc' true nil)! ----- Method: RxMatcherTest>>testHenry010 (in category 'testing-henry') ----- testHenry010 self runRegex: #('$' 'abc' true nil)! ----- Method: RxMatcherTest>>testHenry011 (in category 'testing-henry') ----- testHenry011 self runRegex: #('a.c' 'abc' true (1 'abc') 'axc' true (1 'axc'))! ----- Method: RxMatcherTest>>testHenry012 (in category 'testing-henry') ----- testHenry012 "Need to get creative to include the null character..." self runRegex: #('a.*c' 'axyzc' true (1 'axyzc') 'axy zc' true (1 'axy zc') "testing that a dot matches a space" ), (Array with: 'axy', (String with: 0 asCharacter), 'zc'), #(false nil "testing that a dot does not match a null" 'axyzd' false nil)! ----- Method: RxMatcherTest>>testHenry013 (in category 'testing-henry') ----- testHenry013 self runRegex: #('.a.*' '1234abc' true (1 '4abc') 'abcd' false nil)! ----- Method: RxMatcherTest>>testHenry014 (in category 'testing-henry') ----- testHenry014 self runRegex: #('a\w+c' ' abbbbc ' true (1 'abbbbc') 'abb bc' false nil)! ----- Method: RxMatcherTest>>testHenry015 (in category 'testing-henry') ----- testHenry015 self runRegex: #('\w+' ' foobar quux' true (1 'foobar') ' ~!!@#$%^&*()-+=\|/?.>,<' false nil)! ----- Method: RxMatcherTest>>testHenry016 (in category 'testing-henry') ----- testHenry016 self runRegex: #('a\W+c' 'a c' true (1 'a c') 'a bc' false nil)! ----- Method: RxMatcherTest>>testHenry017 (in category 'testing-henry') ----- testHenry017 self runRegex: #('\W+' 'foo!!@#$bar' true (1 '!!@#$') 'foobar' false nil)! ----- Method: RxMatcherTest>>testHenry018 (in category 'testing-henry') ----- testHenry018 self runRegex: #('a\s*c' 'a c' true (1 'a c') 'a bc' false nil)! ----- Method: RxMatcherTest>>testHenry019 (in category 'testing-henry') ----- testHenry019 self runRegex: #('\s+' 'abc3457 sd' true (1 ' ') '1234$^*^&asdfb' false nil)! ----- Method: RxMatcherTest>>testHenry020 (in category 'testing-henry') ----- testHenry020 self runRegex: #('a\S*c' 'aqwertyc' true (1 'aqwertyc') 'ab c' false nil)! ----- Method: RxMatcherTest>>testHenry021 (in category 'testing-henry') ----- testHenry021 self runRegex: #('\S+' ' asdf ' true (1 'asdf') ' ' false nil)! ----- Method: RxMatcherTest>>testHenry022 (in category 'testing-henry') ----- testHenry022 self runRegex: #('a\d+c' 'a0123456789c' true (1 'a0123456789c') 'a12b34c' false nil)! ----- Method: RxMatcherTest>>testHenry023 (in category 'testing-henry') ----- testHenry023 self runRegex: #('\d+' 'foo@#$%123ASD #$$%^&' true (1 '123') 'foo!!@#$asdfl;' false nil)! ----- Method: RxMatcherTest>>testHenry024 (in category 'testing-henry') ----- testHenry024 self runRegex: #('a\D+c' 'aqwertyc' true (1 'aqwertyc') 'aqw6ertc' false nil)! ----- Method: RxMatcherTest>>testHenry025 (in category 'testing-henry') ----- testHenry025 self runRegex: #('\D+' '1234 abc 456' true (1 ' abc ') '1234567890' false nil)! ----- Method: RxMatcherTest>>testHenry026 (in category 'testing-henry') ----- testHenry026 self runRegex: #('(f|o)+\b' 'foo' true (1 'foo') ' foo ' true (1 'foo'))! ----- Method: RxMatcherTest>>testHenry027 (in category 'testing-henry') ----- testHenry027 self runRegex: #('\ba\w+' "a word beginning with an A" 'land ancient' true (1 'ancient') 'antique vase' true (1 'antique') 'goofy foobar' false nil)! ----- Method: RxMatcherTest>>testHenry028 (in category 'testing-henry') ----- testHenry028 self runRegex: #('(f|o)+\B' 'quuxfoobar' true (1 'foo') 'quuxfoo ' true (1 'fo'))! ----- Method: RxMatcherTest>>testHenry029 (in category 'testing-henry') ----- testHenry029 self runRegex: #('\Ba\w+' "a word with an A in the middle, match at A and further" 'land ancient' true (1 'and') 'antique vase' true (1 'ase') 'smalltalk shall overcome' true (1 'alltalk') 'foonix is better' false nil)! ----- Method: RxMatcherTest>>testHenry030 (in category 'testing-henry') ----- testHenry030 self runRegex: #('fooa\>.*' 'fooa ' true nil 'fooa123' false nil 'fooa bar' true nil 'fooa' true nil 'fooargh' false nil)! ----- Method: RxMatcherTest>>testHenry031 (in category 'testing-henry') ----- testHenry031 self runRegex: #('\>.+abc' ' abcde fg' false nil 'foo abcde' true (1 ' abc') 'abcde' false nil)! ----- Method: RxMatcherTest>>testHenry032 (in category 'testing-henry') ----- testHenry032 self runRegex: #('\<foo.*' 'foo' true nil 'foobar' true nil 'qfoobarq foonix' true (1 'foonix') ' foo' true nil ' 12foo' false nil 'barfoo' false nil)! ----- Method: RxMatcherTest>>testHenry033 (in category 'testing-henry') ----- testHenry033 self runRegex: #('.+\<foo' 'foo' false nil 'ab foo' true (1 'ab foo') 'abfoo' false nil)! ----- Method: RxMatcherTest>>testHenry034 (in category 'testing-henry') ----- testHenry034 self runRegex: #('a[bc]d' 'abc' false nil 'abd' true (1 'abd'))! ----- Method: RxMatcherTest>>testHenry035 (in category 'testing-henry') ----- testHenry035 self runRegex: #('a[b-d]e' 'abd' false nil 'ace' true (1 'ace'))! ----- Method: RxMatcherTest>>testHenry036 (in category 'testing-henry') ----- testHenry036 self runRegex: #('a[b-d]' 'aac' true (1 'ac'))! ----- Method: RxMatcherTest>>testHenry037 (in category 'testing-henry') ----- testHenry037 self runRegex: #('a[-b]' 'a-' true (1 'a-'))! ----- Method: RxMatcherTest>>testHenry038 (in category 'testing-henry') ----- testHenry038 self runRegex: #('a[b-]' 'a-' true (1 'a-'))! ----- Method: RxMatcherTest>>testHenry039 (in category 'testing-henry') ----- testHenry039 self runRegex: #('a[a-b-c]' nil)! ----- Method: RxMatcherTest>>testHenry040 (in category 'testing-henry') ----- testHenry040 self runRegex: #('[k]' 'ab' false nil)! ----- Method: RxMatcherTest>>testHenry041 (in category 'testing-henry') ----- testHenry041 self runRegex: #('a[b-a]' nil)! ----- Method: RxMatcherTest>>testHenry042 (in category 'testing-henry') ----- testHenry042 self runRegex: #('a[]b' nil)! ----- Method: RxMatcherTest>>testHenry043 (in category 'testing-henry') ----- testHenry043 self runRegex: #('a[' nil)! ----- Method: RxMatcherTest>>testHenry044 (in category 'testing-henry') ----- testHenry044 self runRegex: #('a]' 'a]' true (1 'a]'))! ----- Method: RxMatcherTest>>testHenry045 (in category 'testing-henry') ----- testHenry045 self runRegex: #('a[]]b' 'a]b' true (1 'a]b'))! ----- Method: RxMatcherTest>>testHenry046 (in category 'testing-henry') ----- testHenry046 self runRegex: #('a[^bc]d' 'aed' true (1 'aed') 'abd' false nil)! ----- Method: RxMatcherTest>>testHenry047 (in category 'testing-henry') ----- testHenry047 self runRegex: #('a[^-b]c' 'adc' true (1 'adc') 'a-c' false nil)! ----- Method: RxMatcherTest>>testHenry048 (in category 'testing-henry') ----- testHenry048 self runRegex: #('a[^]b]c' 'a]c' false nil 'adc' true (1 'adc'))! ----- Method: RxMatcherTest>>testHenry049 (in category 'testing-henry') ----- testHenry049 self runRegex: #('[\de]+' '01234' true (1 '01234') '0123e456' true (1 '0123e456') '0123e45g78' true (1 '0123e45'))! ----- Method: RxMatcherTest>>testHenry050 (in category 'testing-henry') ----- testHenry050 self runRegex: #('[e\d]+' "reversal of the above, should be the same" '01234' true (1 '01234') '0123e456' true (1 '0123e456') '0123e45g78' true (1 '0123e45'))! ----- Method: RxMatcherTest>>testHenry051 (in category 'testing-henry') ----- testHenry051 self runRegex: #('[\D]+' '123abc45def78' true (1 'abc'))! ----- Method: RxMatcherTest>>testHenry052 (in category 'testing-henry') ----- testHenry052 self runRegex: #('[[:digit:]e]+' '01234' true (1 '01234') '0123e456' true (1 '0123e456') '0123e45g78' true (1 '0123e45'))! ----- Method: RxMatcherTest>>testHenry053 (in category 'testing-henry') ----- testHenry053 self runRegex: #('[\s]+' '2 spaces' true (1 ' '))! ----- Method: RxMatcherTest>>testHenry054 (in category 'testing-henry') ----- testHenry054 self runRegex: #('[\S]+' ' word12!!@#$ ' true (1 'word12!!@#$'))! ----- Method: RxMatcherTest>>testHenry055 (in category 'testing-henry') ----- testHenry055 self runRegex: #('[\w]+' ' foo123bar 45' true (1 'foo123bar'))! ----- Method: RxMatcherTest>>testHenry056 (in category 'testing-henry') ----- testHenry056 self runRegex: #('[\W]+' 'fii234!!@#$34f' true (1 '!!@#$'))! ----- Method: RxMatcherTest>>testHenry057 (in category 'testing-henry') ----- testHenry057 self runRegex: #('[^[:alnum:]]+' 'fii234!!@#$34f' true (1 '!!@#$'))! ----- Method: RxMatcherTest>>testHenry058 (in category 'testing-henry') ----- testHenry058 self runRegex: #('[%&[:alnum:]]+' 'foo%3' true (1 'foo%3') 'foo34&rt4$57a' true (1 'foo34&rt4') '!!@#$' false nil)! ----- Method: RxMatcherTest>>testHenry059 (in category 'testing-henry') ----- testHenry059 self runRegex: #('[[:alpha:]]+' ' 123foo3 ' true (1 'foo') '123foo' true (1 'foo') 'foo1b' true (1 'foo'))! ----- Method: RxMatcherTest>>testHenry060 (in category 'testing-henry') ----- testHenry060 self runRegex: #('[[:cntrl:]]+' ' a 1234asdf' false nil)! ----- Method: RxMatcherTest>>testHenry061 (in category 'testing-henry') ----- testHenry061 self runRegex: #('[[:lower:]]+' 'UPPERlower1234' true (1 'lower') 'lowerUPPER' true (1 'lower'))! ----- Method: RxMatcherTest>>testHenry062 (in category 'testing-henry') ----- testHenry062 self runRegex: #('[[:upper:]]+' 'UPPERlower1234' true (1 'UPPER') 'lowerUPPER ' true (1 'UPPER'))! ----- Method: RxMatcherTest>>testHenry063 (in category 'testing-henry') ----- testHenry063 self runRegex: #('[[:space:]]+' '2 spaces' true (1 ' '))! ----- Method: RxMatcherTest>>testHenry064 (in category 'testing-henry') ----- testHenry064 self runRegex: #('[^[:space:]]+' ' word12!!@#$ ' true (1 'word12!!@#$'))! ----- Method: RxMatcherTest>>testHenry065 (in category 'testing-henry') ----- testHenry065 self runRegex: #('[[:graph:]]+' 'abc' true (1 'abc'))! ----- Method: RxMatcherTest>>testHenry066 (in category 'testing-henry') ----- testHenry066 self runRegex: #('[[:print:]]+' 'abc' true (1 'abc'))! ----- Method: RxMatcherTest>>testHenry067 (in category 'testing-henry') ----- testHenry067 self runRegex: #('[^[:punct:]]+' '!!hello,world!!' true (1 'hello'))! ----- Method: RxMatcherTest>>testHenry068 (in category 'testing-henry') ----- testHenry068 self runRegex: #('[[:xdigit:]]+' ' x10FCD ' true (1 '10FCD') ' hgfedcba0123456789ABCDEFGH ' true (1 'fedcba0123456789ABCDEF'))! ----- Method: RxMatcherTest>>testHenry069 (in category 'testing-henry') ----- testHenry069 self runRegex: #('ab|cd' 'abc' true (1 'ab') 'abcd' true (1 'ab'))! ----- Method: RxMatcherTest>>testHenry070 (in category 'testing-henry') ----- testHenry070 self runRegex: #('()ef' 'def' true (1 'ef' 2 ''))! ----- Method: RxMatcherTest>>testHenry071 (in category 'testing-henry') ----- testHenry071 self runRegex: #('()*' nil)! ----- Method: RxMatcherTest>>testHenry072 (in category 'testing-henry') ----- testHenry072 self runRegex: #('*a' nil)! ----- Method: RxMatcherTest>>testHenry073 (in category 'testing-henry') ----- testHenry073 self runRegex: #('^*' nil)! ----- Method: RxMatcherTest>>testHenry074 (in category 'testing-henry') ----- testHenry074 self runRegex: #('$*' nil)! ----- Method: RxMatcherTest>>testHenry075 (in category 'testing-henry') ----- testHenry075 self runRegex: #('(*)b' nil)! ----- Method: RxMatcherTest>>testHenry076 (in category 'testing-henry') ----- testHenry076 self runRegex: #('$b' 'b' false nil)! ----- Method: RxMatcherTest>>testHenry077 (in category 'testing-henry') ----- testHenry077 self runRegex: #('a\' nil)! ----- Method: RxMatcherTest>>testHenry078 (in category 'testing-henry') ----- testHenry078 self runRegex: #('a\(b' 'a(b' true (1 'a(b'))! ----- Method: RxMatcherTest>>testHenry079 (in category 'testing-henry') ----- testHenry079 self runRegex: #('a\(*b' 'ab' true (1 'ab') 'a((b' true (1 'a((b'))! ----- Method: RxMatcherTest>>testHenry080 (in category 'testing-henry') ----- testHenry080 self runRegex: #('a\\b' 'a\b' true (1 'a\b'))! ----- Method: RxMatcherTest>>testHenry081 (in category 'testing-henry') ----- testHenry081 self runRegex: #('abc)' nil)! ----- Method: RxMatcherTest>>testHenry082 (in category 'testing-henry') ----- testHenry082 self runRegex: #('(abc' nil)! ----- Method: RxMatcherTest>>testHenry083 (in category 'testing-henry') ----- testHenry083 self runRegex: #('((a))' 'abc' true (1 'a' 2 'a' 3 'a'))! ----- Method: RxMatcherTest>>testHenry084 (in category 'testing-henry') ----- testHenry084 self runRegex: #('(a)b(c)' 'abc' true (1 'abc' 2 'a' 3 'c'))! ----- Method: RxMatcherTest>>testHenry085 (in category 'testing-henry') ----- testHenry085 self runRegex: #('a+b+c' 'aabbabc' true (1 'abc'))! ----- Method: RxMatcherTest>>testHenry086 (in category 'testing-henry') ----- testHenry086 self runRegex: #('a**' nil)! ----- Method: RxMatcherTest>>testHenry087 (in category 'testing-henry') ----- testHenry087 self runRegex: #('a*?' nil)! ----- Method: RxMatcherTest>>testHenry088 (in category 'testing-henry') ----- testHenry088 self runRegex: #('(a*)*' nil)! ----- Method: RxMatcherTest>>testHenry089 (in category 'testing-henry') ----- testHenry089 self runRegex: #('(a*)+' nil)! ----- Method: RxMatcherTest>>testHenry090 (in category 'testing-henry') ----- testHenry090 self runRegex: #('(a|)*' nil)! ----- Method: RxMatcherTest>>testHenry091 (in category 'testing-henry') ----- testHenry091 self runRegex: #('(a*|b)*' nil)! ----- Method: RxMatcherTest>>testHenry092 (in category 'testing-henry') ----- testHenry092 self runRegex: #('(a+|b)*' 'ab' true (1 'ab' 2 'b'))! ----- Method: RxMatcherTest>>testHenry093 (in category 'testing-henry') ----- testHenry093 self runRegex: #('(a+|b)+' 'ab' true (1 'ab' 2 'b'))! ----- Method: RxMatcherTest>>testHenry094 (in category 'testing-henry') ----- testHenry094 self runRegex: #('(a+|b)?' 'ab' true (1 'a' 2 'a'))! ----- Method: RxMatcherTest>>testHenry095 (in category 'testing-henry') ----- testHenry095 self runRegex: #('[^ab]*' 'cde' true (1 'cde'))! ----- Method: RxMatcherTest>>testHenry096 (in category 'testing-henry') ----- testHenry096 self runRegex: #('(^)*' nil)! ----- Method: RxMatcherTest>>testHenry097 (in category 'testing-henry') ----- testHenry097 self runRegex: #('(ab|)*' nil)! ----- Method: RxMatcherTest>>testHenry098 (in category 'testing-henry') ----- testHenry098 self runRegex: #(')(' nil)! ----- Method: RxMatcherTest>>testHenry099 (in category 'testing-henry') ----- testHenry099 self runRegex: #('' 'abc' true (1 ''))! ----- Method: RxMatcherTest>>testHenry100 (in category 'testing-henry') ----- testHenry100 self runRegex: #('abc' '' false nil)! ----- Method: RxMatcherTest>>testHenry101 (in category 'testing-henry') ----- testHenry101 self runRegex: #('a*' '' true '')! ----- Method: RxMatcherTest>>testHenry102 (in category 'testing-henry') ----- testHenry102 self runRegex: #('abcd' 'abcd' true (1 'abcd'))! ----- Method: RxMatcherTest>>testHenry103 (in category 'testing-henry') ----- testHenry103 self runRegex: #('a(bc)d' 'abcd' true (1 'abcd' 2 'bc'))! ----- Method: RxMatcherTest>>testHenry104 (in category 'testing-henry') ----- testHenry104 self runRegex: #('([abc])*d' 'abbbcd' true (1 'abbbcd' 2 'c'))! ----- Method: RxMatcherTest>>testHenry105 (in category 'testing-henry') ----- testHenry105 self runRegex: #('([abc])*bcd' 'abcd' true (1 'abcd' 2 'a'))! ----- Method: RxMatcherTest>>testHenry106 (in category 'testing-henry') ----- testHenry106 self runRegex: #('a|b|c|d|e' 'e' true (1 'e'))! ----- Method: RxMatcherTest>>testHenry107 (in category 'testing-henry') ----- testHenry107 self runRegex: #('(a|b|c|d|e)f' 'ef' true (1 'ef' 2 'e')) " ((a*|b))* - c - -"! ----- Method: RxMatcherTest>>testHenry108 (in category 'testing-henry') ----- testHenry108 self runRegex: #('abcd*efg' 'abcdefg' true (1 'abcdefg'))! ----- Method: RxMatcherTest>>testHenry109 (in category 'testing-henry') ----- testHenry109 self runRegex: #('ab*' 'xabyabbbz' true (1 'ab') 'xayabbbz' true (1 'a'))! ----- Method: RxMatcherTest>>testHenry110 (in category 'testing-henry') ----- testHenry110 self runRegex: #('(ab|cd)e' 'abcde' true (1 'cde' 2 'cd'))! ----- Method: RxMatcherTest>>testHenry111 (in category 'testing-henry') ----- testHenry111 self runRegex: #('[abhgefdc]ij' 'hij' true (1 'hij'))! ----- Method: RxMatcherTest>>testHenry112 (in category 'testing-henry') ----- testHenry112 self runRegex: #('^(ab|cd)e' 'abcde' false nil) ! ----- Method: RxMatcherTest>>testHenry113 (in category 'testing-henry') ----- testHenry113 self runRegex: #('(abc|)def' 'abcdef' true nil) ! ----- Method: RxMatcherTest>>testHenry114 (in category 'testing-henry') ----- testHenry114 self runRegex: #('(a|b)c*d' 'abcd' true (1 'bcd' 2 'b')) ! ----- Method: RxMatcherTest>>testHenry115 (in category 'testing-henry') ----- testHenry115 self runRegex: #('(ab|ab*)bc' 'abc' true (1 'abc' 2 'a')) ! ----- Method: RxMatcherTest>>testHenry116 (in category 'testing-henry') ----- testHenry116 self runRegex: #('a([bc]*)c*' 'abc' true (1 'abc' 2 'bc')) ! ----- Method: RxMatcherTest>>testHenry117 (in category 'testing-henry') ----- testHenry117 self runRegex: #('a([bc]*)(c*d)' 'abcd' true (1 'abcd' 2 'bc' 3 'd')) ! ----- Method: RxMatcherTest>>testHenry118 (in category 'testing-henry') ----- testHenry118 self runRegex: #('a([bc]+)(c*d)' 'abcd' true (1 'abcd' 2 'bc' 3 'd')) ! ----- Method: RxMatcherTest>>testHenry119 (in category 'testing-henry') ----- testHenry119 self runRegex: #('a([bc]*)(c+d)' 'abcd' true (1 'abcd' 2 'b' 3 'cd')) ! ----- Method: RxMatcherTest>>testHenry120 (in category 'testing-henry') ----- testHenry120 self runRegex: #('a[bcd]*dcdcde' 'adcdcde' true (1 'adcdcde')) ! ----- Method: RxMatcherTest>>testHenry121 (in category 'testing-henry') ----- testHenry121 self runRegex: #('a[bcd]+dcdcde' 'adcdcde' false nil) ! ----- Method: RxMatcherTest>>testHenry122 (in category 'testing-henry') ----- testHenry122 self runRegex: #('(ab|a)b*c' 'abc' true (1 'abc')) ! ----- Method: RxMatcherTest>>testHenry123 (in category 'testing-henry') ----- testHenry123 self runRegex: #('((a)(b)c)(d)' 'abcd' true (1 'abcd' 3 'a' 4 'b' 5 'd')) ! ----- Method: RxMatcherTest>>testHenry124 (in category 'testing-henry') ----- testHenry124 self runRegex: #('[ -~]*' 'abc' true (1 'abc')) ! ----- Method: RxMatcherTest>>testHenry125 (in category 'testing-henry') ----- testHenry125 self runRegex: #('[ -~ -~]*' 'abc' true (1 'abc')) ! ----- Method: RxMatcherTest>>testHenry126 (in category 'testing-henry') ----- testHenry126 self runRegex: #('[ -~ -~ -~]*' 'abc' true (1 'abc')) ! ----- Method: RxMatcherTest>>testHenry127 (in category 'testing-henry') ----- testHenry127 self runRegex: #('[ -~ -~ -~ -~]*' 'abc' true (1 'abc')) ! ----- Method: RxMatcherTest>>testHenry128 (in category 'testing-henry') ----- testHenry128 self runRegex: #('[ -~ -~ -~ -~ -~]*' 'abc' true (1 'abc')) ! ----- Method: RxMatcherTest>>testHenry129 (in category 'testing-henry') ----- testHenry129 self runRegex: #('[ -~ -~ -~ -~ -~ -~]*' 'abc' true (1 'abc')) ! ----- Method: RxMatcherTest>>testHenry130 (in category 'testing-henry') ----- testHenry130 self runRegex: #('[ -~ -~ -~ -~ -~ -~ -~]*' 'abc' true (1 'abc')) ! ----- Method: RxMatcherTest>>testHenry131 (in category 'testing-henry') ----- testHenry131 self runRegex: #('[a-zA-Z_][a-zA-Z0-9_]*' 'alpha' true (1 'alpha')) ! ----- Method: RxMatcherTest>>testHenry132 (in category 'testing-henry') ----- testHenry132 self runRegex: #('^a(bc+|b[eh])g|.h$' 'abh' true (1 'bh' 2 nil)) ! ----- Method: RxMatcherTest>>testHenry133 (in category 'testing-henry') ----- testHenry133 self runRegex: #('(bc+d$|ef*g.|h?i(j|k))' 'effgz' true (1 'effgz' 2 'effgz' 3 nil) 'ij' true (1 'ij' 2 'ij' 3 'j') 'effg' false nil 'bcdd' false nil 'reffgz' true (1 'effgz' 2 'effgz' 3 nil))! ----- Method: RxMatcherTest>>testHenry134 (in category 'testing-henry') ----- testHenry134 self runRegex: #('(((((((((a)))))))))' 'a' true (1 'a'))! ----- Method: RxMatcherTest>>testHenry135 (in category 'testing-henry') ----- testHenry135 self runRegex: #('multiple words of text' 'uh-uh' false nil 'multiple words of text, yeah' true (1 'multiple words of text'))! ----- Method: RxMatcherTest>>testHenry136 (in category 'testing-henry') ----- testHenry136 self runRegex: #('(.*)c(.*)' 'abcde' true (1 'abcde' 2 'ab' 3 'de'))! ----- Method: RxMatcherTest>>testHenry137 (in category 'testing-henry') ----- testHenry137 self runRegex: #('$(.*), (.*)$' '(a, b)' true (2 'a' 3 'b'))! ----- Method: RxMatcherTest>>testMatches (in category 'testing-protocol') ----- testMatches | matcher | matcher := self matcherClass forString: '\w+'. self assert: (matcher matches: 'now'). self deny: (matcher matches: 'now is')! ----- Method: RxMatcherTest>>testMatchesIn (in category 'testing-protocol') ----- testMatchesIn | matcher | matcher := self matcherClass forString: '\w+'. self assert: (matcher matchesIn: 'now is the time') asArray = #('now' 'is' 'the' 'time')! ----- Method: RxMatcherTest>>testMatchesInCollect (in category 'testing-protocol') ----- testMatchesInCollect | matcher | matcher := self matcherClass forString: '\w+'. self assert: (matcher matchesIn: 'now is the time' collect: [ :each | each reversed ]) asArray = #('won' 'si' 'eht' 'emit')! ----- Method: RxMatcherTest>>testMatchesInDo (in category 'testing-protocol') ----- testMatchesInDo | matcher expected | matcher := self matcherClass forString: '\w+'. expected := #('now' 'is' 'the' 'time') asOrderedCollection. matcher matchesIn: 'now is the time' do: [ :each | self assert: each = expected removeFirst ]. self assert: expected isEmpty! ----- Method: RxMatcherTest>>testMatchesOnStream (in category 'testing-protocol') ----- testMatchesOnStream | matcher | matcher := self matcherClass forString: '\w+'. self assert: (matcher matchesOnStream: 'now is the time' readStream) asArray = #('now' 'is' 'the' 'time')! ----- Method: RxMatcherTest>>testMatchesOnStreamCollect (in category 'testing-protocol') ----- testMatchesOnStreamCollect | matcher | matcher := self matcherClass forString: '\w+'. self assert: (matcher matchesOnStream: 'now is the time' readStream collect: [ :each | each reversed ]) asArray = #('won' 'si' 'eht' 'emit')! ----- Method: RxMatcherTest>>testMatchesOnStreamDo (in category 'testing-protocol') ----- testMatchesOnStreamDo | matcher expected | matcher := self matcherClass forString: '\w+'. expected := #('now' 'is' 'the' 'time') asOrderedCollection. matcher matchesOnStream: 'now is the time' readStream do: [ :each | self assert: each = expected removeFirst ]. self assert: expected isEmpty! ----- Method: RxMatcherTest>>testMatchesStream (in category 'testing-protocol') ----- testMatchesStream | matcher | matcher := self matcherClass forString: '\w+'. self assert: (matcher matchesStream: 'now' readStream). self deny: (matcher matchesStream: 'now is' readStream)! ----- Method: RxMatcherTest>>testMatchingRangesIn (in category 'testing-protocol') ----- testMatchingRangesIn | matcher expected | matcher := self matcherClass forString: '\w+'. expected := #(1 3 5 6 8 10 12 15) asOrderedCollection. (matcher matchingRangesIn: 'now is the time') do: [ :range | self assert: range first = expected removeFirst. self assert: range last = expected removeFirst ]. self assert: expected isEmpty! ----- Method: RxMatcherTest>>testRegex001 (in category 'testing') ----- testRegex001 self runRegex: #('^.*$' '' true (1 '') 'a' true (1 'a') 'abc' true (1 'abc'))! ----- Method: RxMatcherTest>>testRegex002 (in category 'testing') ----- testRegex002 self runRegex: #('a\w+c' ' abb_bbc ' true (1 'abb_bbc') 'abb-bc' false nil)! ----- Method: RxMatcherTest>>testRegex003 (in category 'testing') ----- testRegex003 self runRegex: #('a\W+c' ' abb_bbc ' false nil 'abb-bc' false nil 'a.,:;-&!!"#%/()={[]}+?\~*''c' true (1 'a.,:;-&!!"#%/()={[]}+?\~*''c'))! ----- Method: RxMatcherTest>>testRegex004 (in category 'testing') ----- testRegex004 self runRegex: #(':isVowel:' 'aei' true nil 'xyz' false nil)! ----- Method: RxMatcherTest>>testStringAllRangesOfRegexMatches (in category 'testing-extensions') ----- testStringAllRangesOfRegexMatches | result | result := 'aabbcc' allRangesOfRegexMatches: 'b+'. self assert: result size = 1. self assert: result first first = 3. self assert: result first last = 4 ! ----- Method: RxMatcherTest>>testStringAllRegexMatches (in category 'testing-extensions') ----- testStringAllRegexMatches | result | result := 'aabbcc' allRegexMatches: 'b+'. self assert: result size = 1. self assert: result first = 'bb'! ----- Method: RxMatcherTest>>testStringAsRegex (in category 'testing-extensions') ----- testStringAsRegex self assert: 'b+' asRegex class = RxParser preferredMatcherClass! ----- Method: RxMatcherTest>>testStringAsRegexIgnoringCase (in category 'testing-extensions') ----- testStringAsRegexIgnoringCase self assert: 'b+' asRegexIgnoringCase class = RxParser preferredMatcherClass! ----- Method: RxMatcherTest>>testStringCopyWithRegexMatchesReplacedWith (in category 'testing-extensions') ----- testStringCopyWithRegexMatchesReplacedWith self assert: ('aabbcc' copyWithRegex: 'b+' matchesReplacedWith: 'X') = 'aaXcc'! ----- Method: RxMatcherTest>>testStringCopyWithRegexMatchesTranslatedUsing (in category 'testing-extensions') ----- testStringCopyWithRegexMatchesTranslatedUsing self assert: ('aabbcc' copyWithRegex: 'b+' matchesTranslatedUsing: [ :each | self assert: each = 'bb'. 'X' ]) = 'aaXcc'! ----- Method: RxMatcherTest>>testStringMatchesRegex (in category 'testing-extensions') ----- testStringMatchesRegex self deny: ('aabbcc' matchesRegex: 'a+'). self deny: ('aabbcc' matchesRegex: 'b+c+'). self assert: ('aabbcc' matchesRegex: 'a+b+c+')! ----- Method: RxMatcherTest>>testStringMatchesRegexIgnoringCase (in category 'testing-extensions') ----- testStringMatchesRegexIgnoringCase self deny: ('AABBCC' matchesRegexIgnoringCase: 'a+'). self deny: ('AABBCC' matchesRegexIgnoringCase: 'b+c+'). self assert: ('AABBCC' matchesRegexIgnoringCase: 'a+b+c+')! ----- Method: RxMatcherTest>>testStringPrefixMatchesRegex (in category 'testing-extensions') ----- testStringPrefixMatchesRegex self assert: ('aabbcc' prefixMatchesRegex: 'a+'). self deny: ('aabbcc' prefixMatchesRegex: 'b+')! ----- Method: RxMatcherTest>>testStringPrefixMatchesRegexIgnoringCase (in category 'testing-extensions') ----- testStringPrefixMatchesRegexIgnoringCase self assert: ('AABBCC' prefixMatchesRegexIgnoringCase: 'a+'). self deny: ('AABBCC' prefixMatchesRegexIgnoringCase: 'b+')! ----- Method: RxMatcherTest>>testStringRegexMatchesCollect (in category 'testing-extensions') ----- testStringRegexMatchesCollect | result | result := 'aabbcc' regex: 'b+' matchesCollect: [ :each | each asUppercase ]. self assert: result size = 1. self assert: result first = 'BB'! ----- Method: RxMatcherTest>>testStringRegexMatchesDo (in category 'testing-extensions') ----- testStringRegexMatchesDo | result | result := OrderedCollection new. 'aabbcc' regex: 'b+' matchesDo: [ :each | result add: each ]. self assert: result size = 1. self assert: result first = 'bb'! ----- Method: RxMatcherTest>>testSubexpressionCount (in category 'testing-protocol') ----- testSubexpressionCount | matcher | #(('a' 1) ('a(b)' 2) ('a(b(c))' 3) ('(a)(b)' 3) ('(a(b))*' 3)) do: [ :pair | matcher := self matcherClass forString: pair first. matcher supportsSubexpressions ifTrue: [ self assert: matcher subexpressionCount = pair last ] ]! TestCase subclass: #RxParserTest instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'Regex-Tests-Core'! !RxParserTest commentStamp: 'Tbn 11/12/2010 22:31' prior: 0! This class provides tests for the regular expression parser.! ----- Method: RxParserTest>>DoesNotWorktestBackQuotesEscape (in category 'tests') ----- DoesNotWorktestBackQuotesEscape "self debug: #testBackQuotesEscape" "Regular expressions can also include the following backquote escapes to refer to popular classes of characters: \w any word constituent character (same as [a-zA-Z0-9:=]) \W any character but a word constituent \d a digit (same as [0-9]) \D anything but a digit \s a whitespace character \S anything but a whitespace character These escapes are also allowed in character classes: '[\w+-]' means 'any character that is either a word constituent, or a plus, or a minus'." self assert: ('one word' matchesRegex: '\w'). self assert: ('one' matchesRegex: '\w'). ! ----- Method: RxParserTest>>test (in category 'tests') ----- test "self debug: #test" self assert: ('\<t\w+' asRegexIgnoringCase copy: 'now is the Time' translatingMatchesUsing: [:match | match asUppercase]) = 'now is THE TIME'. "the regular expression matches words beginning with either an uppercase or a lowercase T"! ----- Method: RxParserTest>>testCadrMatching (in category 'tests') ----- testCadrMatching "self debug: #testCadrMatching" "A bit more complex example is the following expression, matching the name of any of the Lisp-style `car', `cdr', `caar', `cadr', ... functions:" self assert: ( 'car' matchesRegex: 'c(a|d)+r'). self assert: ( 'cdr' matchesRegex: 'c(a|d)+r'). self assert: ( 'caar' matchesRegex: 'c(a|d)+r'). self assert: ( 'cadr' matchesRegex: 'c(a|d)+r'). self assert: ( 'caddar' matchesRegex: 'c(a|d)+r').! ----- Method: RxParserTest>>testCharacterSet (in category 'tests') ----- testCharacterSet "self debug: #testCharacterSet" "So far, we have used only characters as the 'smallest' components of regular expressions. There are other, more `interesting', components. A character set is a string of characters enclosed in square brackets. It matches any single character if it appears between the brackets. For example, `[01]' matches either `0' or `1':" self assert: ('0' matchesRegex: '[01]'). self deny: ('3' matchesRegex: '[01]'). self deny: ('11' matchesRegex: '[01]'). "-- false: a set matches only one character" self deny: ('01' matchesRegex: '[01]'). ! ----- Method: RxParserTest>>testCharacterSetBinaryNumber (in category 'tests') ----- testCharacterSetBinaryNumber "self debug: #testCharacterSetBinaryNumber" "Using plus operator, we can build the following binary number recognizer:" self assert: ('10010100' matchesRegex: '[01]+'). self deny: ('10001210' matchesRegex: '[01]+') ! ----- Method: RxParserTest>>testCharacterSetInversion (in category 'tests') ----- testCharacterSetInversion "self debug: #testCharacterSetInversion" "If the first character after the opening bracket is `^', the set is inverted: it matches any single character *not* appearing between the brackets:" self deny: ('0' matchesRegex: '[^01]'). "0 appears in 01 so there is no match" self assert: ('3' matchesRegex: '[^01]'). "3 is not in 01 so it matches" self deny: ('30' matchesRegex: '[^01]'). self deny: ('33333333333333333333333330' matchesRegex: '[^01]'). "there is one zero so it does not match"! ----- Method: RxParserTest>>testCharacterSetRange (in category 'tests') ----- testCharacterSetRange "self debug: #testCharacterSetRange" "For convenience, a set may include ranges: pairs of characters separated with `-'. This is equivalent to listing all characters between them: `[0-9]' is the same as `[0123456789]'. " self assert: ('0' matchesRegex: '[0-9]'). self assert: ('9' matchesRegex: '[0-9]'). self deny: ('a' matchesRegex: '[0-9]'). self deny: ('01' matchesRegex: '[0-9]'). self assert: ('01442128629839374565' matchesRegex: '[0-9]+'). ! ----- Method: RxParserTest>>testLookaround (in category 'tests') ----- testLookaround self assert: ('A' matchesRegex: '(?!!ABC).*'). self assert: ('AB' matchesRegex: '(?!!ABC).*'). self deny: ('ABC' matchesRegex: '(?!!ABC).*').! ----- Method: RxParserTest>>testMatchesInwW (in category 'tests') ----- testMatchesInwW "self debug: #testMatchesInwW" "1. Backslash escapes similar to those in Perl are allowed in patterns: \w any word constituent character (equivalent to [a-zA-Z0-9:=]) \W any character but a word constituent (equivalent to [^a-xA-Z0-9:=]" self assert: ('\w+' asRegex matchesIn: 'now is the time') asArray = #('now' 'is' 'the' 'time'). self assert: ('\W+' asRegex matchesIn: 'now is the time') asArray = #(' ' ' ' ' '). "why do we get that" self assert: ('\w' asRegex matchesIn: 'now') asArray = #('n' 'o' 'w').! ----- Method: RxParserTest>>testOrOperator (in category 'tests') ----- testOrOperator "self debug: #testOrOperator" "The last operator is `|' meaning `or'. It is placed between two regular expressions, and the resulting expression matches if one of the expressions matches. It has the lowest possible precedence (lower than sequencing). For example, `ab*|ba*' means `a followed by any number of b's, or b followed by any number of a's':" self assert: ('abb' matchesRegex: 'ab*|ba*'). self assert: ('baa' matchesRegex: 'ab*|ba*'). self deny: ('baab' matchesRegex: 'ab*|ba*'). "It is possible to write an expression matching an empty string, for example: `a|'. However, it is an error to apply `*', `+', or `?' to such expression: `(a|)*' is an invalid expression." self should: ['(a|)*' asRegex] raise: Error. ! ----- Method: RxParserTest>>testQuantifier (in category 'tests') ----- testQuantifier self deny: ('' matchesRegex: 'a{2}'). self deny: ('a' matchesRegex: 'a{2}'). self assert: ('aa' matchesRegex: 'a{2}'). self deny: ('aaa' matchesRegex: 'a{2}'). self deny: ('' matchesRegex: 'a{2,3}'). self deny: ('a' matchesRegex: 'a{2,3}'). self assert: ('aa' matchesRegex: 'a{2,3}'). self assert: ('aaa' matchesRegex: 'a{2,3}'). self deny: ('aaaa' matchesRegex: 'a{2,3}'). self deny: ('' matchesRegex: 'a{2,}'). self deny: ('a' matchesRegex: 'a{2,}'). self assert: ('aa' matchesRegex: 'a{2,}'). self assert: ('aaa' matchesRegex: 'a{2,}'). self assert: ('aaaa' matchesRegex: 'a{2,}'). self assert: ('' matchesRegex: 'a{,3}'). self assert: ('a' matchesRegex: 'a{,3}'). self assert: ('aa' matchesRegex: 'a{,3}'). self assert: ('aaa' matchesRegex: 'a{,3}'). self deny: ('aaaa' matchesRegex: 'a{,3}').! ----- Method: RxParserTest>>testQuantifierSimple (in category 'tests') ----- testQuantifierSimple "Test quantifier expressions that can be expressed with + or *" self assert: ('a' matchesRegex: 'a{1}'). self deny: ('aa' matchesRegex: 'a{1}'). self assert: ('a' matchesRegex: 'a{1,1}'). self deny: ('aa' matchesRegex: 'a{1,1}'). self assert: ('ab' matchesRegex: '(ab){1,}'). self assert: ('abab' matchesRegex: '(ab){1,}'). self deny: ('' matchesRegex: '(ab){1,}'). self assert: ('ab' matchesRegex: '(ab){,1}'). self assert: ('' matchesRegex: '(ab){,1}'). self deny: ('abab' matchesRegex: '(ab){,1}').! ----- Method: RxParserTest>>testQuotingOperators (in category 'tests') ----- testQuotingOperators "self debug: #testQuotingOperators" "As we have seen, characters `*', `+', `?', `(', and `)' have special meaning in regular expressions. If one of them is to be used literally, it should be quoted: preceded with a backslash. (Thus, backslash is also special character, and needs to be quoted for a literal match--as well as any other special character described further)." self deny: ('ab*' matchesRegex: 'ab*'). " -- false: star in the right string is special" self assert: ('ab*' matchesRegex: 'ab\*'). self assert: ('a\c' matchesRegex: 'a\\c'). ! ----- Method: RxParserTest>>testSimpleMatchesRegex (in category 'tests') ----- testSimpleMatchesRegex "self debug: #testSimpleMatchesRegex" "The simplest regular expression is a single character. It matches exactly that character. A sequence of characters matches a string with exactly the same sequence of characters:" self assert: ('a' matchesRegex: 'a'). self assert: ('foobar' matchesRegex: 'foobar') . self deny: ('blorple' matchesRegex: 'foobar')! ----- Method: RxParserTest>>testSimpleMatchesRegexWithStar (in category 'tests') ----- testSimpleMatchesRegexWithStar "self debug: #testSimpleMatchesRegexWithStar" "The above paragraph in testSimpleMatchesRegex introduced a primitive regular expression (a character), and an operator (sequencing). Operators are applied to regular expressions to produce more complex regular expressions. Sequencing (placing expressions one after another) as an operator is, in a certain sense, `invisible'--yet it is arguably the most common. A more `visible' operator is Kleene closure, more often simply referred to as `a star'. A regular expression followed by an asterisk matches any number (including 0) of matches of the original expression. For example:" self assert: ('ab' matchesRegex: 'a*b'). self assert: ('aaaaab' matchesRegex: 'a*b'). self assert: ('b' matchesRegex: 'a*b'). self deny: ('aac' matchesRegex: 'a*b'). ! ----- Method: RxParserTest>>testSpecialCharacterInSetRange (in category 'tests') ----- testSpecialCharacterInSetRange "self debug: #testSpecialCharacterInSetRange" "Special characters within a set are `^', `-', and `]' that closes the set. Below are the examples of how to literally use them in a set: [01^] -- put the caret anywhere except the beginning [01-] -- put the dash as the last character []01] -- put the closing bracket as the first character [^]01] (thus, empty and universal sets cannot be specified)" self assert: ('0' matchesRegex: '[01^]'). self assert: ('1' matchesRegex: '[01^]'). self assert: ('^' matchesRegex: '[01^]'). self deny: ('0' matchesRegex: '[^01]'). self deny: ('1' matchesRegex: '[^01]'). "[^abc] means that everything except abc is matche" self assert: ('^' matchesRegex: '[^01]'). ! ----- Method: RxParserTest>>testStarPlusQuestionMark (in category 'tests') ----- testStarPlusQuestionMark "self debug: #testStarPlusQuestionMark" "Two other operators similar to `*' are `+' and `?'. `+' (positive closure, or simply `plus') matches one or more occurrences of the original expression. `?' (`optional') matches zero or one, but never more, occurrences." self assert: ('ac' matchesRegex: 'ab*c'). self deny: ('ac' matchesRegex: 'ab+c'). "-- false: need at least one b" self assert: ('abbc' matchesRegex: 'ab+c'). self assert: ('abbbbbbc' matchesRegex: 'ab+c'). self deny: ('abbc' matchesRegex: 'ab?c') "-- false: too many b's"! ----- Method: RxParserTest>>testStarPrecedence (in category 'tests') ----- testStarPrecedence "self debug: #testStarPrecedence" "A star's precedence is higher than that of sequencing. A star applies to the shortest possible subexpression that precedes it. For example, 'ab*' means `a followed by zero or more occurrences of b', not `zero or more occurrences of ab':" self assert: ('abbb' matchesRegex: 'ab*'). self deny: ('abab' matchesRegex: 'ab*'). "To actually make a regex matching `zero or more occurrences of ab', `ab' is enclosed in parentheses:" self assert: ('abab' matchesRegex: '(ab)*'). self deny: ('abcab' matchesRegex: '(ab)*')! ----- Method: RxParserTest>>testTranslatingMatchesUsing (in category 'tests') ----- testTranslatingMatchesUsing "self debug: #testTranslatingMatchesUsing" self assert: ('\<t\w+' asRegexIgnoringCase copy: 'now is the Time' translatingMatchesUsing: [:match | match asUppercase]) = 'now is THE TIME'. "the regular expression matches words beginning with either an uppercase or a lowercase T"! ----- Method: RxParserTest>>toDotestSpecialCharacterInSetRange (in category 'tests') ----- toDotestSpecialCharacterInSetRange "self debug: #testSpecialCharacterInSetRange" "Special characters within a set are `^', `-', and `]' that closes the set. Below are the examples of how to literally use them in a set: [01^] -- put the caret anywhere except the beginning [01-] -- put the dash as the last character []01] -- put the closing bracket as the first character [^]01] (thus, empty and universal sets cannot be specified)" self assert: ('0' matchesRegex: '[01^]'). self assert: ('0' matchesRegex: '[0-9]'). !

1 0

Jump to page: