Packages October 2022

packages@lists.squeakfoundation.org

1 participants
58 discussions

The Trunk: Tools-ct.1177.mcz
by commits＠source.squeak.org 15 Oct '22

15 Oct '22

Christoph Thiede uploaded a new version of Tools to project The Trunk: http://source.squeak.org/trunk/Tools-ct.1177.mcz ==================== Summary ==================== Name: Tools-ct.1177 Author: ct Time: 15 October 2022, 8:08:17.803171 pm UUID: d0aef212-fcd5-9747-ba97-c167788fa1fb Ancestors: Tools-ct.1176 Fixes and revises PackagePaneBrowser for case mismatches between a system category and the associated package name. Improves the short label for categories that equal the package name (without a suffix). If no category is selected, shows all classes from the package. Thanks to Jakob (jr) for the assistance! See: https://lists.squeakfoundation.org/pipermail/squeak-dev/2022-September/2222… =============== Diff against Tools-ct.1176 =============== Item was changed: ----- Method: PackagePaneBrowser>>classList (in category 'class list') ----- classList - "Answer an array of the class names of the selected category. Answer an - empty array if no selection exists." + self hasSystemCategorySelected ifTrue: + [| thisPackage thisCatSufix categories | + thisPackage := self package. + thisCatSufix := self selectedSystemCategoryWithoutPackage. + categories := systemOrganizer categories select: [:eachCat | + eachCat size >= thisPackage size + and: ["package prefix may occur in different cases, because they are assembled in the same package" + ((eachCat first: thisPackage size) compare: thisPackage caseSensitive: false) = 2] + and: ["rest of system category must have exact case, because it is discrimnated by the system category list" + (eachCat allButFirst: thisPackage size) = thisCatSufix]]. + ^ categories gather: [:eachCat | + systemOrganizer listAtCategoryNamed: eachCat]]. + + self hasPackageSelected ifTrue: + [^ self packageClasses]. + + ^ systemOrganizer allElements! - ^ self hasSystemCategorySelected - ifFalse: [self packageClasses] - ifTrue: [systemOrganizer listAtCategoryNamed: self selectedSystemCategory]! Item was changed: ----- Method: PackagePaneBrowser>>packageClasses (in category 'class list') ----- packageClasses + + ^ self packageInfo classes collect: [:class | class name]! - ^ self categoryExistsForPackage - ifFalse: [Array new] - ifTrue: - [systemOrganizer listAtCategoryNumber: - (systemOrganizer categories indexOf: self package asSymbol)]! Item was added: + ----- Method: PackagePaneBrowser>>packageInfo (in category 'accessing') ----- + packageInfo + + ^ PackageInfo named: (self package ifNil: [^ nil])! Item was changed: ----- Method: PackagePaneBrowser>>selectedSystemCategory (in category 'system category list') ----- selectedSystemCategory + "Answer the full name of the selected system category or nil. Opposite of #systemCategoryList." - "Answer the name of the selected system category or nil." + | thisCatSuffix | self hasSystemCategorySelected + ifFalse: [^ nil]. + thisCatSuffix := self selectedSystemCategoryWithoutPackage. - ifFalse: [^nil]. packageListIndex = 0 + ifTrue: [^ thisCatSuffix]. + ^ self package , thisCatSuffix! - ifTrue: [^ super selectedSystemCategory ]. - ^ self package , '-' , super selectedSystemCategory! Item was added: + ----- Method: PackagePaneBrowser>>selectedSystemCategoryWithoutPackage (in category 'system category list') ----- + selectedSystemCategoryWithoutPackage + "Answer the name of the selected system category without package prefix or nil. Opposite of #systemCategoryList." + + | shortCat | + self hasSystemCategorySelected + ifFalse: [^ nil]. + shortCat := super selectedSystemCategory. + packageListIndex = 0 + ifTrue: [^ shortCat]. + shortCat = '(default category)' translated + ifTrue: [^ '']. + shortCat = '-' + ifTrue: [^ '-']. + ^ '-' , shortCat! Item was changed: ----- Method: PackagePaneBrowser>>systemCategoryList (in category 'system category list') ----- systemCategoryList + "Answer the sequenceable collection containing the class categories that the receiver accesses." - "Answer the sequenceable collection containing the class categories that - the receiver accesses." | prefix | packageListIndex = 0 ifTrue: [^ systemOrganizer categories]. + prefix := self package. + ^ (self packageInfo systemCategories + collect: [:cat | + | shortCat | + shortCat := cat allButFirst: prefix size. + (shortCat size > 1 and: [shortCat first = $-]) + ifTrue: [shortCat allButFirst] + ifFalse: [shortCat ifEmpty: ['(default category)' translated]]]) + withoutDuplicates "different cases of the same category possible" + + "The following class organization for the package MyPackage should be properly viewable in a PackagePaneBrowser: + ('mypackage' MyClassLowerCase) + ('Mypackage' MyClassMixedCase) + ('mypackage3' MyClassNotContained) + ('MyPackage' MyClass) + ('MyPackage-' MyClassDash) + ('Mypackage-foo' MyTestLowerSuffix) + ('Mypackage-Foo' MyTestUpperSuffix) + "! - prefix := self package, '-'. - ^ Array streamContents: - [:strm | - systemOrganizer categories do: - [ :cat | (cat beginsWith: prefix) ifTrue: - [strm nextPut: (cat copyFrom: prefix size + 1 to: cat size)]]]!

