From 1434157290b6963eb0c27f53cb47a077f6ab67a4 Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Wed, 7 Oct 2020 12:17:59 -0700 Subject: [PATCH 1/5] update for new package Grease-GemStone360-Core --- repository/BaselineOfGrease.package/.filetree | 5 +-- .../instance/baselineGemStone..st | 13 ++++++- .../instance/projectClass.st | 2 +- .../BaselineOfGrease.class/properties.json | 19 ++++++---- .../monticello.meta/categories.st | 2 +- .../BaselineOfGrease.package/properties.json | 3 +- .../Grease-GemStone360-Core.package/.filetree | 4 ++ .../instance/greaseString.st | 4 ++ .../Exception.extension/properties.json | 2 + .../instance/argumentCount.st | 4 ++ .../instance/ifCurtailed..st | 11 ++++++ .../instance/valueWithPossibleArguments..st | 9 +++++ .../ExecBlock.extension/properties.json | 2 + .../instance/gemstoneExceptionSelector.st | 4 ++ .../instance/generateHardBreak.st | 5 +++ .../handlesAlmostOutOfStackException..st | 4 ++ .../instance/handlesBreakpointException..st | 4 ++ .../instance/handlesHaltException..st | 4 ++ .../properties.json | 2 + .../GRUtf8CodecStream.class/README.md | 0 .../class/initialize.st | 12 ++++++ .../GRUtf8CodecStream.class/instance/crlf.st | 9 +++++ .../instance/invalidUtf8.st | 3 ++ .../GRUtf8CodecStream.class/instance/next..st | 37 +++++++++++++++++++ .../instance/nextPut..st | 17 +++++++++ .../instance/nextPutAll..st | 5 +++ .../GRUtf8CodecStream.class/properties.json | 14 +++++++ .../monticello.meta/categories.st | 1 + .../monticello.meta/initializers.st | 0 .../monticello.meta/package | 1 + .../properties.json | 2 + 31 files changed, 189 insertions(+), 15 deletions(-) create mode 100644 repository/Grease-GemStone360-Core.package/.filetree create mode 100644 repository/Grease-GemStone360-Core.package/Exception.extension/instance/greaseString.st create mode 100644 repository/Grease-GemStone360-Core.package/Exception.extension/properties.json create mode 100644 repository/Grease-GemStone360-Core.package/ExecBlock.extension/instance/argumentCount.st create mode 100644 repository/Grease-GemStone360-Core.package/ExecBlock.extension/instance/ifCurtailed..st create mode 100644 repository/Grease-GemStone360-Core.package/ExecBlock.extension/instance/valueWithPossibleArguments..st create mode 100644 repository/Grease-GemStone360-Core.package/ExecBlock.extension/properties.json create mode 100644 repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/gemstoneExceptionSelector.st create mode 100644 repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/generateHardBreak.st create mode 100644 repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/handlesAlmostOutOfStackException..st create mode 100644 repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/handlesBreakpointException..st create mode 100644 repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/handlesHaltException..st create mode 100644 repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/properties.json create mode 100644 repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/README.md create mode 100644 repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/class/initialize.st create mode 100644 repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/crlf.st create mode 100644 repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/invalidUtf8.st create mode 100644 repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/next..st create mode 100644 repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/nextPut..st create mode 100644 repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/nextPutAll..st create mode 100644 repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/properties.json create mode 100644 repository/Grease-GemStone360-Core.package/monticello.meta/categories.st create mode 100644 repository/Grease-GemStone360-Core.package/monticello.meta/initializers.st create mode 100644 repository/Grease-GemStone360-Core.package/monticello.meta/package create mode 100644 repository/Grease-GemStone360-Core.package/properties.json diff --git a/repository/BaselineOfGrease.package/.filetree b/repository/BaselineOfGrease.package/.filetree index 57a67973..8998102c 100644 --- a/repository/BaselineOfGrease.package/.filetree +++ b/repository/BaselineOfGrease.package/.filetree @@ -1,5 +1,4 @@ { - "separateMethodMetaAndSource" : false, "noMethodMetaData" : true, - "useCypressPropertiesFile" : true -} \ No newline at end of file + "separateMethodMetaAndSource" : false, + "useCypressPropertiesFile" : true } diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineGemStone..st b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineGemStone..st index 8e654e74..93fc2717 100644 --- a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineGemStone..st +++ b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineGemStone..st @@ -79,7 +79,7 @@ baselineGemStone: spec requires: #('Grease-GemStone-Core'); postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ]. spec - for: #(#'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x') + for: #(#'gs3.3.x' #'gs3.4.x' #'gs3.5.x') do: [ spec package: 'Grease-GemStone-Core' @@ -89,6 +89,17 @@ baselineGemStone: spec spec requires: #('Grease-GemStone-Core'); postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ]. + spec + for: #(#'gs3.6.x') + do: [ + spec + package: 'Grease-GemStone-Core' + with: [ spec includes: #('Grease-GemStone360-Core') ]; + package: 'Grease-GemStone360-Core' + with: [ + spec + requires: #('Grease-GemStone-Core'); + postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ]. spec for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x') do: [ diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/projectClass.st b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/projectClass.st index 28bd1a55..1d4f6564 100644 --- a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/projectClass.st +++ b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/projectClass.st @@ -1,4 +1,4 @@ accessing projectClass Smalltalk at: #'MetacelloCypressBaselineProject' ifPresent: [ :cl | ^ cl ]. - ^ super projectClass + ^ super projectClass \ No newline at end of file diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/properties.json b/repository/BaselineOfGrease.package/BaselineOfGrease.class/properties.json index 0260395f..8a39c621 100644 --- a/repository/BaselineOfGrease.package/BaselineOfGrease.class/properties.json +++ b/repository/BaselineOfGrease.package/BaselineOfGrease.class/properties.json @@ -1,11 +1,14 @@ { - "commentStamp" : "", - "super" : "BaselineOf", "category" : "BaselineOfGrease", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ ], + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + ], "name" : "BaselineOfGrease", - "type" : "normal" -} \ No newline at end of file + "pools" : [ + ], + "super" : "BaselineOf", + "type" : "normal" } diff --git a/repository/BaselineOfGrease.package/monticello.meta/categories.st b/repository/BaselineOfGrease.package/monticello.meta/categories.st index aad806f8..3687f0b2 100644 --- a/repository/BaselineOfGrease.package/monticello.meta/categories.st +++ b/repository/BaselineOfGrease.package/monticello.meta/categories.st @@ -1 +1 @@ -SystemOrganization addCategory: #BaselineOfGrease! +SystemOrganization addCategory: #'BaselineOfGrease'! diff --git a/repository/BaselineOfGrease.package/properties.json b/repository/BaselineOfGrease.package/properties.json index 6f31cf5a..f037444a 100644 --- a/repository/BaselineOfGrease.package/properties.json +++ b/repository/BaselineOfGrease.package/properties.json @@ -1 +1,2 @@ -{ } \ No newline at end of file +{ + } diff --git a/repository/Grease-GemStone360-Core.package/.filetree b/repository/Grease-GemStone360-Core.package/.filetree new file mode 100644 index 00000000..8998102c --- /dev/null +++ b/repository/Grease-GemStone360-Core.package/.filetree @@ -0,0 +1,4 @@ +{ + "noMethodMetaData" : true, + "separateMethodMetaAndSource" : false, + "useCypressPropertiesFile" : true } diff --git a/repository/Grease-GemStone360-Core.package/Exception.extension/instance/greaseString.st b/repository/Grease-GemStone360-Core.package/Exception.extension/instance/greaseString.st new file mode 100644 index 00000000..ea4bff53 --- /dev/null +++ b/repository/Grease-GemStone360-Core.package/Exception.extension/instance/greaseString.st @@ -0,0 +1,4 @@ +*grease-gemstone330-core +greaseString + + ^self description \ No newline at end of file diff --git a/repository/Grease-GemStone360-Core.package/Exception.extension/properties.json b/repository/Grease-GemStone360-Core.package/Exception.extension/properties.json new file mode 100644 index 00000000..6dcfd842 --- /dev/null +++ b/repository/Grease-GemStone360-Core.package/Exception.extension/properties.json @@ -0,0 +1,2 @@ +{ + "name" : "Exception" } diff --git a/repository/Grease-GemStone360-Core.package/ExecBlock.extension/instance/argumentCount.st b/repository/Grease-GemStone360-Core.package/ExecBlock.extension/instance/argumentCount.st new file mode 100644 index 00000000..9f25fa98 --- /dev/null +++ b/repository/Grease-GemStone360-Core.package/ExecBlock.extension/instance/argumentCount.st @@ -0,0 +1,4 @@ +*grease-gemstone330-core +argumentCount + + ^self numArgs. \ No newline at end of file diff --git a/repository/Grease-GemStone360-Core.package/ExecBlock.extension/instance/ifCurtailed..st b/repository/Grease-GemStone360-Core.package/ExecBlock.extension/instance/ifCurtailed..st new file mode 100644 index 00000000..cc75520a --- /dev/null +++ b/repository/Grease-GemStone360-Core.package/ExecBlock.extension/instance/ifCurtailed..st @@ -0,0 +1,11 @@ +*grease-gemstone330-core +ifCurtailed: aBlock + + | wasCurtailed | + wasCurtailed := true. + [ + self value. + wasCurtailed := false. + ] ensure: [ + wasCurtailed ifTrue: aBlock. + ]. \ No newline at end of file diff --git a/repository/Grease-GemStone360-Core.package/ExecBlock.extension/instance/valueWithPossibleArguments..st b/repository/Grease-GemStone360-Core.package/ExecBlock.extension/instance/valueWithPossibleArguments..st new file mode 100644 index 00000000..5e1d8c5d --- /dev/null +++ b/repository/Grease-GemStone360-Core.package/ExecBlock.extension/instance/valueWithPossibleArguments..st @@ -0,0 +1,9 @@ +*grease-gemstone330-core +valueWithPossibleArguments: anArray + "Evaluate the block represented by the receiver with the arguments provided." + | n args | + (n := self numArgs) == 0 ifTrue: [^self value]. + args := anArray copy + size: n; + yourself. + ^ self valueWithArguments: args. \ No newline at end of file diff --git a/repository/Grease-GemStone360-Core.package/ExecBlock.extension/properties.json b/repository/Grease-GemStone360-Core.package/ExecBlock.extension/properties.json new file mode 100644 index 00000000..d8195e28 --- /dev/null +++ b/repository/Grease-GemStone360-Core.package/ExecBlock.extension/properties.json @@ -0,0 +1,2 @@ +{ + "name" : "ExecBlock" } diff --git a/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/gemstoneExceptionSelector.st b/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/gemstoneExceptionSelector.st new file mode 100644 index 00000000..05cad772 --- /dev/null +++ b/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/gemstoneExceptionSelector.st @@ -0,0 +1,4 @@ +*grease-gemstone330-core +gemstoneExceptionSelector + + ^ (ExceptionSet new) , Halt, AlmostOutOfStack, Breakpoint \ No newline at end of file diff --git a/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/generateHardBreak.st b/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/generateHardBreak.st new file mode 100644 index 00000000..458d1366 --- /dev/null +++ b/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/generateHardBreak.st @@ -0,0 +1,5 @@ +*grease-gemstone330-core +generateHardBreak + "Generate a GemStone hard break" + + ^Break signal: 'interrupted for Seaside debugging' \ No newline at end of file diff --git a/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/handlesAlmostOutOfStackException..st b/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/handlesAlmostOutOfStackException..st new file mode 100644 index 00000000..725be222 --- /dev/null +++ b/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/handlesAlmostOutOfStackException..st @@ -0,0 +1,4 @@ +*grease-gemstone330-core +handlesAlmostOutOfStackException: anException + + ^AlmostOutOfStack handles: anException \ No newline at end of file diff --git a/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/handlesBreakpointException..st b/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/handlesBreakpointException..st new file mode 100644 index 00000000..d82b699a --- /dev/null +++ b/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/handlesBreakpointException..st @@ -0,0 +1,4 @@ +*grease-gemstone330-core +handlesBreakpointException: anException + + ^Breakpoint handles: anException \ No newline at end of file diff --git a/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/handlesHaltException..st b/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/handlesHaltException..st new file mode 100644 index 00000000..45fffeb8 --- /dev/null +++ b/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/handlesHaltException..st @@ -0,0 +1,4 @@ +*grease-gemstone330-core +handlesHaltException: anException + + ^Halt handles: anException \ No newline at end of file diff --git a/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/properties.json b/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/properties.json new file mode 100644 index 00000000..eab5d9b5 --- /dev/null +++ b/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/properties.json @@ -0,0 +1,2 @@ +{ + "name" : "GRGemStonePlatform" } diff --git a/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/README.md b/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/README.md new file mode 100644 index 00000000..e69de29b diff --git a/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/class/initialize.st b/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/class/initialize.st new file mode 100644 index 00000000..fa779537 --- /dev/null +++ b/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/class/initialize.st @@ -0,0 +1,12 @@ +initialization +initialize + "self initialize" + + Latin1ToUtf8Encodings := Array new: 256. + 1 to: 256 do: [ :index | + index > 128 + ifTrue: [ + Latin1ToUtf8Encodings + at: index + put: + (String with: (Character codePoint: index - 1)) encodeAsUTF8 asString ] ] \ No newline at end of file diff --git a/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/crlf.st b/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/crlf.st new file mode 100644 index 00000000..e5bb258a --- /dev/null +++ b/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/crlf.st @@ -0,0 +1,9 @@ +streaming +crlf + binary + ifTrue: [ + stream nextPut: 13. + stream nextPut: 10 ] + ifFalse: [ + stream nextPut: Character cr. + stream nextPut: Character lf ] \ No newline at end of file diff --git a/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/invalidUtf8.st b/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/invalidUtf8.st new file mode 100644 index 00000000..d38b2f3b --- /dev/null +++ b/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/invalidUtf8.st @@ -0,0 +1,3 @@ +private +invalidUtf8 + ^GRInvalidUtf8Error signal: 'Invalid UTF-8 input' \ No newline at end of file diff --git a/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/next..st b/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/next..st new file mode 100644 index 00000000..2f2af983 --- /dev/null +++ b/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/next..st @@ -0,0 +1,37 @@ +streaming +next: anInteger + "Convert the given string from UTF-8 using the fast path if converting to Latin-1" + | outStream byte1 byte2 byte3 byte4 unicode count | + outStream := WriteStream on: (String new: anInteger). + count := 0. + [ count < anInteger and: [ stream atEnd not ] ] whileTrue: [ + byte1 := stream next. + unicode := byte1. + (byte1 bitAnd: 16rE0) = 192 ifTrue: [ "two bytes" + byte2 := stream next. + (byte2 bitAnd: 16rC0) = 16r80 ifFalse: [ self invalidUtf8 ]. + unicode := ((byte1 bitAnd: 31) bitShift: 6) + (byte2 bitAnd: 63)]. + (byte1 bitAnd: 16rF0) = 224 ifTrue: [ "three bytes" + byte2 := stream next. + (byte2 bitAnd: 16rC0) = 16r80 ifFalse: [ self invalidUtf8 ]. + byte3 := stream next. + (byte3 bitAnd: 16rC0) = 16r80 ifFalse: [ self invalidUtf8 ]. + unicode := ((byte1 bitAnd: 15) bitShift: 12) + ((byte2 bitAnd: 63) bitShift: 6) + + (byte3 bitAnd: 63)]. + (byte1 bitAnd: 16rF8) = 240 ifTrue: [ "four bytes" + byte2 := stream next. + (byte2 bitAnd: 16rC0) = 16r80 ifFalse: [ self invalidUtf8 ]. + byte3 := stream next. + (byte3 bitAnd: 16rC0) = 16r80 ifFalse: [ self invalidUtf8 ]. + byte4 := stream next. + (byte4 bitAnd: 16rC0) = 16r80 ifFalse: [ self invalidUtf8 ]. + unicode := ((byte1 bitAnd: 16r7) bitShift: 18) + + ((byte2 bitAnd: 63) bitShift: 12) + + ((byte3 bitAnd: 63) bitShift: 6) + + (byte4 bitAnd: 63)]. + unicode ifNil: [ self invalidUtf8 ]. + unicode = 16rFEFF "ignore BOM" ifFalse: [ + outStream nextPut: (Character codePoint: unicode). + count := count + 1 ]. + unicode := nil ]. + ^outStream contents \ No newline at end of file diff --git a/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/nextPut..st b/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/nextPut..st new file mode 100644 index 00000000..1f98bba7 --- /dev/null +++ b/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/nextPut..st @@ -0,0 +1,17 @@ +streaming +nextPut: aCharacter + "old implementation is very slow !!" + + " self nextPutAll: (String with: aCharacter)" + + | codePoint | + codePoint := aCharacter codePoint. + codePoint > 127 + ifTrue: [ + codePoint > 255 + ifTrue: [ + | str | + str := (String with: aCharacter) encodeAsUTF8intoString. + stream nextPutAll: str ] + ifFalse: [ stream nextPutAll: (Latin1ToUtf8Encodings at: codePoint + 1) ] ] + ifFalse: [ stream nextPut: aCharacter ] \ No newline at end of file diff --git a/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/nextPutAll..st b/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/nextPutAll..st new file mode 100644 index 00000000..d43ab2ef --- /dev/null +++ b/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/nextPutAll..st @@ -0,0 +1,5 @@ +streaming +nextPutAll: aString + binary + ifTrue: [ stream nextPutAll: aString asString ] + ifFalse: [ stream nextPutAll: aString _encodeAsUTF8intoString ] \ No newline at end of file diff --git a/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/properties.json b/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/properties.json new file mode 100644 index 00000000..00add781 --- /dev/null +++ b/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "Grease-GemStone330-Core", + "classinstvars" : [ + ], + "classvars" : [ + "Latin1ToUtf8Encodings" ], + "commentStamp" : "", + "instvars" : [ + ], + "name" : "GRUtf8CodecStream", + "pools" : [ + ], + "super" : "GRTextOrBinaryCodecStream", + "type" : "normal" } diff --git a/repository/Grease-GemStone360-Core.package/monticello.meta/categories.st b/repository/Grease-GemStone360-Core.package/monticello.meta/categories.st new file mode 100644 index 00000000..e25af126 --- /dev/null +++ b/repository/Grease-GemStone360-Core.package/monticello.meta/categories.st @@ -0,0 +1 @@ +SystemOrganization addCategory: #'Grease-GemStone330-Core'! diff --git a/repository/Grease-GemStone360-Core.package/monticello.meta/initializers.st b/repository/Grease-GemStone360-Core.package/monticello.meta/initializers.st new file mode 100644 index 00000000..e69de29b diff --git a/repository/Grease-GemStone360-Core.package/monticello.meta/package b/repository/Grease-GemStone360-Core.package/monticello.meta/package new file mode 100644 index 00000000..5039ec70 --- /dev/null +++ b/repository/Grease-GemStone360-Core.package/monticello.meta/package @@ -0,0 +1 @@ +(name 'Grease-GemStone360-Core') diff --git a/repository/Grease-GemStone360-Core.package/properties.json b/repository/Grease-GemStone360-Core.package/properties.json new file mode 100644 index 00000000..f037444a --- /dev/null +++ b/repository/Grease-GemStone360-Core.package/properties.json @@ -0,0 +1,2 @@ +{ + } From 85d7d5426ae10455776b082a1a106756a16b5f93 Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Wed, 7 Oct 2020 12:24:20 -0700 Subject: [PATCH 2/5] Issue #111: porting to 3.6.0, restore the old messageText behavior ... 3.6.0 default error message is not expected in the GLASS environment --- .../Exception.extension/instance/greaseString.st | 2 +- .../Exception.extension/instance/messageText.st | 3 +++ .../ExecBlock.extension/instance/argumentCount.st | 2 +- .../ExecBlock.extension/instance/ifCurtailed..st | 2 +- .../instance/valueWithPossibleArguments..st | 2 +- .../instance/gemstoneExceptionSelector.st | 2 +- .../GRGemStonePlatform.extension/instance/generateHardBreak.st | 2 +- .../instance/handlesAlmostOutOfStackException..st | 2 +- .../instance/handlesBreakpointException..st | 2 +- .../instance/handlesHaltException..st | 2 +- .../GRUtf8CodecStream.class/properties.json | 2 +- .../monticello.meta/categories.st | 2 +- .../Grease-GemStone360-Core.package/monticello.meta/package | 2 +- 13 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 repository/Grease-GemStone360-Core.package/Exception.extension/instance/messageText.st diff --git a/repository/Grease-GemStone360-Core.package/Exception.extension/instance/greaseString.st b/repository/Grease-GemStone360-Core.package/Exception.extension/instance/greaseString.st index ea4bff53..6728cdfa 100644 --- a/repository/Grease-GemStone360-Core.package/Exception.extension/instance/greaseString.st +++ b/repository/Grease-GemStone360-Core.package/Exception.extension/instance/greaseString.st @@ -1,4 +1,4 @@ -*grease-gemstone330-core +*grease-gemstone360-core greaseString ^self description \ No newline at end of file diff --git a/repository/Grease-GemStone360-Core.package/Exception.extension/instance/messageText.st b/repository/Grease-GemStone360-Core.package/Exception.extension/instance/messageText.st new file mode 100644 index 00000000..6b319348 --- /dev/null +++ b/repository/Grease-GemStone360-Core.package/Exception.extension/instance/messageText.st @@ -0,0 +1,3 @@ +*grease-gemstone360-core +messageText + ^ gsDetails "return ANSI messageText" \ No newline at end of file diff --git a/repository/Grease-GemStone360-Core.package/ExecBlock.extension/instance/argumentCount.st b/repository/Grease-GemStone360-Core.package/ExecBlock.extension/instance/argumentCount.st index 9f25fa98..b2db46a7 100644 --- a/repository/Grease-GemStone360-Core.package/ExecBlock.extension/instance/argumentCount.st +++ b/repository/Grease-GemStone360-Core.package/ExecBlock.extension/instance/argumentCount.st @@ -1,4 +1,4 @@ -*grease-gemstone330-core +*grease-gemstone360-core argumentCount ^self numArgs. \ No newline at end of file diff --git a/repository/Grease-GemStone360-Core.package/ExecBlock.extension/instance/ifCurtailed..st b/repository/Grease-GemStone360-Core.package/ExecBlock.extension/instance/ifCurtailed..st index cc75520a..088ae8e6 100644 --- a/repository/Grease-GemStone360-Core.package/ExecBlock.extension/instance/ifCurtailed..st +++ b/repository/Grease-GemStone360-Core.package/ExecBlock.extension/instance/ifCurtailed..st @@ -1,4 +1,4 @@ -*grease-gemstone330-core +*grease-gemstone360-core ifCurtailed: aBlock | wasCurtailed | diff --git a/repository/Grease-GemStone360-Core.package/ExecBlock.extension/instance/valueWithPossibleArguments..st b/repository/Grease-GemStone360-Core.package/ExecBlock.extension/instance/valueWithPossibleArguments..st index 5e1d8c5d..0bcb5c01 100644 --- a/repository/Grease-GemStone360-Core.package/ExecBlock.extension/instance/valueWithPossibleArguments..st +++ b/repository/Grease-GemStone360-Core.package/ExecBlock.extension/instance/valueWithPossibleArguments..st @@ -1,4 +1,4 @@ -*grease-gemstone330-core +*grease-gemstone360-core valueWithPossibleArguments: anArray "Evaluate the block represented by the receiver with the arguments provided." | n args | diff --git a/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/gemstoneExceptionSelector.st b/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/gemstoneExceptionSelector.st index 05cad772..ecd27c2c 100644 --- a/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/gemstoneExceptionSelector.st +++ b/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/gemstoneExceptionSelector.st @@ -1,4 +1,4 @@ -*grease-gemstone330-core +*grease-gemstone360-core gemstoneExceptionSelector ^ (ExceptionSet new) , Halt, AlmostOutOfStack, Breakpoint \ No newline at end of file diff --git a/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/generateHardBreak.st b/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/generateHardBreak.st index 458d1366..696a9e9c 100644 --- a/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/generateHardBreak.st +++ b/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/generateHardBreak.st @@ -1,4 +1,4 @@ -*grease-gemstone330-core +*grease-gemstone360-core generateHardBreak "Generate a GemStone hard break" diff --git a/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/handlesAlmostOutOfStackException..st b/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/handlesAlmostOutOfStackException..st index 725be222..4d285df0 100644 --- a/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/handlesAlmostOutOfStackException..st +++ b/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/handlesAlmostOutOfStackException..st @@ -1,4 +1,4 @@ -*grease-gemstone330-core +*grease-gemstone360-core handlesAlmostOutOfStackException: anException ^AlmostOutOfStack handles: anException \ No newline at end of file diff --git a/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/handlesBreakpointException..st b/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/handlesBreakpointException..st index d82b699a..c983e7d9 100644 --- a/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/handlesBreakpointException..st +++ b/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/handlesBreakpointException..st @@ -1,4 +1,4 @@ -*grease-gemstone330-core +*grease-gemstone360-core handlesBreakpointException: anException ^Breakpoint handles: anException \ No newline at end of file diff --git a/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/handlesHaltException..st b/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/handlesHaltException..st index 45fffeb8..05602c45 100644 --- a/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/handlesHaltException..st +++ b/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/handlesHaltException..st @@ -1,4 +1,4 @@ -*grease-gemstone330-core +*grease-gemstone360-core handlesHaltException: anException ^Halt handles: anException \ No newline at end of file diff --git a/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/properties.json b/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/properties.json index 00add781..c174e72b 100644 --- a/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/properties.json +++ b/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "Grease-GemStone330-Core", + "category" : "Grease-GemStone360-Core", "classinstvars" : [ ], "classvars" : [ diff --git a/repository/Grease-GemStone360-Core.package/monticello.meta/categories.st b/repository/Grease-GemStone360-Core.package/monticello.meta/categories.st index e25af126..cb035a16 100644 --- a/repository/Grease-GemStone360-Core.package/monticello.meta/categories.st +++ b/repository/Grease-GemStone360-Core.package/monticello.meta/categories.st @@ -1 +1 @@ -SystemOrganization addCategory: #'Grease-GemStone330-Core'! +SystemOrganization addCategory: #'Grease-GemStone360-Core'! diff --git a/repository/Grease-GemStone360-Core.package/monticello.meta/package b/repository/Grease-GemStone360-Core.package/monticello.meta/package index 5039ec70..7ced6c0d 100644 --- a/repository/Grease-GemStone360-Core.package/monticello.meta/package +++ b/repository/Grease-GemStone360-Core.package/monticello.meta/package @@ -1 +1 @@ -(name 'Grease-GemStone360-Core') +(name 'Grease-GemStone360-Core') \ No newline at end of file From 888e9a4ea3244dc229c89e5b9ae6380c32f2667c Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Wed, 7 Oct 2020 12:35:23 -0700 Subject: [PATCH 3/5] Issue #111: update comment in Exception>>messageText --- .../Exception.extension/instance/messageText.st | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/repository/Grease-GemStone360-Core.package/Exception.extension/instance/messageText.st b/repository/Grease-GemStone360-Core.package/Exception.extension/instance/messageText.st index 6b319348..ff2fca6b 100644 --- a/repository/Grease-GemStone360-Core.package/Exception.extension/instance/messageText.st +++ b/repository/Grease-GemStone360-Core.package/Exception.extension/instance/messageText.st @@ -1,3 +1,5 @@ *grease-gemstone360-core messageText - ^ gsDetails "return ANSI messageText" \ No newline at end of file + "override new 3.6.0 messageText implementation to restore pre-3.6.0 behavior" + "https://github.com/SeasideSt/Grease/issues/111" + ^ gsDetails From d6d25d445f2da9158fc945ada4ae8732e817c87a Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Wed, 7 Oct 2020 12:46:58 -0700 Subject: [PATCH 4/5] Issue #111: restore pre-3.6.0 behavior for Class>comment (i.e., return nil if no comment defined). New 3.6.0 behavior returned a GemStone-specific default comment. --- .../Class.extension/instance/comment.st | 9 +++++++++ .../Class.extension/properties.json | 2 ++ .../Exception.extension/instance/messageText.st | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 repository/Grease-GemStone360-Core.package/Class.extension/instance/comment.st create mode 100644 repository/Grease-GemStone360-Core.package/Class.extension/properties.json diff --git a/repository/Grease-GemStone360-Core.package/Class.extension/instance/comment.st b/repository/Grease-GemStone360-Core.package/Class.extension/instance/comment.st new file mode 100644 index 00000000..e1f21144 --- /dev/null +++ b/repository/Grease-GemStone360-Core.package/Class.extension/instance/comment.st @@ -0,0 +1,9 @@ +*grease-gemstone360-core +comment + "override new 3.6.0 comment implementation (answers default GemSTone class comment for + class instead of nil) and restore pre-3.6.0 behavior (answer nil if no comment + defined)" + + "https://github.com/SeasideSt/Grease/issues/111" + + ^ self commentForFileout \ No newline at end of file diff --git a/repository/Grease-GemStone360-Core.package/Class.extension/properties.json b/repository/Grease-GemStone360-Core.package/Class.extension/properties.json new file mode 100644 index 00000000..239813a4 --- /dev/null +++ b/repository/Grease-GemStone360-Core.package/Class.extension/properties.json @@ -0,0 +1,2 @@ +{ + "name" : "Class" } diff --git a/repository/Grease-GemStone360-Core.package/Exception.extension/instance/messageText.st b/repository/Grease-GemStone360-Core.package/Exception.extension/instance/messageText.st index ff2fca6b..739ca1e4 100644 --- a/repository/Grease-GemStone360-Core.package/Exception.extension/instance/messageText.st +++ b/repository/Grease-GemStone360-Core.package/Exception.extension/instance/messageText.st @@ -2,4 +2,4 @@ messageText "override new 3.6.0 messageText implementation to restore pre-3.6.0 behavior" "https://github.com/SeasideSt/Grease/issues/111" - ^ gsDetails + ^ gsDetails \ No newline at end of file From ea7340ee34b35fbd026aef00bfbf1c8d84c67753 Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Thu, 8 Oct 2020 15:57:26 -0700 Subject: [PATCH 5/5] update lineup to include 3.5.4 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b95d6c83..fb603eac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ matrix: env: BUILD_NAME=Squeak-5.2 - smalltalk: Squeak32-5.1 env: BUILD_NAME=Squeak-5.1 - - smalltalk: GemStone-3.5.2 + - smalltalk: GemStone-3.5.4 env: BUILD_NAME=GemStone-3.5.2 - smalltalk: GemStone-3.4.5 env: BUILD_NAME=GemStone-3.4.5