Synch 2016-08-26

Author: marschall

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-adding
+accessing
 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

@@ -2,9 +2,9 @@ enumerating
 keysAndAllValuesDo: aTwoArgumentBlock
 	| seenKeys |
 	seenKeys := GRSmallOrderedSet new.
-	1 to: size * 2 - 1 by: 2 do: [ :index |
+	1 to: size do: [ :index |
 		| key |
-		key := table at: index.
+		key := keys at: index.
 		(seenKeys includes: key) ifFalse: [
 			aTwoArgumentBlock
 				value: key

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

@@ -1,6 +1,6 @@
-private 
-privateAllAt: aKey startingAt: index
+private
+privateAllAt: aKey startingAt: aStartInteger
 	^ 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) ] ] ]
+		aStartInteger to: size do: [ :index |
+			(keys at: index) = aKey
+				ifTrue: [ stream nextPut: (values at: index) ] ] ]

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

@@ -1,4 +1,4 @@
-removing
+accessing
 removeKey: aKey ifAbsent: aBlock
 	"Remove aKey from the receiver, evaluate aBlock if the element is missing."
 

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

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

repository/Grease-Core.package/GROrderedMultiMap2.class/README.md

@@ -0,0 +1 @@
+I am an implementation of an ordered multi-map. I allow multiple values to be associated with the same key and maintain the order of addition. #at: and its derivatives all operate on the first matching key, while #allAt: returns the complete list of values for a key in the order they were added.

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

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