1 0

The Trunk: Morphic-mt.2049.mcz
by commits＠source.squeak.org 14 Oct '22

14 Oct '22

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.2049.mcz ==================== Summary ==================== Name: Morphic-mt.2049 Author: mt Time: 14 October 2022, 10:45:54.28209 am UUID: 1b36eb2c-8669-0a46-96ea-f979d47332f7 Ancestors: Morphic-ct.2048 Fixes issue with full-bounds halo and drop events. (Already backported to Squeak 6.0) =============== Diff against Morphic-ct.2048 =============== Item was changed: ----- Method: SimpleHaloMorph>>updateEnclosesFullBounds: (in category 'updating') ----- updateEnclosesFullBounds: anEvent + self enclosesFullBounds: (Preferences haloEnclosesFullBounds + xor: [anEvent isDropEvent not and: [anEvent controlKeyPressed]]).! - self enclosesFullBounds: (Preferences haloEnclosesFullBounds xor: anEvent controlKeyPressed).!

1 0

The Trunk: Regex-Tests-Core-ct.33.mcz
by commits＠source.squeak.org 12 Oct '22

12 Oct '22

Christoph Thiede uploaded a new version of Regex-Tests-Core to project The Trunk: http://source.squeak.org/trunk/Regex-Tests-Core-ct.33.mcz ==================== Summary ==================== Name: Regex-Tests-Core-ct.33 Author: ct Time: 12 October 2022, 9:14:35.518651 pm UUID: fc86c31c-be78-8a4c-ab33-6d1afeb18a4f Ancestors: Regex-Tests-Core-ct.32 Adds a missing test for negated message predicates. =============== Diff against Regex-Tests-Core-ct.32 =============== Item was changed: ----- Method: RxMatcherTest>>testRegex004 (in category 'testing') ----- testRegex004 self runRegex: #(':isVowel:' 'aei' true nil + 'xyz' false nil). + self runRegex: #(':^isVowel:' + 'aei' false nil + 'xyz' true nil)! - 'xyz' false nil)!

1 0

The Trunk: Regex-Tests-Core-ct.32.mcz
by commits＠source.squeak.org 12 Oct '22

12 Oct '22

