Merge pull request #10 from GsDevKit/gemstone_dev

Issue #6 merge: v0.9.4
GsDevKit · Jun 30, 2015 · 25aace1 · 25aace1
2 parents 35ceae6 + 12f7eae
commit 25aace1
Show file tree

Hide file tree

Showing 260 changed files with 1,425 additions and 183 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,6 @@
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
+*.un~
+Session.vim
+.netrwhist
+*~
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,13 @@
 language: erlang
 
 env:
-   - ST=GemStone-2.4.4.1
+   - ST=Pharo-2.0
+   - ST=Pharo-3.0
+   - ST=Pharo-4.0
+   - ST=GemStone-2.4.5.3
    - ST=GemStone-2.4.6
    - ST=GemStone-3.1.0.6
-   - ST=GemStone-3.2.3
+   - ST=GemStone-3.2.6
 
 install:
    - export PROJECT_HOME="$(pwd)"

diff --git a/repository/BaselineOfSton.package/BaselineOfSton.class/instance/baseline..st b/repository/BaselineOfSton.package/BaselineOfSton.class/instance/baseline..st
@@ -4,19 +4,33 @@ baseline: spec
   spec
     for: #'common'
     do: [ 
-      spec
-        baseline: 'GLASS1'
-          with: [ 
-              spec
-                loads: #('GsSqueakCommon');
-                repository: 'github://glassdb/glass:master/repository' ];
-        yourself.
       spec
         package: 'STON-Core';
+        package: 'STON-UTF8-Core' with: [ spec requires: 'STON-Core' ];
         package: 'STON-Tests' with: [ spec requires: 'STON-Core' ];
+        package: 'STON-UTF8-Tests' with: [ spec requires: 'STON-UTF8-Core' ];
         yourself.
       spec
-        group: 'default' with: #('Core');
+        group: 'default' with: #('Core' 'UTF8');
         group: 'Core' with: #('STON-Core');
-        group: 'Tests' with: #('STON-Tests');
+        group: 'UTF8' with: #('STON-UTF8-Core');
+        group: 'Tests' with: #('STON-Tests' 'STON-UTF8-Tests');
+        yourself ].
+  spec
+    for: #'pharo'
+    do: [ 
+      spec
+        package: 'STON-Core' with: [ spec includes: #('STON-Pharo-Core') ];
+        package: 'STON-Pharo-Core' with: [ spec requires: #('STON-Core') ];
+        package: 'STON-Tests' with: [ spec includes: #('STON-Pharo-Tests') ];
+        package: 'STON-Pharo-Tests' with: [ spec requires: #('STON-Tests') ];
+        yourself ].
+  spec
+    for: #'gemstone'
+    do: [ 
+      spec
+        package: 'STON-Core' with: [ spec includes: #('STON-GemStone-Core') ];
+        package: 'STON-GemStone-Core' with: [ spec requires: #('STON-Core') ];
+        package: 'STON-Tests' with: [ spec includes: #('STON-GemStone-Tests') ];
+        package: 'STON-GemStone-Tests' with: [ spec requires: #('STON-Tests') ];
         yourself ]
diff --git a/repository/BaselineOfSton.package/BaselineOfSton.class/methodProperties.json b/repository/BaselineOfSton.package/BaselineOfSton.class/methodProperties.json
@@ -2,4 +2,4 @@
 	"class" : {
 		 },
 	"instance" : {
-		"baseline:" : "dkh 11/21/2014 21:27" } }
+		"baseline:" : "dkh 06/26/2015 15:33" } }
diff --git a/repository/BaselineOfSton.package/monticello.meta/version b/repository/BaselineOfSton.package/monticello.meta/version
@@ -1 +1 @@
-(name 'BaselineOfSton-dkh.2' message 'methods moved to GsSqueakCommon tweak baseline' id '95ee1850-6f04-40d6-9ad6-b545b564683b' date '11/21/2014' time '21:40:37' author 'dkh' ancestors ((name 'BaselineOfSton-dkh.1' message 'first baseline' id '40015af9-4ad1-4c0b-912e-be0d1dc962a9' date '06/16/2012' time '09:54:51' author 'dkh' ancestors () stepChildren ())) stepChildren ())
+(name 'BaselineOfSton-dkh.5' message 'Issue #6: split out platform-specific tests' id 'f34bbba6-3233-4a51-88a4-0061a5e59e5f' date '06/26/2015' time '15:37:35' author 'dkh' ancestors ((name 'BaselineOfSton-dkh.4' message 'Issue #6: split out platform-specific methods for pharo and gemstone' id '4d2e16bf-07c3-4fb6-82d9-6a8dd3e2b460' date '06/26/2015' time '14:57:31' author 'dkh' ancestors ((name 'BaselineOfSton-dkh.3' message 'Issue #6: laying the groundwork for supporting the 4 STON serialization options:  - classic (utf8 challenged)  - utf8-friendly  - GemStone/tODE v0.5.1  - GemStone/tODE v0.9.*Consolidating the Pharo/GemStone packages in the gemstone branch.' id '7b50b553-a9f2-4f17-9bd9-b301607341f7' date '06/26/2015' time '14:19:20' author 'dkh' ancestors ((name 'BaselineOfSton-dkh.2' message 'methods moved to GsSqueakCommon tweak baseline' id '95ee1850-6f04-40d6-9ad6-b545b564683b' date '11/21/2014' time '21:40:37' author 'dkh' ancestors ((name 'BaselineOfSton-dkh.1' message 'first baseline' id '40015af9-4ad1-4c0b-912e-be0d1dc962a9' date '06/16/2012' time '09:54:51' author 'dkh' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())

diff --git a/...sitory/STON-Core.package/CharacterCollection.extension/instance/stonProcessSubObjects..st b/...sitory/STON-Core.package/CharacterCollection.extension/instance/stonProcessSubObjects..st
diff --git a/repository/STON-Core.package/CharacterCollection.extension/methodProperties.json b/repository/STON-Core.package/CharacterCollection.extension/methodProperties.json
diff --git a/repository/STON-Core.package/Date.extension/methodProperties.json b/repository/STON-Core.package/Date.extension/methodProperties.json
@@ -1,6 +1,6 @@
 {
 	"class" : {
-		"fromSton:" : "SvenVanCaekenberghe 2/12/2012 15:17" },
+		 },
 	"instance" : {
 		"stonContainSubObjects" : "SvenVanCaekenberghe 11/29/2012 16:26",
 		"stonOn:" : "SvenVanCaekenberghe 2/12/2012 20:03" } }
diff --git a/repository/STON-Core.package/DateAndTime.extension/methodProperties.json b/repository/STON-Core.package/DateAndTime.extension/methodProperties.json
@@ -2,5 +2,4 @@
 	"class" : {
 		"fromSton:" : "SvenVanCaekenberghe 2/12/2012 19:50" },
 	"instance" : {
-		"stonContainSubObjects" : "SvenVanCaekenberghe 11/29/2012 16:25",
-		"stonOn:" : "SvenVanCaekenberghe 2/12/2012 20:03" } }
+		"stonContainSubObjects" : "SvenVanCaekenberghe 11/29/2012 16:25" } }
diff --git a/repository/STON-Core.package/DoubleByteString.extension/instance/decodeFromUTF8.st b/repository/STON-Core.package/DoubleByteString.extension/instance/decodeFromUTF8.st
diff --git a/repository/STON-Core.package/DoubleByteString.extension/methodProperties.json b/repository/STON-Core.package/DoubleByteString.extension/methodProperties.json
diff --git a/repository/STON-Core.package/DoubleByteString.extension/properties.json b/repository/STON-Core.package/DoubleByteString.extension/properties.json
diff --git a/repository/STON-Core.package/Object.extension/methodProperties.json b/repository/STON-Core.package/Object.extension/methodProperties.json
@@ -6,5 +6,4 @@
 		"isStonReference" : "SvenVanCaekenberghe 1/18/2012 20:16",
 		"stonContainSubObjects" : "SvenVanCaekenberghe 11/29/2012 16:24",
 		"stonOn:" : "SvenVanCaekenberghe 11/28/2012 14:27",
-		"stonProcessSubObjects:" : "SvenVanCaekenberghe 11/29/2012 16:22",
 		"stonShouldWriteNilInstVars" : "SvenVanCaekenberghe 11/13/2013 23:43" } }
diff --git a/repository/STON-Core.package/STON.class/class/fromStream..st b/repository/STON-Core.package/STON.class/class/fromStream..st
@@ -1,3 +1,3 @@
-convencience
+convenience
 fromStream: readStream
 	^ (self reader on: readStream) next
diff --git a/repository/STON-Core.package/STON.class/class/fromString..st b/repository/STON-Core.package/STON.class/class/fromString..st
@@ -1,3 +1,3 @@
-convencience
+convenience
 fromString: string
-	^ self fromStream: string readStream
+  ^ self fromStream: string readStream
diff --git a/repository/STON-Core.package/STON.class/class/put.asJsonOnStream..st b/repository/STON-Core.package/STON.class/class/put.asJsonOnStream..st
@@ -1,3 +1,3 @@
-convencience
+convenience
 put: object asJsonOnStream: stream
 	(self jsonWriter on: stream) nextPut: object
diff --git a/repository/STON-Core.package/STON.class/class/put.asJsonOnStreamPretty..st b/repository/STON-Core.package/STON.class/class/put.asJsonOnStreamPretty..st
@@ -1,4 +1,4 @@
-convencience
+convenience
 put: object asJsonOnStreamPretty: stream
 	(self jsonWriter on: stream)
 		prettyPrint: true; 

diff --git a/repository/STON-Core.package/STON.class/class/put.onStream..st b/repository/STON-Core.package/STON.class/class/put.onStream..st
@@ -1,3 +1,3 @@
-convencience
+convenience
 put: object onStream: stream
 	(self writer on: stream) nextPut: object
diff --git a/repository/STON-Core.package/STON.class/class/put.onStreamPretty..st b/repository/STON-Core.package/STON.class/class/put.onStreamPretty..st
@@ -1,4 +1,4 @@
-convencience
+convenience
 put: object onStreamPretty: stream
 	(self writer on: stream)
 		prettyPrint: true; 

diff --git a/repository/STON-Core.package/STON.class/class/toJsonString..st b/repository/STON-Core.package/STON.class/class/toJsonString..st
@@ -1,4 +1,3 @@
-convencience
+convenience
 toJsonString: object
-	^ String streamContents: [ :stream |
-		self put: object asJsonOnStream: stream ]
+  ^ String streamContents: [ :stream | self put: object asJsonOnStream: stream ]
diff --git a/repository/STON-Core.package/STON.class/class/toJsonStringPretty..st b/repository/STON-Core.package/STON.class/class/toJsonStringPretty..st
@@ -1,4 +1,4 @@
-convencience
+convenience
 toJsonStringPretty: object
-	^ String streamContents: [ :stream |
-		self put: object asJsonOnStreamPretty: stream ]
+  ^ String
+    streamContents: [ :stream | self put: object asJsonOnStreamPretty: stream ]
diff --git a/repository/STON-Core.package/STON.class/class/toString..st b/repository/STON-Core.package/STON.class/class/toString..st
@@ -1,4 +1,3 @@
-convencience
+convenience
 toString: object
-	^ String streamContents: [ :stream |
-		self put: object onStream: stream ]
+  ^ String streamContents: [ :stream | self put: object onStream: stream ]
diff --git a/repository/STON-Core.package/STON.class/class/toStringPretty..st b/repository/STON-Core.package/STON.class/class/toStringPretty..st
@@ -1,4 +1,3 @@
-convencience
+convenience
 toStringPretty: object
-	^ String streamContents: [ :stream |
-		self put: object onStreamPretty: stream ]
+  ^ String streamContents: [ :stream | self put: object onStreamPretty: stream ]
diff --git a/repository/STON-Core.package/STON.class/methodProperties.json b/repository/STON-Core.package/STON.class/methodProperties.json
@@ -1,7 +1,7 @@
 {
 	"class" : {
 		"fromStream:" : "SvenVanCaekenberghe 1/24/2012 09:39",
-		"fromString:" : "SvenVanCaekenberghe 1/24/2012 09:40",
+		"fromString:" : "dkh 06/22/2015 14:51",
 		"jsonWriter" : "SvenVanCaekenberghe 5/15/2012 09:32",
 		"listClass" : "SvenVanCaekenberghe 1/24/2012 09:36",
 		"mapClass" : "SvenVanCaekenberghe 1/24/2012 09:36",
@@ -10,10 +10,10 @@
 		"put:onStream:" : "SvenVanCaekenberghe 1/24/2012 09:49",
 		"put:onStreamPretty:" : "SvenVanCaekenberghe 2/12/2012 19:30",
 		"reader" : "SvenVanCaekenberghe 1/24/2012 09:37",
-		"toJsonString:" : "SvenVanCaekenberghe 5/30/2012 22:07",
-		"toJsonStringPretty:" : "SvenVanCaekenberghe 5/30/2012 22:07",
-		"toString:" : "SvenVanCaekenberghe 1/24/2012 09:49",
-		"toStringPretty:" : "SvenVanCaekenberghe 2/12/2012 19:30",
+		"toJsonString:" : "dkh 06/22/2015 14:48",
+		"toJsonStringPretty:" : "dkh 06/22/2015 14:48",
+		"toString:" : "dkh 06/22/2015 14:51",
+		"toStringPretty:" : "dkh 06/22/2015 14:51",
 		"writer" : "SvenVanCaekenberghe 1/24/2012 09:37" },
 	"instance" : {
 		 } }
diff --git a/repository/STON-Core.package/STONReader.class/instance/parseCharacter.st b/repository/STON-Core.package/STONReader.class/instance/parseCharacter.st
@@ -1,20 +1,20 @@
 parsing-internal
 parseCharacter
-	| char |
-	(char := readStream next) = $\ 
-		ifFalse: [ ^ char ].
-	(#( $' $" $/ $\) includes: (char := readStream next))
-		ifTrue: [ ^ char ].
-	char = $b
-		ifTrue: [ ^ Character backspace ].
-	char = $f
-		ifTrue: [ ^ Character newPage ].
-	char = $n
-		ifTrue: [ ^ Character lf ].
-	char = $r
-		ifTrue: [ ^ Character cr ].
-	char = $t
-		ifTrue: [ ^ Character tab ].
-	char = $u
-		ifTrue: [ ^ self parseCharacterHex ].
-	self error: 'invalid escape character \' , (String with: char)
+  | char |
+  (char := readStream next) = $\
+    ifFalse: [ ^ char ].
+  (#($' $" $/ $\) includes: (char := readStream next))
+    ifTrue: [ ^ char ].
+  char = $b
+    ifTrue: [ ^ Character backspace ].
+  char = $f
+    ifTrue: [ ^ Character newPage ].
+  char = $n
+    ifTrue: [ ^ Character lf ].
+  char = $r
+    ifTrue: [ ^ Character cr ].
+  char = $t
+    ifTrue: [ ^ Character tab ].
+  char = $u
+    ifTrue: [ ^ self parseCharacterHex ].
+  self error: 'invalid escape character \' , (String with: char)
diff --git a/repository/STON-Core.package/STONReader.class/instance/parseCharacterHex.st b/repository/STON-Core.package/STONReader.class/instance/parseCharacterHex.st
@@ -1,7 +1,6 @@
 parsing-internal
 parseCharacterHex
-	| value |
-	value := self parseCharacterHexDigit.
-	3 timesRepeat: [ 
-		value := (value << 4) + self parseCharacterHexDigit ].
-	^ Character codePoint: value
+  | value |
+  value := self parseCharacterHexDigit.
+  3 timesRepeat: [ value := (value << 4) + self parseCharacterHexDigit ].
+  ^ Character codePoint: value
diff --git a/repository/STON-Core.package/STONReader.class/instance/parseStringInternal.st b/repository/STON-Core.package/STONReader.class/instance/parseStringInternal.st
@@ -5,6 +5,8 @@ parseStringInternal
   (delimiter = $' or: [ delimiter = $" ])
     ifFalse: [ self error: ''' or " expected' ].
   result := self
-    stringStreamContents: [ :stream | [ readStream atEnd or: [ readStream peek = delimiter ] ] whileFalse: [ stream nextPut: self parseCharacter ] ].
+    stringStreamContents: [ :stream | 
+      [ readStream atEnd or: [ readStream peek = delimiter ] ]
+        whileFalse: [ stream nextPut: self parseCharacter ] ].
   self expectChar: delimiter.
-  ^ result decodeFromUTF8
+  ^ result
diff --git a/repository/STON-Core.package/STONReader.class/methodProperties.json b/repository/STON-Core.package/STONReader.class/methodProperties.json
@@ -19,8 +19,8 @@
 		"next" : "SvenVanCaekenberghe 4/27/2012 16:48",
 		"on:" : "SvenVanCaekenberghe 1/14/2012 20:26",
 		"optimizeForLargeStructures" : "SvenVanCaekenberghe 11/29/2012 15:54",
-		"parseCharacter" : "SvenVanCaekenberghe 1/15/2012 21:38",
-		"parseCharacterHex" : "SvenVanCaekenberghe 5/29/2012 21:12",
+		"parseCharacter" : "dkh 06/22/2015 16:19",
+		"parseCharacterHex" : "dkh 06/22/2015 16:35",
 		"parseCharacterHexDigit" : "SvenVanCaekenberghe 1/15/2012 11:28",
 		"parseClass" : "SvenVanCaekenberghe 5/29/2012 21:13",
 		"parseConstantDo:" : "SvenVanCaekenberghe 5/7/2012 13:16",
@@ -36,7 +36,7 @@
 		"parseObject" : "SvenVanCaekenberghe 2/12/2012 13:45",
 		"parseReference" : "SvenVanCaekenberghe 11/29/2012 08:52",
 		"parseString" : "SvenVanCaekenberghe 2/29/2012 21:50",
-		"parseStringInternal" : "SvenVanCaekenberghe 5/29/2012 21:12",
+		"parseStringInternal" : "dkh 06/29/2015 11:39",
 		"parseSymbol" : "SvenVanCaekenberghe 5/7/2012 10:42",
 		"parseValue" : "SvenVanCaekenberghe 5/7/2012 13:16",
 		"processSubObjectsOf:" : "SvenVanCaekenberghe 11/29/2012 16:29",

diff --git a/repository/STON-Core.package/STONWriter.class/instance/encodeString..st b/repository/STON-Core.package/STONWriter.class/instance/encodeString..st
@@ -1,7 +1,7 @@
 private
 encodeString: string
   | encodedString |
-  encodedString := string encodeAsUTF8 asString.
+  encodedString := string.
   writeStream
     nextPut:
       (jsonMode

diff --git a/repository/STON-Core.package/STONWriter.class/methodProperties.json b/repository/STON-Core.package/STONWriter.class/methodProperties.json
@@ -7,11 +7,10 @@
 		"on:" : "SvenVanCaekenberghe 1/14/2012 15:48" },
 	"instance" : {
 		"close" : "SvenVanCaekenberghe 1/14/2012 15:37",
-		"encodeCharacter:" : "SvenVanCaekenberghe 4/29/2012 12:23:33",
 		"encodeKey:value:" : "SvenVanCaekenberghe 1/23/2012 11:32",
 		"encodeList:" : "SvenVanCaekenberghe 5/5/2012 16:56",
 		"encodeMap:" : "SvenVanCaekenberghe 5/5/2012 16:56",
-		"encodeString:" : "SvenVanCaekenberghe 4/27/2012 13:49",
+		"encodeString:" : "dkh 06/29/2015 11:40",
 		"indentedDo:" : "SvenVanCaekenberghe 1/23/2012 11:12",
 		"initialize" : "SvenVanCaekenberghe 3/7/2013 10:38",
 		"isSimpleSymbol:" : "SvenVanCaekenberghe 4/15/2014 13:35",
@@ -30,7 +29,6 @@
 		"shortListElementSeparator" : "SvenVanCaekenberghe 4/29/2012 12:23:33",
 		"with:do:" : "SvenVanCaekenberghe 4/26/2012 17:18",
 		"writeBoolean:" : "SvenVanCaekenberghe 1/14/2012 15:51",
-		"writeFloat:" : "SvenVanCaekenberghe 1/14/2012 16:05",
 		"writeInteger:" : "SvenVanCaekenberghe 1/14/2012 15:48",
 		"writeList:" : "SvenVanCaekenberghe 1/24/2012 10:00",
 		"writeMap:" : "SvenVanCaekenberghe 1/24/2012 10:01",
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		(name 'BaselineOfSton-dkh.2' message 'methods moved to GsSqueakCommon tweak baseline' id '95ee1850-6f04-40d6-9ad6-b545b564683b' date '11/21/2014' time '21:40:37' author 'dkh' ancestors ((name 'BaselineOfSton-dkh.1' message 'first baseline' id '40015af9-4ad1-4c0b-912e-be0d1dc962a9' date '06/16/2012' time '09:54:51' author 'dkh' ancestors () stepChildren ())) stepChildren ())
		(name 'BaselineOfSton-dkh.5' message 'Issue #6: split out platform-specific tests' id 'f34bbba6-3233-4a51-88a4-0061a5e59e5f' date '06/26/2015' time '15:37:35' author 'dkh' ancestors ((name 'BaselineOfSton-dkh.4' message 'Issue #6: split out platform-specific methods for pharo and gemstone' id '4d2e16bf-07c3-4fb6-82d9-6a8dd3e2b460' date '06/26/2015' time '14:57:31' author 'dkh' ancestors ((name 'BaselineOfSton-dkh.3' message 'Issue #6: laying the groundwork for supporting the 4 STON serialization options: - classic (utf8 challenged) - utf8-friendly - GemStone/tODE v0.5.1 - GemStone/tODE v0.9.*Consolidating the Pharo/GemStone packages in the gemstone branch.' id '7b50b553-a9f2-4f17-9bd9-b301607341f7' date '06/26/2015' time '14:19:20' author 'dkh' ancestors ((name 'BaselineOfSton-dkh.2' message 'methods moved to GsSqueakCommon tweak baseline' id '95ee1850-6f04-40d6-9ad6-b545b564683b' date '11/21/2014' time '21:40:37' author 'dkh' ancestors ((name 'BaselineOfSton-dkh.1' message 'first baseline' id '40015af9-4ad1-4c0b-912e-be0d1dc962a9' date '06/16/2012' time '09:54:51' author 'dkh' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
Expand Down