diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..84556e8 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,27 @@ +name: Build + +on: [push,pull_request,workflow_dispatch] + +jobs: + build: + runs-on: ubuntu-latest + strategy: + matrix: + smalltalk: [ Pharo64-7.0, Pharo64-8.0, Pharo64-9.0, Pharo64-10, Pharo64-11, Pharo64-12, Pharo64-13 ] + name: ${{ matrix.smalltalk }} + steps: + - uses: actions/checkout@v2 + - name: Set up Smalltalk CI + uses: hpi-swa/setup-smalltalkCI@v1 + with: + smalltalk-image: ${{ matrix.smalltalk }} + - name: Load Image and Run Tests + run: smalltalkci -s ${{ matrix.smalltalk }} .smalltalkci/.unit-tests.ston + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + timeout-minutes: 15 + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v1 + with: + name: ${{matrix.os}}-${{matrix.smalltalk}} + token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2738bc1..44f888f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,8 +13,8 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-20.04, macos-latest ] - smalltalk: [ GemStone64-3.5.3, GemStone64-3.5.8, GemStone64-3.6.0, GemStone64-3.6.5 ] + os: [ ubuntu-latest ] + smalltalk: [ GemStone64-3.7.2, GemStone64-3.7.4.3 ] runs-on: ${{ matrix.os }} name: ${{ matrix.smalltalk }} steps: @@ -31,7 +31,7 @@ jobs: name: Post Workflow Status To Slack needs: - build - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Slack Workflow Notification uses: Gamesight/slack-workflow-status@master diff --git a/.smalltalk_gemstone.ston b/.smalltalk_gemstone.ston index 262b744..ad12081 100644 --- a/.smalltalk_gemstone.ston +++ b/.smalltalk_gemstone.ston @@ -1,10 +1,10 @@ SmalltalkCISpec { - #loading : [ - SCIMetacelloLoadSpec { - #baseline : 'BitmapCharacterSet', - #directory : 'filetree', - #load : [ 'Tests' ], - #platforms : [ #gemstone] - } - ] + #loading : [ + SCIMetacelloLoadSpec { + #baseline : 'BitmapCharacterSet', + #directory : 'filetree', + #load : [ 'Tests' ], + #platforms : [ #gemstone] + } + ] } diff --git a/.smalltalkci/.unit-tests.ston b/.smalltalkci/.unit-tests.ston new file mode 100644 index 0000000..3e23947 --- /dev/null +++ b/.smalltalkci/.unit-tests.ston @@ -0,0 +1,16 @@ +SmalltalkCISpec { + #loading : [ + SCIMetacelloLoadSpec { + #baseline : 'BitmapCharacterSet', + #directory : '../src', + #load : [ 'CI' ], + #platforms : [ #pharo ] + } + ], + #testing : { + #coverage : { + #packages : [ 'Collections*' ], + #format: #lcov + } + } +} diff --git a/.travis_pharo.yml b/.travis_pharo.yml index 6398d4d..e1cf47d 100644 --- a/.travis_pharo.yml +++ b/.travis_pharo.yml @@ -6,3 +6,4 @@ os: smalltalk: - Pharo-7.0 + diff --git a/README.md b/README.md index 24af18e..3d0df16 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,18 @@ # BitmapCharacterSet [![Build Status](https://github.com/GsDevKit/BitmapCharacterSet/actions/workflows/ci.yml/badge.svg?branch=gemstone)](https://github.com/GsDevKit/BitmapCharacterSet/actions/workflows/ci.yml) -BitmapCharacterSet is a set for characters that uses a bitmap for storing wide characters and an array of truth values for byte characters. Used by XMLParser. +**BitmapCharacterSet** is a set for characters that uses a bitmap for storing wide characters and an array of truth values for byte characters in [Pharo](https://www.pharo.org). Used by [XMLParser](https://github.com/pharo-contributions/XML-XMLParser). + + +[![Unit Tests](https://github.com/pharo-contributions/BitmapCharacterSet/workflows/Build/badge.svg?branch=master)](https://github.com/pharo-contributions/BitmapCharacterSet/actions?query=workflow%3ABuild) +[![Coverage Status](https://codecov.io/github/pharo-contributions/BitmapCharacterSet/coverage.svg?branch=master)](https://codecov.io/gh/pharo-contributions/BitmapCharacterSet/branch/master) + +[![Pharo 7](https://img.shields.io/badge/Pharo-7.0-%23aac9ff.svg)](https://pharo.org/download) +[![Pharo 8](https://img.shields.io/badge/Pharo-8.0-%23aac9ff.svg)](https://pharo.org/download) +[![Pharo 9](https://img.shields.io/badge/Pharo-9.0-%23aac9ff.svg)](https://pharo.org/download) +[![Pharo 10](https://img.shields.io/badge/Pharo-10-%23aac9ff.svg)](https://pharo.org/download) +[![Pharo 11](https://img.shields.io/badge/Pharo-11-%23aac9ff.svg)](https://pharo.org/download) +[![Pharo 12](https://img.shields.io/badge/Pharo-12-%23aac9ff.svg)](https://pharo.org/download) +[![Pharo 13](https://img.shields.io/badge/Pharo-13-%23aac9ff.svg)](https://pharo.org/download) ## Installation diff --git a/filetree/BaselineOfBitmapCharacterSet.package/BaselineOfBitmapCharacterSet.class/instance/baseline..st b/filetree/BaselineOfBitmapCharacterSet.package/BaselineOfBitmapCharacterSet.class/instance/baseline..st index d28ff69..10c3902 100644 --- a/filetree/BaselineOfBitmapCharacterSet.package/BaselineOfBitmapCharacterSet.class/instance/baseline..st +++ b/filetree/BaselineOfBitmapCharacterSet.package/BaselineOfBitmapCharacterSet.class/instance/baseline..st @@ -5,13 +5,14 @@ baseline: spec spec for: #common do: [ "Packages and Dependencies" spec - package: 'Collections-BitmapCharacterSet-Core'; - package: 'Collections-BitmapCharacterSet-Tests' with: [ spec requires: 'Collections-BitmapCharacterSet-Core' ]. + package: 'Collections-BitmapCharacterSet-Base'; + package: 'Collections-BitmapCharacterSet-Tests' with: [ spec requires: 'Collections-BitmapCharacterSet-Base' ]. "Groups" spec - group: 'Core' with: #('Collections-BitmapCharacterSet-Core'); + group: 'Core' with: #('Collections-BitmapCharacterSet-Base'); group: 'Tests' with: #('Collections-BitmapCharacterSet-Tests'); + group: 'CI' with: #('Tests'); group: 'all' with: #('Core' 'Tests'); group: 'default' with: #('all') ] diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/.filetree b/filetree/Collections-BitmapCharacterSet-Base.package/.filetree similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/.filetree rename to filetree/Collections-BitmapCharacterSet-Base.package/.filetree diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/README.md b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/README.md similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/README.md rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/README.md diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/class/new..st b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/class/new..st similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/class/new..st rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/class/new..st diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/class/new.st b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/class/new.st similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/class/new.st rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/class/new.st diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/class/newFrom..st b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/class/newFrom..st similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/class/newFrom..st rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/class/newFrom..st diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/^comma.st b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/^comma.st similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/^comma.st rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/^comma.st diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/^equals.st b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/^equals.st similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/^equals.st rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/^equals.st diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/add..st b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/add..st similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/add..st rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/add..st diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/addRangeFrom.to..st b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/addRangeFrom.to..st similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/addRangeFrom.to..st rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/addRangeFrom.to..st diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/byteCharacters.st b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/byteCharacters.st similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/byteCharacters.st rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/byteCharacters.st diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/byteCharactersDo..st b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/byteCharactersDo..st similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/byteCharactersDo..st rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/byteCharactersDo..st diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/capacity.st b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/capacity.st similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/capacity.st rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/capacity.st diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/complement.st b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/complement.st similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/complement.st rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/complement.st diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/copyEmpty.st b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/copyEmpty.st similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/copyEmpty.st rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/copyEmpty.st diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/do..st b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/do..st similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/do..st rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/do..st diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/growWideCharacterBitmapTo..st b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/growWideCharacterBitmapTo..st similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/growWideCharacterBitmapTo..st rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/growWideCharacterBitmapTo..st diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/hasWideCharacters.st b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/hasWideCharacters.st similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/hasWideCharacters.st rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/hasWideCharacters.st diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/hash.st b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/hash.st similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/hash.st rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/hash.st diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/includes..st b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/includes..st similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/includes..st rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/includes..st diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/includesRangeFrom.to..st b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/includesRangeFrom.to..st similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/includesRangeFrom.to..st rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/includesRangeFrom.to..st diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/initialize..st b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/initialize..st similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/initialize..st rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/initialize..st diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/isEmpty.st b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/isEmpty.st similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/isEmpty.st rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/isEmpty.st diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/maxWideCharactersSize.st b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/maxWideCharactersSize.st similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/maxWideCharactersSize.st rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/maxWideCharactersSize.st diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/postCopy.st b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/postCopy.st similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/postCopy.st rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/postCopy.st diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/remove.ifAbsent..st b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/remove.ifAbsent..st similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/remove.ifAbsent..st rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/remove.ifAbsent..st diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/removeAll.st b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/removeAll.st similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/removeAll.st rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/removeAll.st diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/removeRangeFrom.to..st b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/removeRangeFrom.to..st similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/removeRangeFrom.to..st rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/removeRangeFrom.to..st diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/size.st b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/size.st similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/size.st rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/size.st diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/wideCharacters.st b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/wideCharacters.st similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/wideCharacters.st rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/wideCharacters.st diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/wideCharactersDo..st b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/wideCharactersDo..st similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/instance/wideCharactersDo..st rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/instance/wideCharactersDo..st diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/properties.json b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/properties.json similarity index 82% rename from filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/properties.json rename to filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/properties.json index b36c3e1..c89cee0 100644 --- a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/properties.json +++ b/filetree/Collections-BitmapCharacterSet-Base.package/BitmapCharacterSet.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "Collections-BitmapCharacterSet-Core", + "category" : "Collections-BitmapCharacterSet-Base", "classinstvars" : [ ], "classvars" : [ diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/monticello.meta/categories.st b/filetree/Collections-BitmapCharacterSet-Base.package/monticello.meta/categories.st similarity index 88% rename from filetree/Collections-BitmapCharacterSet-Core.package/monticello.meta/categories.st rename to filetree/Collections-BitmapCharacterSet-Base.package/monticello.meta/categories.st index 39e770c..9c18abc 100644 --- a/filetree/Collections-BitmapCharacterSet-Core.package/monticello.meta/categories.st +++ b/filetree/Collections-BitmapCharacterSet-Base.package/monticello.meta/categories.st @@ -1 +1 @@ -SystemOrganization addCategory: #'Collections-BitmapCharacterSet-Core'! +SystemOrganization addCategory: #'Collections-BitmapCharacterSet-Base'! diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/monticello.meta/initializers.st b/filetree/Collections-BitmapCharacterSet-Base.package/monticello.meta/initializers.st similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/monticello.meta/initializers.st rename to filetree/Collections-BitmapCharacterSet-Base.package/monticello.meta/initializers.st diff --git a/filetree/Collections-BitmapCharacterSet-Base.package/monticello.meta/package b/filetree/Collections-BitmapCharacterSet-Base.package/monticello.meta/package new file mode 100644 index 0000000..268b0b9 --- /dev/null +++ b/filetree/Collections-BitmapCharacterSet-Base.package/monticello.meta/package @@ -0,0 +1 @@ +(name 'Collections-BitmapCharacterSet-Base') \ No newline at end of file diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/properties.json b/filetree/Collections-BitmapCharacterSet-Base.package/properties.json similarity index 100% rename from filetree/Collections-BitmapCharacterSet-Core.package/properties.json rename to filetree/Collections-BitmapCharacterSet-Base.package/properties.json diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/class/inspectorClass.st b/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/class/inspectorClass.st deleted file mode 100644 index 4b0e2b5..0000000 --- a/filetree/Collections-BitmapCharacterSet-Core.package/BitmapCharacterSet.class/class/inspectorClass.st +++ /dev/null @@ -1,4 +0,0 @@ -inspecting -inspectorClass - "does not use Set class>>inspectorClass because it is incompatible" - ^ Smalltalk tools inspectorClass \ No newline at end of file diff --git a/filetree/Collections-BitmapCharacterSet-Core.package/monticello.meta/package b/filetree/Collections-BitmapCharacterSet-Core.package/monticello.meta/package deleted file mode 100644 index 27347df..0000000 --- a/filetree/Collections-BitmapCharacterSet-Core.package/monticello.meta/package +++ /dev/null @@ -1 +0,0 @@ -(name 'Collections-BitmapCharacterSet-Core') \ No newline at end of file diff --git a/filetree/Collections-BitmapCharacterSet-Tests.package/BitmapCharacterSetTest.class/instance/assertSet.copiedFrom.equals..st b/filetree/Collections-BitmapCharacterSet-Tests.package/BitmapCharacterSetTest.class/instance/assertSet.copiedFrom.equals..st index 8b74e6c..ae9e5ec 100644 --- a/filetree/Collections-BitmapCharacterSet-Tests.package/BitmapCharacterSetTest.class/instance/assertSet.copiedFrom.equals..st +++ b/filetree/Collections-BitmapCharacterSet-Tests.package/BitmapCharacterSetTest.class/instance/assertSet.copiedFrom.equals..st @@ -3,8 +3,8 @@ assertSet: aFirstSet copiedFrom: aSecondSet equals: aThirdSet self deny: aFirstSet == aSecondSet; deny: aFirstSet byteCharacters == aSecondSet byteCharacters. - (aFirstSet wideCharacters notNil - or: [aSecondSet wideCharacters notNil]) + (aFirstSet wideCharacters isNil not + or: [aSecondSet wideCharacters isNil not]) ifTrue: [self deny: aFirstSet wideCharacters == aSecondSet wideCharacters]. - + self assert: aFirstSet = aThirdSet. \ No newline at end of file diff --git a/filetree/Collections-BitmapCharacterSet-Tests.package/BitmapCharacterSetTest.class/instance/testMaxCharacter.st b/filetree/Collections-BitmapCharacterSet-Tests.package/BitmapCharacterSetTest.class/instance/testMaxCharacter.st index a8d13cd..6e07431 100644 --- a/filetree/Collections-BitmapCharacterSet-Tests.package/BitmapCharacterSetTest.class/instance/testMaxCharacter.st +++ b/filetree/Collections-BitmapCharacterSet-Tests.package/BitmapCharacterSetTest.class/instance/testMaxCharacter.st @@ -3,10 +3,8 @@ testMaxCharacter | set | set := self emptySet. - self - shouldnt: [set add: self lastCodePoint asCharacter] - raise: Error. + set add: self lastCodePoint asCharacter. self assert: (set includes: self lastCodePoint asCharacter). self - should: [set add: (self lastCodePoint + 1) asCharacter] + should: [ set add: (self lastCodePoint + 1) asCharacter ] raise: Error. \ No newline at end of file diff --git a/filetree/Collections-BitmapCharacterSet-Tests.package/BitmapCharacterSetTest.class/instance/testRemoveIfAbsent.st b/filetree/Collections-BitmapCharacterSet-Tests.package/BitmapCharacterSetTest.class/instance/testRemoveIfAbsent.st index 9116942..e7ed3d0 100644 --- a/filetree/Collections-BitmapCharacterSet-Tests.package/BitmapCharacterSetTest.class/instance/testRemoveIfAbsent.st +++ b/filetree/Collections-BitmapCharacterSet-Tests.package/BitmapCharacterSetTest.class/instance/testRemoveIfAbsent.st @@ -3,17 +3,11 @@ testRemoveIfAbsent | set | set := self nonEmptySet. - self absentCharactersDo: [:each | - self assert: - (set - remove: each - ifAbsent: [#absent]) = #absent]. - self charactersDo: [:each | - self assert: - (set - remove: each - ifAbsent: [self fail]) = each. - self assert: - (set - remove: each - ifAbsent: [#absent]) = #absent]. \ No newline at end of file + self absentCharactersDo: [ :each | + self + assert:(set remove: each ifAbsent: [ #absent ]) = #absent ]. + self charactersDo: [ :each | + self + assert: (set remove: each ifAbsent: [ self fail ]) = each. + self + assert: (set remove: each ifAbsent: [ #absent ]) = #absent ]. \ No newline at end of file diff --git a/filetree/Collections-BitmapCharacterSet-Tests.package/BitmapCharacterSetTest.class/instance/testSize.st b/filetree/Collections-BitmapCharacterSet-Tests.package/BitmapCharacterSetTest.class/instance/testSize.st index 3497a5d..d937fbe 100644 --- a/filetree/Collections-BitmapCharacterSet-Tests.package/BitmapCharacterSetTest.class/instance/testSize.st +++ b/filetree/Collections-BitmapCharacterSet-Tests.package/BitmapCharacterSetTest.class/instance/testSize.st @@ -4,17 +4,16 @@ testSize set := self emptySet. size := 0. - self charactersDo: [:each | + self charactersDo: [ :each | self assert: set size = size. set add: each. size := size + 1. self assert: set size = size. - "Adding the same character shouldn't alter the size" set add: each. - self assert: set size = size.]. + self assert: set size = size ]. - self charactersDo: [:each | + self charactersDo: [ :each | set remove: each. size := size - 1. - self assert: set size = size]. \ No newline at end of file + self assert: set size = size ]. \ No newline at end of file diff --git a/filetree/Collections-BitmapCharacterSet-Tests.package/BitmapCharacterSetTest.class/instance/testWideCharacters.st b/filetree/Collections-BitmapCharacterSet-Tests.package/BitmapCharacterSetTest.class/instance/testWideCharacters.st index 45c5d31..f08fab0 100644 --- a/filetree/Collections-BitmapCharacterSet-Tests.package/BitmapCharacterSetTest.class/instance/testWideCharacters.st +++ b/filetree/Collections-BitmapCharacterSet-Tests.package/BitmapCharacterSetTest.class/instance/testWideCharacters.st @@ -1,18 +1,20 @@ tests testWideCharacters - 0 to: 7 do: [:i | | set character | + 0 to: 7 do: [ :i | + | set character | set := self setClass new. character := (256 + i) asCharacter. self assert: set wideCharacters isNil. set add: character. self assert: set wideCharacters first = (16r80 bitShift: i negated). set remove: character. - self assert: set wideCharacters first = 0]. - 0 to: 7 do: [:i | | set character | + self assert: set wideCharacters first = 0 ]. + 0 to: 7 do: [ :i | + | set character | set := self setClass new. character := (256 + 8 + i) asCharacter. self assert: set wideCharacters isNil. set add: character. self assert: set wideCharacters second = (16r80 bitShift: i negated). set remove: character. - self assert: set wideCharacters second = 0] \ No newline at end of file + self assert: set wideCharacters second = 0 ] \ No newline at end of file diff --git a/filetree/Collections-BitmapCharacterSet-Tests.package/BitmapCharacterSetTest.class/properties.json b/filetree/Collections-BitmapCharacterSet-Tests.package/BitmapCharacterSetTest.class/properties.json index 483ffa3..1abcec2 100644 --- a/filetree/Collections-BitmapCharacterSet-Tests.package/BitmapCharacterSetTest.class/properties.json +++ b/filetree/Collections-BitmapCharacterSet-Tests.package/BitmapCharacterSetTest.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "Collections-BitmapCharacterSet-Tests", + "category" : "Collections-BitmapCharacterSet-Tests-Base", "classinstvars" : [ ], "classvars" : [ diff --git a/filetree/Collections-BitmapCharacterSet-Tests.package/monticello.meta/categories.st b/filetree/Collections-BitmapCharacterSet-Tests.package/monticello.meta/categories.st index 819e123..b498473 100644 --- a/filetree/Collections-BitmapCharacterSet-Tests.package/monticello.meta/categories.st +++ b/filetree/Collections-BitmapCharacterSet-Tests.package/monticello.meta/categories.st @@ -1 +1 @@ -SystemOrganization addCategory: #'Collections-BitmapCharacterSet-Tests'! +SystemOrganization addCategory: #'Collections-BitmapCharacterSet-Tests-Base'! diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/.filetree b/filetree/ConfigurationOfBitmapCharacterSet.package/.filetree deleted file mode 100644 index 8998102..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/.filetree +++ /dev/null @@ -1,4 +0,0 @@ -{ - "noMethodMetaData" : true, - "separateMethodMetaAndSource" : false, - "useCypressPropertiesFile" : true } diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/README.md b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/README.md deleted file mode 100644 index 99d95d8..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/README.md +++ /dev/null @@ -1,3 +0,0 @@ -(ConfigurationOfBitmapCharacterSet project version: #stable) load - -(ConfigurationOfBitmapCharacterSet project version: #stable) load: #('Tests') \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/bootstrapPackage.from..st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/bootstrapPackage.from..st deleted file mode 100644 index fdc4687..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/bootstrapPackage.from..st +++ /dev/null @@ -1,13 +0,0 @@ -private -bootstrapPackage: aString from: aPath - | repository version | - repository := MCHttpRepository - location: aPath - user: '' - password: ''. - repository - versionReaderForFileNamed: aString , '.mcz' - do: [:reader | - version := reader version. - version load. - version workingCopy repositoryGroup addRepository: repository] \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/catalogChangeLog.st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/catalogChangeLog.st deleted file mode 100644 index 0fe949e..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/catalogChangeLog.st +++ /dev/null @@ -1,20 +0,0 @@ -catalog -catalogChangeLog - - ^ ' --25/11/2013 - Speed improvements from Monty. -[[[ -(ConfigurationOfSoup project version: #''stable'') load -(ConfigurationOfSoup project version: ''1.1'') load -]]] - --1/2013 - Migrated from squeaksource. -[[[ -(ConfigurationOfSoup project version: #''stable'') load -(ConfigurationOfSoup project version: ''1.0'') load -]]] - - -' - - \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/catalogDescription.st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/catalogDescription.st deleted file mode 100644 index 391ebda..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/catalogDescription.st +++ /dev/null @@ -1,4 +0,0 @@ -catalog -catalogDescription - -^ 'BitmapCharacterSet is a set for characters that uses a bitmap for storing wide characters and an array of truth values for byte characters. Used by XMLParser.' \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/catalogKeyClassesAndExample.st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/catalogKeyClassesAndExample.st deleted file mode 100644 index ebaa063..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/catalogKeyClassesAndExample.st +++ /dev/null @@ -1,10 +0,0 @@ -catalog -catalogKeyClassesAndExample - - ^ 'It is composed of a single class BitmapCharacterSet. - -Example: -[[[ - BitmapCharacterSet newFrom: Character separators. - BitmapCharacterSet newFrom: Character allByteCharacters. -]]]' \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/catalogKeywords.st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/catalogKeywords.st deleted file mode 100644 index 19f10af..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/catalogKeywords.st +++ /dev/null @@ -1,4 +0,0 @@ -catalog -catalogKeywords - ^ #(collection set character unicode) - \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/catalogLicense.st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/catalogLicense.st deleted file mode 100644 index fee30b1..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/catalogLicense.st +++ /dev/null @@ -1,11 +0,0 @@ -catalog -catalogLicense - ^ 'The MIT License (MIT) - -Copyright (c) 2016 PharoExtras Team. - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.' \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/ensureMetacello.st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/ensureMetacello.st deleted file mode 100644 index 18333f5..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/ensureMetacello.st +++ /dev/null @@ -1,17 +0,0 @@ -private -ensureMetacello - "Bootstrap Gofer (if necessary), bootstrap ConfigurationOfMetacello (using old Gofer API), then load the latest - version of Metacello itself." - - Smalltalk at: #MetacelloProject ifAbsent: [ - Smalltalk at: #Gofer ifAbsent: [ - "Current version of Gofer from which to bootstrap - as of 1.0-beta.21" - self bootstrapPackage: 'Gofer-Core-lr.115' from: 'http://seaside.gemstone.com/ss/metacello' ]. - Smalltalk at: #Gofer ifPresent: [:goferClass | | gofer | - gofer := goferClass new - url: 'http://seaside.gemstone.com/ss/metacello'; - yourself. - [ gofer addPackage: 'ConfigurationOfMetacello' ] on: Warning do: [:ex | ex resume ]. - gofer load ]. - "load 'default' group of Metacello" - (Smalltalk at: #ConfigurationOfMetacello) perform: #load ] \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/isMetacelloConfig.st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/isMetacelloConfig.st deleted file mode 100644 index 98d81c7..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/isMetacelloConfig.st +++ /dev/null @@ -1,5 +0,0 @@ -metacello tool support -isMetacelloConfig - "Answer true and the Metacello tools will operate on you" - - ^true \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/lastMetacelloVersionLoad.st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/lastMetacelloVersionLoad.st deleted file mode 100644 index 6f4baa8..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/lastMetacelloVersionLoad.st +++ /dev/null @@ -1,6 +0,0 @@ -metacello tool support -lastMetacelloVersionLoad - "Answer the last version loaded and the list of packages loaded for that version." - - LastVersionLoad == nil ifTrue: [ LastVersionLoad := nil -> 'default' ]. - ^LastVersionLoad \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/load.st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/load.st deleted file mode 100644 index 9f5373d..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/load.st +++ /dev/null @@ -1,5 +0,0 @@ -loading -load - "self load" - - ^self project latestVersion load \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/loadDefault.st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/loadDefault.st deleted file mode 100644 index fe7987e..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/loadDefault.st +++ /dev/null @@ -1,5 +0,0 @@ -loading -loadDefault - "self loadDefault" - - ^ self loadMostRecentCoreWithTests \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/loadMostRecentCoreWithTests.st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/loadMostRecentCoreWithTests.st deleted file mode 100644 index 40bf900..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/loadMostRecentCoreWithTests.st +++ /dev/null @@ -1,3 +0,0 @@ -loading -loadMostRecentCoreWithTests - ^self project lastVersion load: #('Core' 'Tests') \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/metacelloVersion.loads..st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/metacelloVersion.loads..st deleted file mode 100644 index 27ddacd..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/metacelloVersion.loads..st +++ /dev/null @@ -1,6 +0,0 @@ -metacello tool support -metacelloVersion: versionString loads: anArrayOrString - "Stash the last version loaded and the list of packages loaded for that version. The list - of packages will be used by the tools when doing 'Load Package Version'" - - LastVersionLoad := versionString -> anArrayOrString \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/project.st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/project.st deleted file mode 100644 index 925935b..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/project.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -project - - ^self new project \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/unloadMetacello.st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/unloadMetacello.st deleted file mode 100644 index 850e7f0..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/class/unloadMetacello.st +++ /dev/null @@ -1,4 +0,0 @@ -unloading Metacello -unloadMetacello - - Smalltalk at: #ConfigurationOfMetacello ifPresent: [:cls | cls unloadMetacello ] \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/baseline100..st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/baseline100..st deleted file mode 100644 index c294627..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/baseline100..st +++ /dev/null @@ -1,17 +0,0 @@ -baselines - outdated -baseline100: spec - - - spec for: #common do: [ - spec blessing: #baseline. - spec repository: 'http://smalltalkhub.com/mc/PharoExtras/BitmapCharacterSet/main'. - spec description: 'Imported from SqueakSource'. - spec package: 'Collections-BitmapCharacterSet'. - spec - package: 'Collections-Tests-BitmapCharacterSet' - with: [spec requires: 'Collections-BitmapCharacterSet']. - - spec - group: 'default' with: #('Core'); - group: 'Core' with: #('Collections-BitmapCharacterSet'); - group: 'Tests' with: #('Collections-Tests-BitmapCharacterSet'). ]. \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/dev..st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/dev..st deleted file mode 100644 index e7b8d6e..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/dev..st +++ /dev/null @@ -1,10 +0,0 @@ -symbolic versions -dev: spec - - - spec for: #'common' do: [ - spec - baseline: 'BitmapCharacterSet' with: [ - spec - className: 'BaselineOfBitmapCharacterSet'; - repository: 'github://pharo-contributions/BitmapCharacterSet:master/src' ]] \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/development..st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/development..st deleted file mode 100644 index e35de93..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/development..st +++ /dev/null @@ -1,5 +0,0 @@ -symbolic versions -development: spec - - - spec for: #'common' version: 'dev' diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/project.st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/project.st deleted file mode 100644 index 594c1a9..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/project.st +++ /dev/null @@ -1,11 +0,0 @@ -accessing -project - - ^ project ifNil: [ | constructor | - "Bootstrap Metacello if it is not already loaded" - self class ensureMetacello. - "Construct Metacello project" - constructor := (Smalltalk at: #MetacelloVersionConstructor) on: self. - project := constructor project. - project loadType: #linear. "change to #atomic if desired" - project ] \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/stable..st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/stable..st deleted file mode 100644 index d5b3b31..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/stable..st +++ /dev/null @@ -1,5 +0,0 @@ -symbolic versions -stable: spec - - - spec for: #'common' version: '1.2.7' \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version100..st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version100..st deleted file mode 100644 index 79411b2..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version100..st +++ /dev/null @@ -1,13 +0,0 @@ -versions -version100: spec - - - spec for: #common do: [ - spec blessing: #release. - spec description: 'Latest versions from Squeaksource'. - - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-JAA.5'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-JAA.5' - ] - - diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version110..st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version110..st deleted file mode 100644 index d97bfb0..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version110..st +++ /dev/null @@ -1,13 +0,0 @@ -versions -version110: spec - - - spec for: #common do: [ - spec blessing: #release. - spec description: 'Speed Improvement from Monty and adding tests'. - - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-Anonymous.6'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-Anonymous.6' - ] - - diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version111..st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version111..st deleted file mode 100644 index 9b85b49..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version111..st +++ /dev/null @@ -1,11 +0,0 @@ -versions -version111: spec - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.7'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-Anonymous.6' - ] - - diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version112..st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version112..st deleted file mode 100644 index 3d47915..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version112..st +++ /dev/null @@ -1,11 +0,0 @@ -versions -version112: spec - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.8'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-Anonymous.6' - ] - - diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version113..st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version113..st deleted file mode 100644 index 2a13c80..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version113..st +++ /dev/null @@ -1,9 +0,0 @@ -versions -version113: spec - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.10'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-Anonymous.6' - ]. \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version114..st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version114..st deleted file mode 100644 index 269c91d..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version114..st +++ /dev/null @@ -1,9 +0,0 @@ -versions -version114: spec - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.11'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-monty.7' - ]. \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version115..st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version115..st deleted file mode 100644 index 2b8ef4b..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version115..st +++ /dev/null @@ -1,9 +0,0 @@ -versions -version115: spec - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.12'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-monty.7' - ]. \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version116..st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version116..st deleted file mode 100644 index da3cf59..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version116..st +++ /dev/null @@ -1,9 +0,0 @@ -versions -version116: spec - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.13'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-monty.8' - ]. \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version117..st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version117..st deleted file mode 100644 index 33a5966..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version117..st +++ /dev/null @@ -1,9 +0,0 @@ -versions -version117: spec - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.14'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-monty.9' - ]. \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version118..st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version118..st deleted file mode 100644 index 621b0e6..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version118..st +++ /dev/null @@ -1,9 +0,0 @@ -versions -version118: spec - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.15'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-monty.10' - ]. \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version119..st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version119..st deleted file mode 100644 index 7d5bf98..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version119..st +++ /dev/null @@ -1,9 +0,0 @@ -versions -version119: spec - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.16'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-monty.10' - ]. \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version120..st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version120..st deleted file mode 100644 index 0b61643..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version120..st +++ /dev/null @@ -1,9 +0,0 @@ -versions -version120: spec - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.17'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-monty.10' - ]. \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version121..st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version121..st deleted file mode 100644 index 0607fdb..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version121..st +++ /dev/null @@ -1,9 +0,0 @@ -versions -version121: spec - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.18'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-monty.11' - ]. \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version122..st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version122..st deleted file mode 100644 index 4092af2..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version122..st +++ /dev/null @@ -1,9 +0,0 @@ -versions -version122: spec - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.19'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-monty.11' - ]. \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version123..st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version123..st deleted file mode 100644 index e9faf25..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version123..st +++ /dev/null @@ -1,9 +0,0 @@ -versions -version123: spec - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.20'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-monty.12' - ]. \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version124..st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version124..st deleted file mode 100644 index 943aea5..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version124..st +++ /dev/null @@ -1,9 +0,0 @@ -versions -version124: spec - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.22'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-monty.13' - ]. \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version125..st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version125..st deleted file mode 100644 index 5a47ce0..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version125..st +++ /dev/null @@ -1,9 +0,0 @@ -versions -version125: spec - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.23'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-monty.13' - ]. \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version126..st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version126..st deleted file mode 100644 index 5efd960..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version126..st +++ /dev/null @@ -1,9 +0,0 @@ -versions -version126: spec - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.25'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-monty.14' - ]. \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version127..st b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version127..st deleted file mode 100644 index c8075d3..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/instance/version127..st +++ /dev/null @@ -1,10 +0,0 @@ -versions -version127: spec - - - spec for: #'common' do: [ - spec - baseline: 'BitmapCharacterSet' with: [ - spec - className: 'BaselineOfBitmapCharacterSet'; - repository: 'github://pharo-contributions/BitmapCharacterSet:1.2.7/src' ]] \ No newline at end of file diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/properties.json b/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/properties.json deleted file mode 100644 index 8e0414f..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/ConfigurationOfBitmapCharacterSet.class/properties.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "category" : "ConfigurationOfBitmapCharacterSet", - "classinstvars" : [ - ], - "classvars" : [ - "LastVersionLoad" ], - "commentStamp" : "", - "instvars" : [ - "project" ], - "name" : "ConfigurationOfBitmapCharacterSet", - "pools" : [ - ], - "super" : "Object", - "type" : "normal" } diff --git a/filetree/ConfigurationOfBitmapCharacterSet.package/properties.json b/filetree/ConfigurationOfBitmapCharacterSet.package/properties.json deleted file mode 100644 index a097c63..0000000 --- a/filetree/ConfigurationOfBitmapCharacterSet.package/properties.json +++ /dev/null @@ -1,2 +0,0 @@ -{ - } \ No newline at end of file diff --git a/src/BaselineOfBitmapCharacterSet/BaselineOfBitmapCharacterSet.class.st b/src/BaselineOfBitmapCharacterSet/BaselineOfBitmapCharacterSet.class.st index fb5157a..ac43d39 100644 --- a/src/BaselineOfBitmapCharacterSet/BaselineOfBitmapCharacterSet.class.st +++ b/src/BaselineOfBitmapCharacterSet/BaselineOfBitmapCharacterSet.class.st @@ -21,6 +21,7 @@ BaselineOfBitmapCharacterSet >> baseline: spec [ spec group: 'Core' with: #('Collections-BitmapCharacterSet'); group: 'Tests' with: #('Collections-BitmapCharacterSet-Tests'); + group: 'CI' with: #('Tests'); group: 'all' with: #('Core' 'Tests'); group: 'default' with: #('all') ] diff --git a/src/Collections-BitmapCharacterSet-Tests/BitmapCharacterSetTest.class.st b/src/Collections-BitmapCharacterSet-Tests/BitmapCharacterSetTest.class.st index 8e6530b..893983c 100644 --- a/src/Collections-BitmapCharacterSet-Tests/BitmapCharacterSetTest.class.st +++ b/src/Collections-BitmapCharacterSet-Tests/BitmapCharacterSetTest.class.st @@ -2,15 +2,17 @@ Unit tests for BitmapCharacterSet " Class { - #name : #BitmapCharacterSetTest, - #superclass : #TestCase, + #name : 'BitmapCharacterSetTest', + #superclass : 'TestCase', #instVars : [ 'characters' ], - #category : #'Collections-BitmapCharacterSet-Tests' + #category : 'Collections-BitmapCharacterSet-Tests-Base', + #package : 'Collections-BitmapCharacterSet-Tests', + #tag : 'Base' } -{ #category : #enumerating } +{ #category : 'enumerating' } BitmapCharacterSetTest >> absentCharactersDo: aBlock [ | previousValue | @@ -24,20 +26,24 @@ BitmapCharacterSetTest >> absentCharactersDo: aBlock [ aBlock value: i asCharacter]. ] -{ #category : #asserting } +{ #category : 'asserting' } BitmapCharacterSetTest >> assertSet: aFirstSet copiedFrom: aSecondSet equals: aThirdSet [ + self - deny: aFirstSet == aSecondSet; - deny: aFirstSet byteCharacters == aSecondSet byteCharacters. - (aFirstSet wideCharacters notNil - or: [aSecondSet wideCharacters notNil]) - ifTrue: [self deny: aFirstSet wideCharacters == aSecondSet wideCharacters]. - - self assert: aFirstSet = aThirdSet. + deny: aFirstSet identicalTo: aSecondSet; + deny: aFirstSet byteCharacters + identicalTo: aSecondSet byteCharacters. + (aFirstSet wideCharacters isNotNil or: [ + aSecondSet wideCharacters isNotNil ]) ifTrue: [ + self + deny: aFirstSet wideCharacters + identicalTo: aSecondSet wideCharacters ]. + self assert: aFirstSet equals: aThirdSet ] -{ #category : #accessing } +{ #category : 'accessing' } BitmapCharacterSetTest >> characters [ + ^ characters ifNil: [| writeStream previousValue offset | writeStream := (Array new: 250000) writeStream. @@ -56,135 +62,144 @@ BitmapCharacterSetTest >> characters [ characters := writeStream contents] ] -{ #category : #enumerating } +{ #category : 'enumerating' } BitmapCharacterSetTest >> charactersDo: aBlock [ + self characters do: aBlock ] -{ #category : #accessing } +{ #category : 'accessing' } BitmapCharacterSetTest >> emptySet [ + ^ self setClass new ] -{ #category : #accessing } +{ #category : 'accessing' } BitmapCharacterSetTest >> lastCodePoint [ + ^ 16r10FFFF ] -{ #category : #accessing } +{ #category : 'accessing' } BitmapCharacterSetTest >> nonEmptySet [ + ^ self setClass newFrom: self characters ] -{ #category : #accessing } +{ #category : 'accessing' } BitmapCharacterSetTest >> rangeCharacters [ + ^ 'abcdefghijklmnopqrstuvwxyz' ] -{ #category : #accessing } +{ #category : 'accessing' } BitmapCharacterSetTest >> rangeStart [ + ^ self rangeCharacters first ] -{ #category : #accessing } +{ #category : 'accessing' } BitmapCharacterSetTest >> rangeStop [ + ^ self rangeCharacters last ] -{ #category : #accessing } +{ #category : 'accessing' } BitmapCharacterSetTest >> setClass [ + ^ BitmapCharacterSet ] -{ #category : #tests } +{ #category : 'tests' } BitmapCharacterSetTest >> testAdd [ - | set | + | set | set := self emptySet. - self charactersDo: [:each | + self charactersDo: [ :each | self deny: (set includes: each); - assert: (set add: each) = each; + assert: (set add: each) equals: each; assert: (set includes: each); - assert: (set add: each) = each; - assert: (set includes: each)]. + assert: (set add: each) equals: each; + assert: (set includes: each) ] ] -{ #category : #tests } +{ #category : 'tests' } BitmapCharacterSetTest >> testAddRangeFromTo [ - | set | + | set | set := self emptySet. - self "empty range, because from > to" - assert: (set addRangeFrom: self rangeStop to: self rangeStart) == set; - assert: set isEmpty. - self - assert: (set addRangeFrom: self rangeStart to: self rangeStop) == set; - assert: set = (self setClass newFrom: self rangeCharacters). + assert: (set addRangeFrom: self rangeStop to: self rangeStart) + identicalTo: set; + assert: set isEmpty. "empty range, because from > to" + self + assert: (set addRangeFrom: self rangeStart to: self rangeStop) + identicalTo: set; + assert: set equals: (self setClass newFrom: self rangeCharacters). set := self emptySet. self - assert: (set addRangeFrom: self rangeStart to: self rangeStart) == set; - assert: set = (self setClass with: self rangeStart). + assert: (set addRangeFrom: self rangeStart to: self rangeStart) + identicalTo: set; + assert: set equals: (self setClass with: self rangeStart) ] -{ #category : #tests } +{ #category : 'tests' } BitmapCharacterSetTest >> testByteCharactersDo [ - | set enumerated | + | set enumerated | set := self emptySet. enumerated := OrderedCollection new. - set byteCharactersDo: [:each | enumerated addLast: each]. + set byteCharactersDo: [ :each | enumerated addLast: each ]. self assert: enumerated isEmpty. set addAll: self characters. - set byteCharactersDo: [:each | enumerated addLast: each]. + set byteCharactersDo: [ :each | enumerated addLast: each ]. self assert: enumerated notEmpty. - enumerated withIndexDo: [:each :i | + enumerated withIndexDo: [ :each :i | self assert: each asciiValue < 256; - assert: each = (self characters at: i)]. + assert: each equals: (self characters at: i) ] ] -{ #category : #tests } +{ #category : 'tests' } BitmapCharacterSetTest >> testCapacity [ "Since the bitmap is allocated in bytes, the last byte can have excess capacity even when a specific capacity is specified." self - assert: (self setClass new: 0) capacity = 256; - assert: (self setClass new: 256) capacity = 256. - 257 to: 264 do: [:i | - self assert: (self setClass new: i) capacity = 264]. - 265 to: 272 do: [:i | - self assert: (self setClass new: i) capacity = 272]. + assert: (self setClass new: 0) capacity equals: 256; + assert: (self setClass new: 256) capacity equals: 256. + 257 to: 264 do: [ :i | + self assert: (self setClass new: i) capacity equals: 264 ]. + 265 to: 272 do: [ :i | + self assert: (self setClass new: i) capacity equals: 272 ] ] -{ #category : #tests } +{ #category : 'tests' } BitmapCharacterSetTest >> testComplement [ - | set complement | + | set complement | set := self nonEmptySet. complement := set complement. - self deny: set = complement. - self charactersDo: [:each | + self deny: set equals: complement. + self charactersDo: [ :each | self assert: (set includes: each); - deny: (complement includes: each)]. - self absentCharactersDo: [:each | + deny: (complement includes: each) ]. + self absentCharactersDo: [ :each | self deny: (set includes: each); - assert: (complement includes: each)]. - - self assert: complement complement = set. + assert: (complement includes: each) ]. + self assert: complement complement equals: set ] -{ #category : #tests } +{ #category : 'tests' } BitmapCharacterSetTest >> testConcatenation [ - | set | + | set | set := self emptySet. self assertSet: set, self nonEmptySet @@ -199,13 +214,13 @@ BitmapCharacterSetTest >> testConcatenation [ self assertSet: set, self nonEmptySet copiedFrom: set - equals: self nonEmptySet. + equals: self nonEmptySet ] -{ #category : #tests } +{ #category : 'tests' } BitmapCharacterSetTest >> testCopy [ - | set | + | set | set := self emptySet. self assertSet: set copy @@ -216,13 +231,13 @@ BitmapCharacterSetTest >> testCopy [ self assertSet: set copy copiedFrom: set - equals: self nonEmptySet. + equals: self nonEmptySet ] -{ #category : #tests } +{ #category : 'tests' } BitmapCharacterSetTest >> testCopyEmpty [ - | set | + | set | set := self emptySet. self assertSet: set copyEmpty @@ -233,41 +248,42 @@ BitmapCharacterSetTest >> testCopyEmpty [ self assertSet: set copyEmpty copiedFrom: set - equals: self emptySet. + equals: self emptySet ] -{ #category : #tests } +{ #category : 'tests' } BitmapCharacterSetTest >> testDo [ - | set enumerated | + | set enumerated | set := self emptySet. enumerated := OrderedCollection new. - set do: [:each | enumerated addLast: each]. + set do: [ :each | enumerated addLast: each ]. self assert: enumerated isEmpty. set addAll: self characters. - set do: [:each | enumerated addLast: each]. - self assert: enumerated size = self characters size. + set do: [ :each | enumerated addLast: each ]. + self assert: enumerated size equals: self characters size. enumerated with: self characters - do: [:enumeratedChar :expectedChar | - self assert: enumeratedChar = expectedChar] + do: [ :enumeratedChar :expectedChar | + self assert: enumeratedChar equals: expectedChar ] ] -{ #category : #tests } +{ #category : 'tests' } BitmapCharacterSetTest >> testEquals [ + self - assert: self emptySet = self emptySet; - assert: self nonEmptySet = self nonEmptySet; - deny: self emptySet = self nonEmptySet; - deny: self nonEmptySet = self emptySet + assert: self emptySet equals: self emptySet; + assert: self nonEmptySet equals: self nonEmptySet; + deny: self emptySet equals: self nonEmptySet; + deny: self nonEmptySet equals: self emptySet ] -{ #category : #tests } +{ #category : 'tests' } BitmapCharacterSetTest >> testHasWideCharacters [ - | set | + | set | set := self emptySet. self deny: set hasWideCharacters. @@ -278,214 +294,213 @@ BitmapCharacterSetTest >> testHasWideCharacters [ self assert: set hasWideCharacters. set remove: 256 asCharacter. - self deny: set hasWideCharacters. + self deny: set hasWideCharacters ] -{ #category : #tests } +{ #category : 'tests' } BitmapCharacterSetTest >> testHash [ + self - assert: self emptySet hash = self emptySet hash; - assert: self nonEmptySet hash = self nonEmptySet hash + assert: self emptySet hash equals: self emptySet hash; + assert: self nonEmptySet hash equals: self nonEmptySet hash ] -{ #category : #tests } +{ #category : 'tests' } BitmapCharacterSetTest >> testIncludes [ - | set | + | set | set := self emptySet. self - charactersDo: [:each | self deny: (set includes: each)]; - absentCharactersDo: [:each | self deny: (set includes: each)]. + charactersDo: [ :each | self deny: (set includes: each) ]; + absentCharactersDo: [ :each | self deny: (set includes: each) ]. set := self nonEmptySet. self - charactersDo: [:each | self assert: (set includes: each)]; - absentCharactersDo: [:each | self deny: (set includes: each)]. + charactersDo: [ :each | self assert: (set includes: each) ]; + absentCharactersDo: [ :each | self deny: (set includes: each) ] ] -{ #category : #tests } +{ #category : 'tests' } BitmapCharacterSetTest >> testIncludesRangeFromTo [ - | set | + | set | set := self emptySet. - self rangeCharacters do: [:each | + self rangeCharacters do: [ :each | self deny: (set includesRangeFrom: self rangeStart to: self rangeStop); assert: (set includesRangeFrom: self rangeStop to: self rangeStart). - set add: each]. + set add: each ]. self assert: (set includesRangeFrom: self rangeStart to: self rangeStop); - assert: (set includesRangeFrom: self rangeStop to: self rangeStart). + assert: (set includesRangeFrom: self rangeStop to: self rangeStart) ] -{ #category : #tests } +{ #category : 'tests' } BitmapCharacterSetTest >> testMaxCapacity [ - | maxCapacity set | + | maxCapacity set | maxCapacity := self lastCodePoint + 1. set := self setClass new: maxCapacity. - self assert: set capacity = maxCapacity. + self assert: set capacity equals: maxCapacity. set := self setClass new: maxCapacity + 1. - self assert: set capacity = maxCapacity. + self assert: set capacity equals: maxCapacity. set := self setClass new: maxCapacity * 2. - self assert: set capacity = maxCapacity. + self assert: set capacity equals: maxCapacity ] -{ #category : #tests } +{ #category : 'tests' } BitmapCharacterSetTest >> testMaxCharacter [ - | set | + | set | set := self emptySet. - self - shouldnt: [set add: self lastCodePoint asCharacter] - raise: Error. + set add: self lastCodePoint asCharacter. self assert: (set includes: self lastCodePoint asCharacter). self - should: [set add: (self lastCodePoint + 1) asCharacter] - raise: Error. + should: [ set add: (self lastCodePoint + 1) asCharacter ] + raise: Error ] -{ #category : #tests } +{ #category : 'tests' } BitmapCharacterSetTest >> testNewFrom [ - | set newSet | + | set newSet | set := self setClass newFrom: self characters. - self assert: set class == self setClass. - self charactersDo: [:each | self assert: (set includes: each)]. + self assert: set class identicalTo: self setClass. + self charactersDo: [ :each | self assert: (set includes: each) ]. newSet := self setClass newFrom: set. self - assert: newSet = set; - deny: newSet == set. + assert: newSet equals: set; + deny: newSet identicalTo: set ] -{ #category : #tests } +{ #category : 'tests' } BitmapCharacterSetTest >> testRemoveAll [ - | set capacity byteCharactersSize wideCharactersSize| + | set capacity byteCharactersSize wideCharactersSize | set := self nonEmptySet. capacity := set capacity. byteCharactersSize := set byteCharacters size. wideCharactersSize := set wideCharacters size. self - assert: set removeAll == set; - assert: set size = 0; - assert: set capacity = capacity; - assert: set byteCharacters size = byteCharactersSize; - assert: (set byteCharacters allSatisfy: [:each | each = false]); - assert: set wideCharacters size = wideCharactersSize; - assert: (set wideCharacters allSatisfy: [:each | each = 0]). + assert: set removeAll identicalTo: set; + assert: set size equals: 0; + assert: set capacity equals: capacity; + assert: set byteCharacters size equals: byteCharactersSize; + assert: (set byteCharacters allSatisfy: [ :each | each = false ]); + assert: set wideCharacters size equals: wideCharactersSize; + assert: (set wideCharacters allSatisfy: [ :each | each = 0 ]) ] -{ #category : #tests } +{ #category : 'tests' } BitmapCharacterSetTest >> testRemoveIfAbsent [ - | set | + | set | set := self nonEmptySet. - self absentCharactersDo: [:each | - self assert: - (set - remove: each - ifAbsent: [#absent]) = #absent]. - self charactersDo: [:each | - self assert: - (set - remove: each - ifAbsent: [self fail]) = each. - self assert: - (set - remove: each - ifAbsent: [#absent]) = #absent]. + self absentCharactersDo: [ :each | + self + assert: (set remove: each ifAbsent: [ #absent ]) + equals: #absent ]. + self charactersDo: [ :each | + self assert: (set remove: each ifAbsent: [ self fail ]) equals: each. + self + assert: (set remove: each ifAbsent: [ #absent ]) + equals: #absent ] ] -{ #category : #tests } +{ #category : 'tests' } BitmapCharacterSetTest >> testRemoveRangeFromTo [ - | set | + | set | set := self emptySet. - self "empty range, because from > to" - assert: (set removeRangeFrom: self rangeStop to: self rangeStart) == set; + self + assert: (set removeRangeFrom: self rangeStop to: self rangeStart) + identicalTo: set; assert: set isEmpty. set addRangeFrom: self rangeStart to: self rangeStop. self - assert: (set removeRangeFrom: self rangeStart to: self rangeStop) == set; + assert: (set removeRangeFrom: self rangeStart to: self rangeStop) + identicalTo: set; assert: set isEmpty. - self rangeCharacters do: [:each | + self rangeCharacters do: [ :each | set := self setClass newFrom: self rangeCharacters. self - assert: (set removeRangeFrom: each to: each) == set; - assert: - set = - (self setClass newFrom: (self rangeCharacters copyWithout: each)). - self - should: [set removeRangeFrom: each to: each] - raise: Error]. + assert: (set removeRangeFrom: each to: each) identicalTo: set; + assert: set + equals: + (self setClass newFrom: (self rangeCharacters copyWithout: each)). + self should: [ set removeRangeFrom: each to: each ] raise: Error ] ] -{ #category : #tests } +{ #category : 'tests' } BitmapCharacterSetTest >> testSize [ - | set size | + | set size | set := self emptySet. size := 0. - self charactersDo: [:each | - self assert: set size = size. + self charactersDo: [ :each | + self assert: set size equals: size. set add: each. size := size + 1. - self assert: set size = size. - - "Adding the same character shouldn't alter the size" + self assert: set size equals: size. set add: each. - self assert: set size = size.]. + self assert: set size equals: size ]. - self charactersDo: [:each | + self charactersDo: [ :each | set remove: each. size := size - 1. - self assert: set size = size]. + self assert: set size equals: size ] ] -{ #category : #tests } +{ #category : 'tests' } BitmapCharacterSetTest >> testWideCharacters [ - 0 to: 7 do: [:i | | set character | + + 0 to: 7 do: [ :i | + | set character | set := self setClass new. character := (256 + i) asCharacter. self assert: set wideCharacters isNil. set add: character. - self assert: set wideCharacters first = (16r80 bitShift: i negated). + self + assert: set wideCharacters first + equals: (16r80 bitShift: i negated). set remove: character. - self assert: set wideCharacters first = 0]. - 0 to: 7 do: [:i | | set character | + self assert: set wideCharacters first equals: 0 ]. + 0 to: 7 do: [ :i | + | set character | set := self setClass new. character := (256 + 8 + i) asCharacter. self assert: set wideCharacters isNil. set add: character. - self assert: set wideCharacters second = (16r80 bitShift: i negated). + self + assert: set wideCharacters second + equals: (16r80 bitShift: i negated). set remove: character. - self assert: set wideCharacters second = 0] + self assert: set wideCharacters second equals: 0 ] ] -{ #category : #tests } +{ #category : 'tests' } BitmapCharacterSetTest >> testWideCharactersDo [ - | set enumerated wideCharOffset | + | set enumerated wideCharOffset | set := self emptySet. enumerated := OrderedCollection new. - set wideCharactersDo: [:each | enumerated addLast: each]. + set wideCharactersDo: [ :each | enumerated addLast: each ]. self assert: enumerated isEmpty. set addAll: self characters. - set wideCharactersDo: [:each | enumerated addLast: each]. + set wideCharactersDo: [ :each | enumerated addLast: each ]. self assert: enumerated notEmpty. - wideCharOffset := - (self characters findFirst: [:each | each asciiValue >= 256]) - 1. - enumerated withIndexDo: [:each :i | + wideCharOffset := (self characters findFirst: [ :each | + each asciiValue >= 256 ]) - 1. + enumerated withIndexDo: [ :each :i | self assert: each asciiValue >= 256; - assert: each = (self characters at: wideCharOffset + i)]. + assert: each equals: (self characters at: wideCharOffset + i) ] ] diff --git a/src/Collections-BitmapCharacterSet-Tests/ManifestCollectionsBitmapCharacterSetTests.class.st b/src/Collections-BitmapCharacterSet-Tests/ManifestCollectionsBitmapCharacterSetTests.class.st new file mode 100644 index 0000000..8368bd1 --- /dev/null +++ b/src/Collections-BitmapCharacterSet-Tests/ManifestCollectionsBitmapCharacterSetTests.class.st @@ -0,0 +1,38 @@ +" +Please describe the package using the class comment of the included manifest class. The manifest class also includes other additional metadata for the package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser +" +Class { + #name : 'ManifestCollectionsBitmapCharacterSetTests', + #superclass : 'PackageManifest', + #category : 'Collections-BitmapCharacterSet-Tests-Manifest', + #package : 'Collections-BitmapCharacterSet-Tests', + #tag : 'Manifest' +} + +{ #category : 'code-critics' } +ManifestCollectionsBitmapCharacterSetTests class >> ruleCollectionProtocolRuleV1FalsePositive [ + + + ^ #(#(#(#RGMethodDefinition #(#BitmapCharacterSetTest #testIncludesRangeFromTo #false)) #'2023-09-10T10:22:27.072+02:00') ) +] + +{ #category : 'code-critics' } +ManifestCollectionsBitmapCharacterSetTests class >> ruleEqualsTrueRuleV1FalsePositive [ + + + ^ #(#(#(#RGMethodDefinition #(#BitmapCharacterSetTest #testRemoveAll #false)) #'2023-09-10T10:23:20.756+02:00') ) +] + +{ #category : 'code-critics' } +ManifestCollectionsBitmapCharacterSetTests class >> ruleLiteralArrayContainsSuspiciousTrueFalseOrNilRuleV1FalsePositive [ + + + ^ #(#(#(#RGMetaclassDefinition #(#'ManifestCollectionsBitmapCharacterSetTests class' #ManifestCollectionsBitmapCharacterSetTests)) #'2023-09-10T10:26:38.422+02:00') ) +] + +{ #category : 'code-critics' } +ManifestCollectionsBitmapCharacterSetTests class >> ruleUsesAddRuleV1FalsePositive [ + + + ^ #(#(#(#RGMethodDefinition #(#BitmapCharacterSetTest #testAdd #false)) #'2023-09-10T10:20:40.071+02:00') ) +] diff --git a/src/Collections-BitmapCharacterSet-Tests/package.st b/src/Collections-BitmapCharacterSet-Tests/package.st index 1644a17..ad48dc0 100644 --- a/src/Collections-BitmapCharacterSet-Tests/package.st +++ b/src/Collections-BitmapCharacterSet-Tests/package.st @@ -1 +1 @@ -Package { #name : #'Collections-BitmapCharacterSet-Tests' } +Package { #name : 'Collections-BitmapCharacterSet-Tests' } diff --git a/src/Collections-BitmapCharacterSet/BitmapCharacterSet.class.st b/src/Collections-BitmapCharacterSet/BitmapCharacterSet.class.st index f463406..a689688 100644 --- a/src/Collections-BitmapCharacterSet/BitmapCharacterSet.class.st +++ b/src/Collections-BitmapCharacterSet/BitmapCharacterSet.class.st @@ -11,43 +11,42 @@ Class { 'wideCharacters', 'tally' ], - #category : #'Collections-BitmapCharacterSet' + #category : #'Collections-BitmapCharacterSet-Base' } -{ #category : #inspecting } -BitmapCharacterSet class >> inspectorClass [ - "does not use Set class>>inspectorClass because it is incompatible" - ^ Smalltalk tools inspectorClass -] - { #category : #'instance creation' } BitmapCharacterSet class >> new [ + ^ self new: 256 ] { #category : #'instance creation' } BitmapCharacterSet class >> new: aCapacity [ + ^ self basicNew initialize: aCapacity ] { #category : #'instance creation' } BitmapCharacterSet class >> newFrom: aCollection [ "for GS portability" + ^ self new addAll: aCollection; - yourself + yourself ] { #category : #copying } BitmapCharacterSet >> , aCollection [ "GS doesn't define #, for non-Sequenceable collections" + ^ self copy - addAll: aCollection; - yourself + addAll: aCollection; + yourself ] { #category : #comparing } BitmapCharacterSet >> = anObject [ + self == anObject ifTrue: [^ true]. @@ -58,28 +57,26 @@ BitmapCharacterSet >> = anObject [ self do: [:each | (anObject includes: each) ifFalse: [^ false]]. - ^ true. + ^ true ] { #category : #adding } BitmapCharacterSet >> add: aCharacter [ - | asciiValue | + | asciiValue | "optimized for speed with inlining; do not refactor" (asciiValue := aCharacter asciiValue) < 256 ifTrue: [ - (byteCharacters at: asciiValue + 1) - ifFalse: [tally := tally + 1]. - byteCharacters - at: asciiValue + 1 - put: true] - ifFalse: [| byteIndex byte bitmask | + (byteCharacters at: asciiValue + 1) ifFalse: [ tally := tally + 1 ]. + byteCharacters at: asciiValue + 1 put: true ] + ifFalse: [ + | byteIndex byte bitmask | "256 // 8 - 31 = 1 (first index), (256 + 8) // 8 - 31 = 2 (second), etc (with 'bitShift: -3' used over '// 8' for speed)" byteIndex := (asciiValue bitShift: -3) - 31. - (wideCharacters == nil - or: [byteIndex > wideCharacters size]) - ifTrue: [self growWideCharacterBitmapTo: (byteIndex * 1.5) asInteger]. + (wideCharacters isNil or: [ byteIndex > wideCharacters size ]) + ifTrue: [ + self growWideCharacterBitmapTo: (byteIndex * 1.5) asInteger ]. "raises an error if asciiValue > 16r10FFFF" byte := wideCharacters at: byteIndex. @@ -87,15 +84,12 @@ BitmapCharacterSet >> add: aCharacter [ "for the byte bitmask, left shift 1 by 7 - (asciiValue \\ 8) (with 'bitAnd: 7' used over '\\ 8' for speed)" bitmask := 1 bitShift: 7 - (asciiValue bitAnd: 7). - + "increment the tally if the character is not already present" - (byte bitAnd: bitmask) == 0 - ifTrue: [tally := tally + 1]. + (byte bitAnd: bitmask) == 0 ifTrue: [ tally := tally + 1 ]. - wideCharacters - at: byteIndex - put: (byte bitOr: bitmask)]. - ^ aCharacter. + wideCharacters at: byteIndex put: (byte bitOr: bitmask) ]. + ^ aCharacter ] { #category : #adding } @@ -113,44 +107,49 @@ BitmapCharacterSet >> addRangeFrom: aStartCharacter to: aStopCharacter [ { #category : #private } BitmapCharacterSet >> byteCharacters [ + ^ byteCharacters ] { #category : #enumerating } BitmapCharacterSet >> byteCharactersDo: aBlock [ - 1 to: byteCharacters size do: [:i | - (byteCharacters at: i) - ifTrue: [aBlock value: (Character value: i - 1)]] + + 1 to: byteCharacters size do: [ :i | + (byteCharacters at: i) ifTrue: [ + aBlock value: (Character value: i - 1) ] ] ] { #category : #accessing } BitmapCharacterSet >> capacity [ + ^ byteCharacters size + (wideCharacters ifNil: [0] - ifNotNil: [wideCharacters size * 8]). + ifNotNil: [wideCharacters size * 8]) ] { #category : #converting } BitmapCharacterSet >> complement [ - | copy | + | copy | copy := self copyEmpty. 0 to: 16r10FFFF do: [:i | | character | character := (Character value: i). (self includes: character) ifFalse: [copy add: character]]. - ^ copy. + ^ copy ] { #category : #copying } BitmapCharacterSet >> copyEmpty [ "reimplemented for GS and Squeak compatibility" + ^ self species new: self capacity ] { #category : #enumerating } BitmapCharacterSet >> do: aBlock [ + self byteCharactersDo: aBlock; wideCharactersDo: aBlock @@ -158,8 +157,8 @@ BitmapCharacterSet >> do: aBlock [ { #category : #private } BitmapCharacterSet >> growWideCharacterBitmapTo: aSizeInBytes [ - | newSize | + | newSize | newSize := aSizeInBytes min: self maxWideCharactersSize. wideCharacters ifNil: [wideCharacters := ByteArray new: newSize] @@ -169,29 +168,30 @@ BitmapCharacterSet >> growWideCharacterBitmapTo: aSizeInBytes [ replaceFrom: 1 to: wideCharacters size with: wideCharacters - startingAt: 1]. + startingAt: 1] ] { #category : #testing } BitmapCharacterSet >> hasWideCharacters [ + self wideCharactersDo: [:each | ^ true]. - ^ false. + ^ false ] { #category : #comparing } BitmapCharacterSet >> hash [ - | hash | + | hash | hash := self species hash. self byteCharactersDo: [:each | hash := hash bitXor: each hash]. - ^ hash bitXor: self size hash. + ^ hash bitXor: self size hash ] { #category : #testing } BitmapCharacterSet >> includes: aCharacter [ - | asciiValue | + | asciiValue | "optimized for speed with inlining; do not refactor" (asciiValue := aCharacter asciiValue) < 256 ifTrue: [^ byteCharacters at: asciiValue + 1] @@ -222,11 +222,12 @@ BitmapCharacterSet >> includesRangeFrom: aStartCharacter to: aStopCharacter [ do: [:i | (self includes: (Character value: i)) ifFalse: [^ false]]. - ^ true. + ^ true ] { #category : #initialization } BitmapCharacterSet >> initialize: aCapacity [ + byteCharacters := Array new: 256 withAll: false. aCapacity > 256 ifTrue: [ @@ -234,25 +235,28 @@ BitmapCharacterSet >> initialize: aCapacity [ (257 + 8 - 1) // 8 - 31 = 2 (second byte), etc (with 'bitShift: -3' used over '// 8' for speed)" self growWideCharacterBitmapTo: ((aCapacity - 1) bitShift: -3) - 31]. - tally := 0. + tally := 0 ] { #category : #testing } BitmapCharacterSet >> isEmpty [ "Squeak's Collection>>#isEmpty is inefficient" + ^ self size = 0 ] { #category : #private } BitmapCharacterSet >> maxWideCharactersSize [ + ^ 139232 "(16r10FFFF bitShift: -3) - 31" ] { #category : #copying } BitmapCharacterSet >> postCopy [ + byteCharacters := byteCharacters copy. wideCharacters - ifNotNil: [wideCharacters := wideCharacters copy]. + ifNotNil: [wideCharacters := wideCharacters copy] ] { #category : #removing } @@ -270,7 +274,7 @@ BitmapCharacterSet >> remove: aCharacter ifAbsent: aBlock [ ifFalse: [| byteIndex byte bitmask | wideCharacters ifNil: [^ aBlock value]. - + "256 // 8 - 31 = 1 (first index), (256 + 8) // 8 - 31 = 2 (second), etc (with 'bitShift: -3' used over '// 8' for speed)" (byteIndex := (asciiValue bitShift: -3) - 31) > wideCharacters size @@ -286,7 +290,7 @@ BitmapCharacterSet >> remove: aCharacter ifAbsent: aBlock [ at: byteIndex put: (byte bitAnd: bitmask bitInvert)]. tally := tally - 1. - ^ aCharacter. + ^ aCharacter ] { #category : #removing } @@ -314,6 +318,7 @@ BitmapCharacterSet >> removeRangeFrom: aStartCharacter to: aStopCharacter [ "chars don't support to:do: (compiled inline) and using to: and do: separately needlessly creates a (possibly large) temp array" + aStartCharacter asciiValue to: aStopCharacter asciiValue do: [:i | self remove: (Character value: i)] @@ -321,19 +326,21 @@ BitmapCharacterSet >> removeRangeFrom: aStartCharacter to: aStopCharacter [ { #category : #accessing } BitmapCharacterSet >> size [ + ^ tally ] { #category : #private } BitmapCharacterSet >> wideCharacters [ + ^ wideCharacters ] { #category : #enumerating } BitmapCharacterSet >> wideCharactersDo: aBlock [ "optimized for speed with to:do: and inlining; do not refactor" - | baseValue | + | baseValue | wideCharacters ifNil: [^ self]. @@ -346,5 +353,5 @@ BitmapCharacterSet >> wideCharactersDo: aBlock [ ifFalse: [ aBlock value: (Character value: baseValue + shiftIndex)]]]. - baseValue := baseValue + 8]. + baseValue := baseValue + 8] ] diff --git a/src/ConfigurationOfBitmapCharacterSet/ConfigurationOfBitmapCharacterSet.class.st b/src/ConfigurationOfBitmapCharacterSet/ConfigurationOfBitmapCharacterSet.class.st deleted file mode 100644 index 0255637..0000000 --- a/src/ConfigurationOfBitmapCharacterSet/ConfigurationOfBitmapCharacterSet.class.st +++ /dev/null @@ -1,448 +0,0 @@ -" -(ConfigurationOfBitmapCharacterSet project version: #stable) load - -(ConfigurationOfBitmapCharacterSet project version: #stable) load: #('Tests') -" -Class { - #name : #ConfigurationOfBitmapCharacterSet, - #superclass : #Object, - #instVars : [ - 'project' - ], - #classVars : [ - 'LastVersionLoad' - ], - #category : #ConfigurationOfBitmapCharacterSet -} - -{ #category : #private } -ConfigurationOfBitmapCharacterSet class >> bootstrapPackage: aString from: aPath [ - | repository version | - repository := MCHttpRepository - location: aPath - user: '' - password: ''. - repository - versionReaderForFileNamed: aString , '.mcz' - do: [:reader | - version := reader version. - version load. - version workingCopy repositoryGroup addRepository: repository] -] - -{ #category : #catalog } -ConfigurationOfBitmapCharacterSet class >> catalogChangeLog [ - - ^ ' --25/11/2013 - Speed improvements from Monty. -[[[ -(ConfigurationOfSoup project version: #''stable'') load -(ConfigurationOfSoup project version: ''1.1'') load -]]] - --1/2013 - Migrated from squeaksource. -[[[ -(ConfigurationOfSoup project version: #''stable'') load -(ConfigurationOfSoup project version: ''1.0'') load -]]] - - -' - - -] - -{ #category : #catalog } -ConfigurationOfBitmapCharacterSet class >> catalogDescription [ - -^ 'BitmapCharacterSet is a set for characters that uses a bitmap for storing wide characters and an array of truth values for byte characters. Used by XMLParser.' -] - -{ #category : #catalog } -ConfigurationOfBitmapCharacterSet class >> catalogKeyClassesAndExample [ - - ^ 'It is composed of a single class BitmapCharacterSet. - -Example: -[[[ - BitmapCharacterSet newFrom: Character separators. - BitmapCharacterSet newFrom: Character allByteCharacters. -]]]' -] - -{ #category : #catalog } -ConfigurationOfBitmapCharacterSet class >> catalogKeywords [ - ^ #(collection set character unicode) - -] - -{ #category : #catalog } -ConfigurationOfBitmapCharacterSet class >> catalogLicense [ - ^ 'The MIT License (MIT) - -Copyright (c) 2016 PharoExtras Team. - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.' -] - -{ #category : #private } -ConfigurationOfBitmapCharacterSet class >> ensureMetacello [ - "Bootstrap Gofer (if necessary), bootstrap ConfigurationOfMetacello (using old Gofer API), then load the latest - version of Metacello itself." - - Smalltalk at: #MetacelloProject ifAbsent: [ - Smalltalk at: #Gofer ifAbsent: [ - "Current version of Gofer from which to bootstrap - as of 1.0-beta.21" - self bootstrapPackage: 'Gofer-Core-lr.115' from: 'http://seaside.gemstone.com/ss/metacello' ]. - Smalltalk at: #Gofer ifPresent: [:goferClass | | gofer | - gofer := goferClass new - url: 'http://seaside.gemstone.com/ss/metacello'; - yourself. - [ gofer addPackage: 'ConfigurationOfMetacello' ] on: Warning do: [:ex | ex resume ]. - gofer load ]. - "load 'default' group of Metacello" - (Smalltalk at: #ConfigurationOfMetacello) perform: #load ] -] - -{ #category : #'metacello tool support' } -ConfigurationOfBitmapCharacterSet class >> isMetacelloConfig [ - "Answer true and the Metacello tools will operate on you" - - ^true -] - -{ #category : #'metacello tool support' } -ConfigurationOfBitmapCharacterSet class >> lastMetacelloVersionLoad [ - "Answer the last version loaded and the list of packages loaded for that version." - - LastVersionLoad == nil ifTrue: [ LastVersionLoad := nil -> 'default' ]. - ^LastVersionLoad -] - -{ #category : #loading } -ConfigurationOfBitmapCharacterSet class >> load [ - "self load" - - ^self project latestVersion load -] - -{ #category : #loading } -ConfigurationOfBitmapCharacterSet class >> loadDefault [ - "self loadDefault" - - ^ self loadMostRecentCoreWithTests -] - -{ #category : #loading } -ConfigurationOfBitmapCharacterSet class >> loadMostRecentCoreWithTests [ - ^self project lastVersion load: #('Core' 'Tests') -] - -{ #category : #'metacello tool support' } -ConfigurationOfBitmapCharacterSet class >> metacelloVersion: versionString loads: anArrayOrString [ - "Stash the last version loaded and the list of packages loaded for that version. The list - of packages will be used by the tools when doing 'Load Package Version'" - - LastVersionLoad := versionString -> anArrayOrString -] - -{ #category : #accessing } -ConfigurationOfBitmapCharacterSet class >> project [ - - ^self new project -] - -{ #category : #'unloading Metacello' } -ConfigurationOfBitmapCharacterSet class >> unloadMetacello [ - - Smalltalk at: #ConfigurationOfMetacello ifPresent: [:cls | cls unloadMetacello ] -] - -{ #category : #'baselines - outdated' } -ConfigurationOfBitmapCharacterSet >> baseline100: spec [ - - - spec for: #common do: [ - spec blessing: #baseline. - spec repository: 'http://smalltalkhub.com/mc/PharoExtras/BitmapCharacterSet/main'. - spec description: 'Imported from SqueakSource'. - spec package: 'Collections-BitmapCharacterSet'. - spec - package: 'Collections-Tests-BitmapCharacterSet' - with: [spec requires: 'Collections-BitmapCharacterSet']. - - spec - group: 'default' with: #('Core'); - group: 'Core' with: #('Collections-BitmapCharacterSet'); - group: 'Tests' with: #('Collections-Tests-BitmapCharacterSet'). ]. -] - -{ #category : #'symbolic versions' } -ConfigurationOfBitmapCharacterSet >> dev: spec [ - - - spec for: #'common' do: [ - spec - baseline: 'BitmapCharacterSet' with: [ - spec - className: 'BaselineOfBitmapCharacterSet'; - repository: 'github://pharo-contributions/BitmapCharacterSet:master/src' ]] -] - -{ #category : #'symbolic versions' } -ConfigurationOfBitmapCharacterSet >> development: spec [ - - - spec for: #'common' version: 'dev' - -] - -{ #category : #accessing } -ConfigurationOfBitmapCharacterSet >> project [ - - ^ project ifNil: [ | constructor | - "Bootstrap Metacello if it is not already loaded" - self class ensureMetacello. - "Construct Metacello project" - constructor := (Smalltalk at: #MetacelloVersionConstructor) on: self. - project := constructor project. - project loadType: #linear. "change to #atomic if desired" - project ] -] - -{ #category : #'symbolic versions' } -ConfigurationOfBitmapCharacterSet >> stable: spec [ - - - spec for: #'common' version: '1.2.7' -] - -{ #category : #versions } -ConfigurationOfBitmapCharacterSet >> version100: spec [ - - - spec for: #common do: [ - spec blessing: #release. - spec description: 'Latest versions from Squeaksource'. - - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-JAA.5'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-JAA.5' - ] - - - -] - -{ #category : #versions } -ConfigurationOfBitmapCharacterSet >> version110: spec [ - - - spec for: #common do: [ - spec blessing: #release. - spec description: 'Speed Improvement from Monty and adding tests'. - - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-Anonymous.6'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-Anonymous.6' - ] - - - -] - -{ #category : #versions } -ConfigurationOfBitmapCharacterSet >> version111: spec [ - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.7'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-Anonymous.6' - ] - - - -] - -{ #category : #versions } -ConfigurationOfBitmapCharacterSet >> version112: spec [ - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.8'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-Anonymous.6' - ] - - - -] - -{ #category : #versions } -ConfigurationOfBitmapCharacterSet >> version113: spec [ - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.10'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-Anonymous.6' - ]. -] - -{ #category : #versions } -ConfigurationOfBitmapCharacterSet >> version114: spec [ - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.11'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-monty.7' - ]. -] - -{ #category : #versions } -ConfigurationOfBitmapCharacterSet >> version115: spec [ - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.12'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-monty.7' - ]. -] - -{ #category : #versions } -ConfigurationOfBitmapCharacterSet >> version116: spec [ - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.13'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-monty.8' - ]. -] - -{ #category : #versions } -ConfigurationOfBitmapCharacterSet >> version117: spec [ - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.14'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-monty.9' - ]. -] - -{ #category : #versions } -ConfigurationOfBitmapCharacterSet >> version118: spec [ - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.15'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-monty.10' - ]. -] - -{ #category : #versions } -ConfigurationOfBitmapCharacterSet >> version119: spec [ - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.16'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-monty.10' - ]. -] - -{ #category : #versions } -ConfigurationOfBitmapCharacterSet >> version120: spec [ - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.17'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-monty.10' - ]. -] - -{ #category : #versions } -ConfigurationOfBitmapCharacterSet >> version121: spec [ - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.18'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-monty.11' - ]. -] - -{ #category : #versions } -ConfigurationOfBitmapCharacterSet >> version122: spec [ - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.19'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-monty.11' - ]. -] - -{ #category : #versions } -ConfigurationOfBitmapCharacterSet >> version123: spec [ - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.20'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-monty.12' - ]. -] - -{ #category : #versions } -ConfigurationOfBitmapCharacterSet >> version124: spec [ - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.22'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-monty.13' - ]. -] - -{ #category : #versions } -ConfigurationOfBitmapCharacterSet >> version125: spec [ - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.23'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-monty.13' - ]. -] - -{ #category : #versions } -ConfigurationOfBitmapCharacterSet >> version126: spec [ - - - spec for: #common do: [ - spec blessing: #release. - spec package: 'Collections-BitmapCharacterSet' with: 'Collections-BitmapCharacterSet-monty.25'. - spec package: 'Collections-Tests-BitmapCharacterSet' with: 'Collections-Tests-BitmapCharacterSet-monty.14' - ]. -] - -{ #category : #versions } -ConfigurationOfBitmapCharacterSet >> version127: spec [ - - - spec for: #'common' do: [ - spec - baseline: 'BitmapCharacterSet' with: [ - spec - className: 'BaselineOfBitmapCharacterSet'; - repository: 'github://pharo-contributions/BitmapCharacterSet:1.2.7/src' ]] -] diff --git a/src/ConfigurationOfBitmapCharacterSet/package.st b/src/ConfigurationOfBitmapCharacterSet/package.st deleted file mode 100644 index 5b38fd9..0000000 --- a/src/ConfigurationOfBitmapCharacterSet/package.st +++ /dev/null @@ -1 +0,0 @@ -Package { #name : #ConfigurationOfBitmapCharacterSet }