Christoph Thiede uploaded a new version of Regex-Tests-Core to project The Trunk: http://source.squeak.org/trunk/Regex-Tests-Core-ct.32.mcz ==================== Summary ==================== Name: Regex-Tests-Core-ct.32 Author: ct Time: 12 October 2022, 3:43:55.590412 pm UUID: a5d9868e-f796-6741-940e-fb354d590aea Ancestors: Regex-Tests-Core-ct.31 Complements Regex-Core-ct.84 (ordering of keyed subexpression ranges). =============== Diff against Regex-Tests-Core-ct.31 =============== Item was changed: ----- Method: RxMatcherTest>>testKeyedSubexpressions (in category 'testing-protocol') ----- testKeyedSubexpressions { #('abc' () ()). #('(\w)+' () ()). {'(?<foo>a)b(c)'. #(foo ('a')). {#foo. {1 to: 1}}}. {'(?<foo>\w+)'. #(foo ('abc')). {#foo. {1 to: 3}}}. {'(?<foo>\w)+'. #(foo ('a' 'b' 'c')). {#foo. {1 to: 1. 2 to: 2. 3 to: 3}}}. + {'(?<foo>((?<foo>b)|(?<foo>[^b]))+)'. #(foo ('a' 'b' 'c' 'abc' )). {#foo. {1 to: 1. 2 to: 2. 3 to: 3. 1 to: 3}}}. #('abc(?<foo>\w)?' (foo ()) (foo ())) } do: [:spec | | matcher | matcher := spec first asRegex. self assert: (matcher matches: 'abc'). self assert: (Dictionary newFromPairs: spec second) equals: matcher allKeyedSubexpressions. self assert: (Dictionary newFromPairs: spec third) associations equals: (matcher keyedMarkers collect: [:key | key -> (matcher keyedSubexpressionRanges: key) asArray])].!

1 0

The Trunk: Regex-Core-ct.84.mcz
by commits＠source.squeak.org 12 Oct '22

12 Oct '22

Christoph Thiede uploaded a new version of Regex-Core to project The Trunk: http://source.squeak.org/trunk/Regex-Core-ct.84.mcz ==================== Summary ==================== Name: Regex-Core-ct.84 Author: ct Time: 12 October 2022, 3:43:39.287412 pm UUID: 5d80a0f0-0d3e-a84f-92af-0aec4b5512db Ancestors: Regex-Core-ct.83 Fixes ordering of keyed subexpression ranges. =============== Diff against Regex-Core-ct.83 =============== Item was changed: ----- Method: RxMatcher>>keyedSubexpressionRanges: (in category 'accessing') ----- keyedSubexpressionRanges: key "Answer an array of all match ranges (inclusiveStart -> inclusiveStop) of the subexpression at the given key." + ^ ((keyedMarkerPositions at: key) gather: [:pair | - ^ (keyedMarkerPositions at: key) gather: [:pair | (markerPositions at: pair first) with: (markerPositions at: pair second) + collect: [:start :stop | start + 1 to: stop]]) + "Since the same key can be defined for multiple markers, ordering the matches is non-trivial." + sort: [:range | range stop] ascending! - collect: [:start :stop | start + 1 to: stop]]!

1 0

The Trunk: Regex-Core-ct.83.mcz
by commits＠source.squeak.org 12 Oct '22

12 Oct '22

Christoph Thiede uploaded a new version of Regex-Core to project The Trunk: http://source.squeak.org/trunk/Regex-Core-ct.83.mcz ==================== Summary ==================== Name: Regex-Core-ct.83 Author: ct Time: 12 October 2022, 3:20:39.299412 pm UUID: c683e8df-5bf8-8748-9241-aabd0f884932 Ancestors: Regex-Core-ct.82 Repairs UIManager>>#request:regex:. =============== Diff against Regex-Core-ct.82 =============== Item was changed: ----- Method: UIManager>>request:regex: (in category '*Regex-Core') ----- request: aTitleString regex: initialRegexString "Prompt the user for a valid regex. Return nil on cancel or a valid RxMatcher" | regex | regex := initialRegexString. "loop until we get a valid regex string back" [ + regex := self - regex := UIManager default multiLineRequest: aTitleString + centerAt: Sensor cursorPoint initialAnswer: regex answerHeight: 200. "cancelled dialog ==> nil" regex ifNil: [ ^ nil ]. + [ ^ regex asRegex ] on: Error do: [ :regexParsingError | + self inform: 'Bad Regex: ', regexParsingError asString ]. - [ ^ regex asRegex ] on: Error do: [ :regexParsingError| - self defer: [ self inform: 'Bad Regex: ', regexParsingError asString ]]. ] repeat.!

