Merge pull request #16 from marschall/sync-2016-08-25

Sync 2016-08-25

Author: marschall

.travis.yml

@@ -1,11 +1,14 @@
 language: smalltalk
 sudo: false
 smalltalk:
+  - Pharo-6.0
   - Pharo-5.0
   - Pharo-4.0
   - Pharo-3.0
-  - Squeak-4.5
+  - Squeak-5.1
   - Squeak-5.0
+  - Squeak-4.6
+  - Squeak-4.5
   - GemStone-3.1.0.6
   - GemStone-3.2.12
   - GemStone-3.3.0

repository/Grease-Core.package/GROrderedMultiMap.class/instance/add..st

@@ -1,4 +1,4 @@
-accessing
+adding
 add: anAssociation
 	self privateAt: anAssociation key put: anAssociation value.
 	^ anAssociation

repository/Grease-Core.package/GROrderedMultiMap.class/instance/addAll..st

@@ -0,0 +1,5 @@
+adding
+addAll: aDictionary
+	aDictionary keysAndValuesDo: [ :key :value |
+			self privateAt: key put: value ].
+	^ aDictionary

repository/Grease-Core.package/GROrderedMultiMap.class/instance/allAt..st

@@ -1,6 +1,3 @@
 accessing
 allAt: aKey
-	^ Array streamContents: [ :stream |
-		1 to: size do: [ :index |
-			(keys at: index) = aKey
-				ifTrue: [ stream nextPut: (values at: index) ] ] ]
+	^ self privateAllAt: aKey startingAt: 1

repository/Grease-Core.package/GROrderedMultiMap.class/instance/at.add..st

@@ -1,4 +1,4 @@
-accessing
+adding
 at: aKey add: aValue
 	"Add an association between aKey and aValue. Do not replace existing
 	values with the same key."

repository/Grease-Core.package/GROrderedMultiMap.class/instance/keysAndAllValuesDo..st

@@ -0,0 +1,12 @@
+enumerating
+keysAndAllValuesDo: aTwoArgumentBlock
+	| seenKeys |
+	seenKeys := GRSmallOrderedSet new.
+	1 to: size * 2 - 1 by: 2 do: [ :index |
+		| key |
+		key := table at: index.
+		(seenKeys includes: key) ifFalse: [
+			aTwoArgumentBlock
+				value: key
+				value: (self privateAllAt: key startingAt: index).
+			seenKeys add: key ] ]

repository/Grease-Core.package/GROrderedMultiMap.class/instance/privateAllAt.startingAt..st

@@ -0,0 +1,6 @@
+private 
+privateAllAt: aKey startingAt: index
+	^ Array new: 2 streamContents: [ :stream |
+		index to: size * 2 - 1 by: 2 do: [ :i |
+			(table at: i) = aKey
+				ifTrue: [ stream nextPut: (table at: i + 1) ] ] ]

repository/Grease-Core.package/GROrderedMultiMap.class/instance/removeKey.ifAbsent..st

@@ -1,10 +1,10 @@
-accessing
+removing
 removeKey: aKey ifAbsent: aBlock
 	"Remove aKey from the receiver, evaluate aBlock if the element is missing."
 
 	"This is inefficient and could be optimized."
 	| removed |
-	removed := Array streamContents: [ :stream |
+	removed := Array new: 2 streamContents: [ :stream |
 		| index |
 		[ (index := self findIndexFor: aKey) = 0 ] whileFalse: [
 			stream nextPut: (self removeIndex: index) ] ].

repository/Grease-Core.package/GROrderedMultiMap.class/methodProperties.json

@@ -3,7 +3,10 @@
 		 },
 	"instance" : {
 		"add:" : "lr 7/25/2011 19:52",
-		"allAt:" : "jf 2/15/2010 15:39",
+		"addAll:" : "pmm 8/25/2016 12:32",
+		"allAt:" : "pmm 8/25/2016 15:09",
 		"allAt:ifAbsent:" : "jf 2/15/2010 15:39",
 		"at:add:" : "jf 2/15/2010 13:24",
-		"removeKey:ifAbsent:" : "jf 2/15/2010 14:43" } }
+		"keysAndAllValuesDo:" : "pmm 8/25/2016 15:12",
+		"privateAllAt:startingAt:" : "pmm 8/25/2016 15:08",
+		"removeKey:ifAbsent:" : "pmm 8/22/2016 12:10" } }

repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st

@@ -13,4 +13,8 @@ resolveWith: aDictionary
 							aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo40-') ifAbsent: [
 								"try -Pharo50-"
 								aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo50-') ifAbsent: [
-									self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ]
+									"try -Squeak-"
+									aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak-') ifAbsent: [
+										"try -Squeak5-"
+										aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak5-') ifAbsent: [
+											self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ] ] ]