Move Pharo-specific ZnRingBuffer code to Pharo-specific package and s…

…plit-off tests in a separate package
SeasideSt · Dec 17, 2023 · e9c28c2 · e9c28c2
1 parent b38d7a2
commit e9c28c2
Show file tree

Hide file tree

Showing 27 changed files with 41 additions and 305 deletions.
diff --git a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselineadaptors..st b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselineadaptors..st
@@ -38,14 +38,18 @@ baselineadaptors: spec
 
 	spec
 		for: #pharo
-		do: [ spec
+		do: [
+			spec
 				package: 'Seaside-Adaptors-Comanche' with: [ spec requires: #('KomHttpServerLight' 'Seaside-Core') ];
 				package: 'KomHttpServerLight' with: [ spec repository: 'http://www.smalltalkhub.com/mc/Seaside/KomHttpServer/main' ];
 				package: 'Seaside-Tests-Adaptors-Comanche' with: [ spec requires: #('Seaside-Adaptors-Comanche') ];
-				package: 'Zinc-Seaside' with: [ spec requires: #('Seaside-Core') ].
+				package: 'Zinc-Seaside-Core' with: [ spec requires: #('Seaside-Core') ];
+				package: 'Zinc-Seaside-Pharo' with: [ spec requires: #('Zinc-Seaside-Core') ];
+				package: 'Zinc-Seaside-Tests' with: [ spec requires: #('Zinc-Seaside-Pharo') ].
 			spec
 				group: 'Kom' with: #('Seaside-Adaptors-Comanche');
-				group: 'Zinc' with: #('Zinc-Seaside');
+				group: 'Zinc' with: #('Zinc-Seaside-Pharo');
+				group: 'Tests' with: #('Zinc-Seaside-Tests');
 				group: 'default' with: #('Zinc');
 				group: 'CI' with: #('Zinc') ].
 
@@ -70,16 +74,17 @@ baselineadaptors: spec
 			spec
 				package: 'Seaside-GemStone-GemServer-Core' with: [ spec requires: #('GsApplicationTools' 'Seaside-Core') ];
 				package: 'Seaside-GemStone-GemServer-Tests' with: [ spec requires: #('Seaside-GemStone-GemServer-Core' 'Seaside-GemStone-Development' 'Seaside-GemStone-Adaptors-Zinc' 'Seaside-Adaptors-FastCGI') ];
-				package: 'Zinc-Seaside'
+				package: 'Zinc-Seaside-Core'
 					with: [ spec
 						requires: #('Zinc Project' 'Seaside-Core');
 						includes: #('Seaside-GemStone-Adaptors-Zinc') ];
 				package: 'Seaside-Adaptors-FastCGI' with: [ spec requires: #('Seaside-Core' 'FastCGI Project' 'Seaside-GemStone-GemServer-Core') ];
-				package: 'Seaside-GemStone-Adaptors-Zinc' with: [ spec requires: #('Zinc-Seaside' 'Seaside-GemStone-GemServer-Core') ].
+				package: 'Seaside-GemStone-Adaptors-Zinc' with: [ spec requires: #('Zinc-Seaside' 'Seaside-GemStone-GemServer-Core') ];
+				package: 'Zinc-Seaside-Tests' with: [ spec requires: #('Zinc-Seaside-Core') ].
 			spec
 				group: 'FastCGI' with: #('Seaside-Adaptors-FastCGI');
-				group: 'Tests' with: #('Seaside-GemStone-GemServer-Tests');
-				group: 'Zinc' with: #('Zinc-Seaside') ].
+				group: 'Tests' with: #('Seaside-GemStone-GemServer-Tests' 'Zinc-Seaside-Tests');
+				group: 'Zinc' with: #('Zinc-Seaside-Core') ].
 
 	spec
 		for:  #(#'gs3.0.x' #'gs3.1.x' #'gs3.2.x' #'gs3.3.x' #'gs3.4.x' #'gs3.5.x' )

diff --git a/repository/Zinc-Seaside-Pharo.package/ZnPharoRingBuffer.class/README.md b/repository/Zinc-Seaside-Pharo.package/ZnPharoRingBuffer.class/README.md
@@ -0,0 +1 @@
+I am the optimized implementation of a ring buffer on Pharo
diff --git a/repository/Zinc-Seaside-Pharo.package/ZnPharoRingBuffer.class/instance/at..st b/repository/Zinc-Seaside-Pharo.package/ZnPharoRingBuffer.class/instance/at..st
@@ -0,0 +1,5 @@
+accessing
+at: anInteger
+	self checkBoundsFor: anInteger.
+
+	^ buffer atWrap: anInteger + offset
diff --git a/repository/Zinc-Seaside-Pharo.package/ZnPharoRingBuffer.class/instance/at.put..st b/repository/Zinc-Seaside-Pharo.package/ZnPharoRingBuffer.class/instance/at.put..st
@@ -0,0 +1,7 @@
+accessing
+at: anInteger put: anObject
+	self checkBoundsFor: anInteger.
+
+	buffer
+		atWrap: anInteger + offset
+		put: anObject
diff --git a/repository/Zinc-Seaside-Pharo.package/ZnPharoRingBuffer.class/properties.json b/repository/Zinc-Seaside-Pharo.package/ZnPharoRingBuffer.class/properties.json
@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "JohanBrichau 12/17/2023 23:19",
+	"super" : "ZnRingBuffer",
+	"category" : "Zinc-Seaside-Pharo",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "ZnPharoRingBuffer",
+	"type" : "normal"
+}
diff --git a/repository/Zinc-Seaside-Pharo.package/monticello.meta/categories.st b/repository/Zinc-Seaside-Pharo.package/monticello.meta/categories.st
@@ -1,3 +1 @@
 SystemOrganization addCategory: #'Zinc-Seaside-Pharo'!
-SystemOrganization addCategory: #'Zinc-Seaside-Pharo-Core'!
-SystemOrganization addCategory: #'Zinc-Seaside-Pharo-Tests'!
diff --git a/repository/Zinc-Seaside.package/ZnRingBuffer.class/instance/at..st b/repository/Zinc-Seaside.package/ZnRingBuffer.class/instance/at..st
@@ -1,5 +1,5 @@
 accessing
 at: anInteger
 	self checkBoundsFor: anInteger.
-	
-	^ buffer atWrap: anInteger + offset
+
+	^ buffer atWrap: (anInteger + offset) \\ buffer size
diff --git a/repository/Zinc-Seaside.package/ZnRingBuffer.class/instance/at.put..st b/repository/Zinc-Seaside.package/ZnRingBuffer.class/instance/at.put..st
@@ -3,5 +3,5 @@ at: anInteger put: anObject
 	self checkBoundsFor: anInteger.
 
 	buffer
-		atWrap: anInteger + offset
+		atWrap: (anInteger + offset) \\ buffer size
 		put: anObject
diff --git a/repository/Zinc-Seaside.package/ZnRingBufferTest.class/README.md b/repository/Zinc-Seaside.package/ZnRingBufferTest.class/README.md
diff --git a/repository/Zinc-Seaside.package/ZnRingBufferTest.class/instance/testAt.st b/repository/Zinc-Seaside.package/ZnRingBufferTest.class/instance/testAt.st
diff --git a/repository/Zinc-Seaside.package/ZnRingBufferTest.class/instance/testAtOutOfBounds.st b/repository/Zinc-Seaside.package/ZnRingBufferTest.class/instance/testAtOutOfBounds.st
diff --git a/repository/Zinc-Seaside.package/ZnRingBufferTest.class/instance/testCopyFromTo.st b/repository/Zinc-Seaside.package/ZnRingBufferTest.class/instance/testCopyFromTo.st
diff --git a/repository/Zinc-Seaside.package/ZnRingBufferTest.class/instance/testDo.st b/repository/Zinc-Seaside.package/ZnRingBufferTest.class/instance/testDo.st
diff --git a/repository/Zinc-Seaside.package/ZnRingBufferTest.class/instance/testEquals.st b/repository/Zinc-Seaside.package/ZnRingBufferTest.class/instance/testEquals.st
diff --git a/repository/Zinc-Seaside.package/ZnRingBufferTest.class/instance/testIllegalInstantiation.st b/repository/Zinc-Seaside.package/ZnRingBufferTest.class/instance/testIllegalInstantiation.st
diff --git a/repository/Zinc-Seaside.package/ZnRingBufferTest.class/instance/testIndexOf.st b/repository/Zinc-Seaside.package/ZnRingBufferTest.class/instance/testIndexOf.st
diff --git a/repository/Zinc-Seaside.package/ZnRingBufferTest.class/instance/testIndexOfIfAbsent.st b/repository/Zinc-Seaside.package/ZnRingBufferTest.class/instance/testIndexOfIfAbsent.st
diff --git a/...ory/Zinc-Seaside.package/ZnRingBufferTest.class/instance/testIndexOfIfAbsentWhenAbsent.st b/...ory/Zinc-Seaside.package/ZnRingBufferTest.class/instance/testIndexOfIfAbsentWhenAbsent.st
diff --git a/repository/Zinc-Seaside.package/ZnRingBufferTest.class/instance/testMoveStartTo.st b/repository/Zinc-Seaside.package/ZnRingBufferTest.class/instance/testMoveStartTo.st
diff --git a/repository/Zinc-Seaside.package/ZnRingBufferTest.class/instance/testMoveStartToIdentity.st b/repository/Zinc-Seaside.package/ZnRingBufferTest.class/instance/testMoveStartToIdentity.st
diff --git a/...sitory/Zinc-Seaside.package/ZnRingBufferTest.class/instance/testMoveStartToOutOfBounds.st b/...sitory/Zinc-Seaside.package/ZnRingBufferTest.class/instance/testMoveStartToOutOfBounds.st
diff --git a/repository/Zinc-Seaside.package/ZnRingBufferTest.class/instance/testOn.st b/repository/Zinc-Seaside.package/ZnRingBufferTest.class/instance/testOn.st
diff --git a/...y/Zinc-Seaside.package/ZnRingBufferTest.class/instance/testReplaceFromToWithStartingAt.st b/...y/Zinc-Seaside.package/ZnRingBufferTest.class/instance/testReplaceFromToWithStartingAt.st