1 0

The Trunk: Regex-Core-ct.82.mcz
by commits＠source.squeak.org 12 Oct '22

12 Oct '22

Christoph Thiede uploaded a new version of Regex-Core to project The Trunk: http://source.squeak.org/trunk/Regex-Core-ct.82.mcz ==================== Summary ==================== Name: Regex-Core-ct.82 Author: ct Time: 12 October 2022, 3:07:26.700412 pm UUID: 9854ef71-758d-6e44-8761-0fe1f5681198 Ancestors: Regex-Core-ct.81 Minor refactoring: In #syntaxLookaround:, only pass receiver like in other dispatch selectors. Slightly recategorizes RxmLink and RxsNode hierarchy and adds missing abstract #dispatchTo:. Removes unused private initialization selectors from RxsLookaround and RxsMessagePredicate. Renames RxsMessagePredicate>>#negated into #isNegated to avoid confusion with #negated implementation of RxsCharacter et al. =============== Diff against Regex-Core-ct.81 =============== Item was added: + ----- Method: RxMatchOptimizer>>syntaxLookaround: (in category 'double dispatch') ----- + syntaxLookaround: lookaroundNode + "Do nothing."! Item was removed: - ----- Method: RxMatchOptimizer>>syntaxLookaround:forward:positive: (in category 'double dispatch') ----- - syntaxLookaround: lookaroundNode forward: forward positive: positive - "Do nothing."! Item was changed: ----- Method: RxMatchOptimizer>>syntaxMessagePredicate: (in category 'double dispatch') ----- syntaxMessagePredicate: messagePredicateNode + messagePredicateNode isNegated ifTrue: [ - messagePredicateNode negated ifTrue: [ ^self addNonMethodPredicate: messagePredicateNode selector ]. self addMethodPredicate: messagePredicateNode selector! Item was added: + ----- Method: RxMatcher>>syntaxLookaround: (in category 'double dispatch') ----- + syntaxLookaround: lookaroundNode + "Double dispatch from the syntax tree. + Special link can handle lookarounds (look ahead and look behind, positive and negative)." + | piece | + piece := lookaroundNode piece dispatchTo: self. + piece terminateWith: RxmTerminator new. "see commment in RxmLookaround>>#terminateWith:" + ^ RxmLookaround + with: piece + forward: lookaroundNode forward + positive: lookaroundNode positive! Item was removed: - ----- Method: RxMatcher>>syntaxLookaround:forward:positive: (in category 'double dispatch') ----- - syntaxLookaround: lookaroundNode forward: forwardBoolean positive: positiveBoolean - "Double dispatch from the syntax tree. - Special link can handle lookarounds (look ahead and look behind, positive and negative)." - | piece | - piece := lookaroundNode piece dispatchTo: self. - piece terminateWith: RxmTerminator new. "see commment in RxmLookaround>>#terminateWith:" - ^ RxmLookaround with: piece forward: forwardBoolean positive: positiveBoolean! Item was changed: ----- Method: RxMatcher>>syntaxMessagePredicate: (in category 'double dispatch') ----- syntaxMessagePredicate: messagePredicateNode "Double dispatch from the syntax tree. Special link can handle predicates." + ^messagePredicateNode isNegated - ^messagePredicateNode negated ifTrue: [RxmPredicate new bePerformNot: messagePredicateNode selector] ifFalse: [RxmPredicate new bePerform: messagePredicateNode selector]! Item was changed: + ----- Method: RxmLink>>printOn: (in category 'printing') ----- - ----- Method: RxmLink>>printOn: (in category 'as yet unclassified') ----- printOn: stream super printOn: stream. stream nextPut: $(; print: self identityHash; nextPutAll: ', '; print: (next ifNotNil: [ next identityHash ]); nextPut: $)! Item was changed: ----- Method: RxmLookaround>>terminateWith: (in category 'building') ----- terminateWith: aNode "Documentation only. The inner lookaround piece is terminated separately during the construction of the receiver. Lookaround links may not receive #terminateWith: if they are located in a loopback branch, but the inner piece does *not* contain a path to the next link of the receiver." + ^super terminateWith: aNode! - super terminateWith: aNode! Item was changed: + ----- Method: RxsBranch>>dispatchTo: (in category 'building') ----- - ----- Method: RxsBranch>>dispatchTo: (in category 'accessing') ----- dispatchTo: aMatcher "Inform the matcher of the kind of the node, and it will do whatever it has to." ^aMatcher syntaxBranch: self! Item was changed: + ----- Method: RxsCharSet>>dispatchTo: (in category 'building') ----- - ----- Method: RxsCharSet>>dispatchTo: (in category 'accessing') ----- dispatchTo: aMatcher "Inform the matcher of the kind of the node, and it will do whatever it has to." ^aMatcher syntaxCharSet: self! Item was changed: + ----- Method: RxsCharSet>>enumerateTo: (in category 'building') ----- - ----- Method: RxsCharSet>>enumerateTo: (in category 'accessing') ----- enumerateTo: aSet negated ifTrue: [^ self "Not enumerable"]. ^ elements do: [:each | each enumerateTo: aSet]! Item was changed: + ----- Method: RxsCharacter>>dispatchTo: (in category 'building') ----- - ----- Method: RxsCharacter>>dispatchTo: (in category 'accessing') ----- dispatchTo: aMatcher "Inform the matcher of the kind of the node, and it will do whatever it has to." ^aMatcher syntaxCharacter: self! Item was changed: + ----- Method: RxsCharacter>>enumerateTo: (in category 'building') ----- - ----- Method: RxsCharacter>>enumerateTo: (in category 'accessing') ----- enumerateTo: aSet ^aSet add: character! Item was changed: + ----- Method: RxsContextCondition>>dispatchTo: (in category 'building') ----- - ----- Method: RxsContextCondition>>dispatchTo: (in category 'accessing') ----- dispatchTo: aBuilder ^aBuilder perform: kind! Item was removed: - ----- Method: RxsLookaround>>beLookahead (in category 'initialize-release') ----- - beLookahead - forward := true! Item was removed: - ----- Method: RxsLookaround>>beLookbehind (in category 'initialize-release') ----- - beLookbehind - forward := false! Item was removed: - ----- Method: RxsLookaround>>beNegative (in category 'initialize-release') ----- - beNegative - positive := false! Item was removed: - ----- Method: RxsLookaround>>bePositive (in category 'initialize-release') ----- - bePositive - positive := true! Item was changed: + ----- Method: RxsLookaround>>dispatchTo: (in category 'building') ----- - ----- Method: RxsLookaround>>dispatchTo: (in category 'accessing') ----- dispatchTo: aBuilder "Inform the matcher of the kind of the node, and it will do whatever it has to." + ^aBuilder syntaxLookaround: self! - ^aBuilder syntaxLookaround: self forward: self forward positive: self positive! Item was changed: ----- Method: RxsLookaround>>initialize (in category 'initialize-release') ----- initialize super initialize. + positive := true.! - self bePositive.! Item was changed: + ----- Method: RxsMessagePredicate>>dispatchTo: (in category 'building') ----- - ----- Method: RxsMessagePredicate>>dispatchTo: (in category 'accessing') ----- dispatchTo: aBuilder "Inform the matcher of the kind of the node, and it will do whatever it has to." ^aBuilder syntaxMessagePredicate: self! Item was removed: - ----- Method: RxsMessagePredicate>>initializeSelector: (in category 'initialize-release') ----- - initializeSelector: aSelector - "The selector must be a one-argument message understood by Character." - - selector := aSelector! Item was added: + ----- Method: RxsMessagePredicate>>isNegated (in category 'accessing') ----- + isNegated + + ^negated! Item was removed: - ----- Method: RxsMessagePredicate>>negated (in category 'accessing') ----- - negated - - ^negated! Item was added: + ----- Method: RxsNode>>dispatchTo: (in category 'building') ----- + dispatchTo: aMatcher + "Inform the matcher of the kind of the node, and it will do whatever it has to." + + ^ self subclassResponsibility! Item was changed: + ----- Method: RxsPiece>>dispatchTo: (in category 'building') ----- - ----- Method: RxsPiece>>dispatchTo: (in category 'accessing') ----- dispatchTo: aMatcher "Inform the matcher of the kind of the node, and it will do whatever it has to." ^aMatcher syntaxPiece: self! Item was changed: + ----- Method: RxsPredicate>>dispatchTo: (in category 'building') ----- - ----- Method: RxsPredicate>>dispatchTo: (in category 'accessing') ----- dispatchTo: anObject ^anObject syntaxPredicate: self! Item was changed: + ----- Method: RxsPredicate>>enumerateTo: (in category 'building') ----- - ----- Method: RxsPredicate>>enumerateTo: (in category 'accessing') ----- enumerateTo: aSet ^self "Not enumerable"! Item was changed: + ----- Method: RxsPredicate>>negated (in category 'converting') ----- - ----- Method: RxsPredicate>>negated (in category 'accessing') ----- negated ^self copy negate! Item was added: + ----- Method: RxsRange>>dispatchTo: (in category 'building') ----- + dispatchTo: aMatcher + "To be wrapped into a RxsCharSet first." + + ^self shouldNotImplement! Item was changed: + ----- Method: RxsRange>>enumerateTo: (in category 'building') ----- - ----- Method: RxsRange>>enumerateTo: (in category 'accessing') ----- enumerateTo: aSet "Add all of the elements I represent to the collection." first asInteger to: last asInteger do: [ :charCode | aSet add: charCode asCharacter ]. ^self! Item was changed: + ----- Method: RxsRegex>>beNonCapturing (in category 'initialize-release') ----- - ----- Method: RxsRegex>>beNonCapturing (in category 'accessing') ----- beNonCapturing isCapturing := false.! Item was changed: + ----- Method: RxsRegex>>dispatchTo: (in category 'building') ----- - ----- Method: RxsRegex>>dispatchTo: (in category 'accessing') ----- dispatchTo: aMatcher "Inform the matcher of the kind of the node, and it will do whatever it has to." ^aMatcher syntaxRegex: self!

1 0

The Trunk: Regex-Core-ct.81.mcz
by commits＠source.squeak.org 12 Oct '22

12 Oct '22

Christoph Thiede uploaded a new version of Regex-Core to project The Trunk: http://source.squeak.org/trunk/Regex-Core-ct.81.mcz ==================== Summary ==================== Name: Regex-Core-ct.81 Author: ct Time: 12 October 2022, 2:42:12.805412 pm UUID: 5daa8bb4-0f9b-d34f-9cc0-2e0316ccd4ff Ancestors: Regex-Core-ct.80 Documentation only: Minor refactoring to EBNF specification in parsers. Unifies use of spaces and escaping. =============== Diff against Regex-Core-ct.80 =============== Item was changed: ----- Method: RxAbstractParser>>codePoint: (in category 'recursive descent') ----- codePoint: size "Matches a character that has the given code codepoint with the specified size of hex digits, unless braced. + <codePoint> ::= \x ( '{' <hex> '}' | size * <hex> ) " - <codePoint> ::= \x ({<hex>} | <hex>[size])" | braced codeString codePoint codeStream | braced := self tryMatch: ${. codeString := braced ifFalse: [self input: size errorMessage: 'invalid codepoint'] ifTrue: [self inputUpTo: $} errorMessage: 'no terminating "}"']. codeStream := codeString readStream. codePoint := ((ExtendedNumberParser on: codeStream) defaultBase: 16; nextInteger "allow the stream to change the base -- beware: any new base is specified in base 16!!") ifNil: [ self signalParseError: 'invalid codepoint']. codeStream atEnd ifFalse: [ self signalParseError: 'invalid codepoint']. braced ifTrue: [ self match: $}]. ^ RxsCharacter with: (Character codePoint: codePoint)! Item was changed: ----- Method: RxAbstractParser>>unicodeCategory (in category 'recursive descent') ----- unicodeCategory "Matches a character that belongs to the given unicode category. + <unicodeCategory> ::= \p '{' <categoryName> '}' " - <unicodeCategory> ::= \p '{' <categoryName> '}'" | category | self match: ${. category := self inputUpTo: $} errorMessage: 'no terminating "}"'. self match: $}. RxsPredicate supportsUnicode ifFalse: [self signalParseError: 'unicode support is not available']. (RxsPredicate isValidUnicodeCategory: category) ifFalse: [self signalParseError: 'unknown unicode category: ' , category]. ^ RxsPredicate new beUnicodeCategory: category! Item was changed: ----- Method: RxParser>>piece (in category 'recursive descent') ----- piece + "<piece> ::= <atom> + | <atom> '*' | <atom> '+' | <atom> '?' + | <atom> '{' <number> ',' <number> '}' " - "<piece> ::= <atom> | <atom>* | <atom>+ | <atom>? | <atom>{<number>,<number>}" | atom | atom := self atom. lookahead == $* ifTrue: [ self next. ^ RxsPiece new initializeStarAtom: atom ]. lookahead == $+ ifTrue: [ self next. ^ RxsPiece new initializePlusAtom: atom ]. lookahead == $? ifTrue: [ self next. ^ RxsPiece new initializeOptionalAtom: atom ]. lookahead == ${ ifTrue: [ ^ self quantifiedAtom: atom ]. ^ RxsPiece new initializeAtom: atom! Item was changed: ----- Method: RxParser>>regex (in category 'recursive descent') ----- regex + "<regex> ::= e | <branch> '|' <regex> " - "<regex> ::= e | <branch> `|' <regex>" | branch regex | branch := self branch. (lookahead == nil or: [ lookahead == $) ]) ifTrue: [ regex := nil ] ifFalse: [ self match: $|. regex := self regex ]. ^RxsRegex new initializeBranch: branch regex: regex!

1 0

The Trunk: Regex-Core-ct.80.mcz
by commits＠source.squeak.org 12 Oct '22

12 Oct '22

Christoph Thiede uploaded a new version of Regex-Core to project The Trunk: http://source.squeak.org/trunk/Regex-Core-ct.80.mcz ==================== Summary ==================== Name: Regex-Core-ct.80 Author: ct Time: 12 October 2022, 10:26:25.906375 am UUID: ef17e2f9-69d8-ed49-871b-0e82767b7f0d Ancestors: Regex-Core-ct.79 Fixes a widespread typo in an argument name. =============== Diff against Regex-Core-ct.79 =============== Item was changed: ----- Method: RxMatcher>>matchAgainstLookahead:positive:nextLink: (in category 'matching') ----- + matchAgainstLookahead: lookahead positive: positive nextLink: anRxmLink - matchAgainstLookahead: lookahead positive: positive nextLink: anRmxLink | position result | position := stream position. result := lookahead matchAgainst: self. stream position: position. ^ result = positive and: [ + anRxmLink matchAgainst: self]! - anRmxLink matchAgainst: self]! Item was changed: ----- Method: RxMatcher>>matchAgainstLookbehind:positive:nextLink: (in category 'matching') ----- + matchAgainstLookbehind: lookbehind positive: positive nextLink: anRxmLink - matchAgainstLookbehind: lookbehind positive: positive nextLink: anRmxLink | position matchesLookbehind | position := stream position. matchesLookbehind := (position to: 0 by: -1) anySatisfy: [:index | stream position: index. (lookbehind matchAgainst: self) and: [stream position = position]]. stream position: position. matchesLookbehind = positive ifFalse: [^ false]. + ^ anRxmLink matchAgainst: self! - ^ anRmxLink matchAgainst: self! Item was changed: ----- Method: RxMatcher>>matchAgainstMarkerAt:nextLink: (in category 'matching') ----- + matchAgainstMarkerAt: index nextLink: anRxmLink - matchAgainstMarkerAt: index nextLink: anRmxLink | position | position := stream position. + (anRxmLink matchAgainst: self) ifFalse: [ ^false ]. - (anRmxLink matchAgainst: self) ifFalse: [ ^false ]. index <= 2 ifTrue: [ markerPositions at: index put: position ] ifFalse: [ (markerPositions at: index) addFirst: position ]. ^true! Item was changed: ----- Method: RxMatcher>>matchAgainstPredicate:nextLink: (in category 'matching') ----- + matchAgainstPredicate: aBlock nextLink: anRxmLink - matchAgainstPredicate: aBlock nextLink: anRmxLink | next position | next := stream next ifNil: [ ^false ]. position := stream position - 1. (aBlock value: next) ifTrue: [ + (anRxmLink matchAgainst: self) ifTrue: [ ^true ] ]. - (anRmxLink matchAgainst: self) ifTrue: [ ^true ] ]. stream position: position. ^false! Item was changed: ----- Method: RxMatcher>>matchCaseInsensitiveAgainstStream:nextLink: (in category 'matching') ----- + matchCaseInsensitiveAgainstStream: aStream nextLink: anRxmLink - matchCaseInsensitiveAgainstStream: aStream nextLink: anRmxLink | next nextSample position | position := stream position. "The order of the stream reads is important. When aStream runs out of characters, we must not consume any character from stream, or else the next position will be skipped in stream." [ (nextSample := aStream next) == nil or: [ (next := stream next) == nil ] ] whileFalse: [ (nextSample sameAs: next) ifFalse: [ stream position: position. ^false ] ]. + (nextSample == nil and: [ anRxmLink matchAgainst: self ]) ifTrue: [ ^true ]. - (nextSample == nil and: [ anRmxLink matchAgainst: self ]) ifTrue: [ ^true ]. stream position: position. ^false! Item was changed: ----- Method: RxMatcher>>matchCaseSensitiveAgainstStream:nextLink: (in category 'matching') ----- + matchCaseSensitiveAgainstStream: aStream nextLink: anRxmLink - matchCaseSensitiveAgainstStream: aStream nextLink: anRmxLink | next nextSample position | position := stream position. "The order of the stream reads is important. When aStream runs out of characters, we must not consume any character from stream, or else the next position will be skipped in stream." [ (nextSample := aStream next) == nil or: [ (next := stream next) == nil ] ] whileFalse: [ nextSample == next ifFalse: [ stream position: position. ^false ] ]. + (nextSample == nil and: [ anRxmLink matchAgainst: self ]) ifTrue: [ ^true ]. - (nextSample == nil and: [ anRmxLink matchAgainst: self ]) ifTrue: [ ^true ]. stream position: position. ^false!

1 0

The Trunk: Regex-Core-ct.79.mcz
by commits＠source.squeak.org 11 Oct '22

11 Oct '22

Christoph Thiede uploaded a new version of Regex-Core to project The Trunk: http://source.squeak.org/trunk/Regex-Core-ct.79.mcz ==================== Summary ==================== Name: Regex-Core-ct.79 Author: ct Time: 11 October 2022, 3:09:29.215455 pm UUID: b733e45e-0504-774d-967a-7e4c4bb892cd Ancestors: Regex-Core-ct.78 Fixes regression in lookarounds with branches. See Regex-Tests-Core-ct.31. =============== Diff against Regex-Core-ct.78 =============== Item was changed: ----- Method: RxMatcher>>syntaxRegex: (in category 'double dispatch') ----- syntaxRegex: regexNode "Double dispatch from the syntax tree. Regex node is a chain of branches to be tried. Should compile this into a bundle of parallel branches, between two marker nodes." | startNode endNode alternatives | + regexNode isCapturing + ifTrue: [ + startNode := RxmMarker new index: self allocateMarker. + endNode := RxmMarker new index: self allocateMarker] + ifFalse: [ + endNode := RxmLink new "A single endNode is required that all branches of the answer must point to for termination."]. - regexNode isCapturing ifFalse: [ - ^ regexNode branch dispatchTo: self]. - startNode := RxmMarker new index: self allocateMarker. - endNode := RxmMarker new index: self allocateMarker. - regexNode key ifNotNil: [:key | self registerMarkerKey: key from: startNode index to: endNode index]. alternatives := self hookBranchOf: regexNode onto: endNode. + startNode ifNil: [^ alternatives]. ^ startNode pointTailTo: alternatives; yourself!

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Packages October 2022