-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #25 from SeasideSt/bugfix-dynvar
Fix for default value of GRDynamicVariable
- Loading branch information
Showing
71 changed files
with
347 additions
and
368 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
repository/Grease-GemStone-Core.package/GRDynamicVariable.class/class/default.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| defaults | ||
| default | ||
| ^ self defaultValue |
3 changes: 3 additions & 0 deletions
3
repository/Grease-GemStone-Core.package/GRDynamicVariable.class/class/defaultValue.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| defaults | ||
| defaultValue | ||
| ^ nil |
21 changes: 9 additions & 12 deletions
21
repository/Grease-GemStone-Core.package/GRDynamicVariable.class/class/use.during..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,11 @@ | ||
| accessing | ||
| use: anObject during: aBlock | ||
|
|
||
| | p oldValue result | | ||
| "Proper implementation instead of use 'super value:during:' because that one does not return value, perhaps this should be fixed in DynamicVariable?" | ||
| p := Processor activeProcess. | ||
| oldValue := p environmentAt: self ifAbsent: [self default]. | ||
| [ | ||
| p environmentAt: self put: anObject. | ||
| result := aBlock value. | ||
| ] ensure: [ | ||
| p environmentAt: self put: oldValue | ||
| ]. | ||
| ^ result | ||
| | p oldValue result | | ||
| "Proper implementation instead of use 'super value:during:' because that one does not return value, perhaps this should be fixed in DynamicVariable?" | ||
| p := Processor activeProcess. | ||
| oldValue := p environmentAt: self. | ||
| [ | ||
| p environmentAt: self put: anObject. | ||
| result := aBlock value ] | ||
| ensure: [ p environmentAt: self put: oldValue ]. | ||
| ^ result |
4 changes: 3 additions & 1 deletion
4
repository/Grease-GemStone-Core.package/GRDynamicVariable.class/methodProperties.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| { | ||
| "class" : { | ||
| "use:during:" : "JohanBrichau 05/25/2017 08:13" }, | ||
| "default" : "JohanBrichau 07/23/2017 09:48", | ||
| "defaultValue" : "JohanBrichau 07/23/2017 09:47", | ||
| "use:during:" : "JohanBrichau 07/23/2017 07:39" }, | ||
| "instance" : { | ||
| } } |
2 changes: 1 addition & 1 deletion
2
repository/Grease-GemStone-Core.package/monticello.meta/version
Large diffs are not rendered by default.
Oops, something went wrong.
3 changes: 3 additions & 0 deletions
3
repository/Grease-Pharo30-Core.package/GRDynamicVariable.class/class/defaultValue.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| accessing | ||
| defaultValue | ||
| ^ nil |
3 changes: 3 additions & 0 deletions
3
repository/Grease-Pharo30-Core.package/GRDynamicVariable.class/instance/default.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| accessing | ||
| default | ||
| ^ self class defaultValue |
8 changes: 4 additions & 4 deletions
8
repository/Grease-Pharo30-Core.package/GRDynamicVariable.class/methodProperties.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| { | ||
| "instance" : { }, | ||
| "class" : { | ||
| "use:during:" : "MaxLeske 5/16/2017 21:54" | ||
| } | ||
| } | ||
| "defaultValue" : "JohanBrichau 7/23/2017 17:55", | ||
| "use:during:" : "MaxLeske 5/16/2017 21:54" }, | ||
| "instance" : { | ||
| "default" : "JohanBrichau 7/23/2017 17:56" } } |
19 changes: 11 additions & 8 deletions
19
repository/Grease-Pharo30-Core.package/GRDynamicVariable.class/properties.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,14 @@ | ||
| { | ||
| "commentStamp" : "MaxLeske 5/16/2017 22:05", | ||
| "super" : "DynamicVariable", | ||
| "category" : "Grease-Pharo30-Core", | ||
| "classinstvars" : [ ], | ||
| "pools" : [ ], | ||
| "classvars" : [ ], | ||
| "instvars" : [ ], | ||
| "classinstvars" : [ | ||
| ], | ||
| "classvars" : [ | ||
| ], | ||
| "commentStamp" : "MaxLeske 5/16/2017 22:05", | ||
| "instvars" : [ | ||
| ], | ||
| "name" : "GRDynamicVariable", | ||
| "type" : "normal" | ||
| } | ||
| "pools" : [ | ||
| ], | ||
| "super" : "DynamicVariable", | ||
| "type" : "normal" } |
3 changes: 1 addition & 2 deletions
3
repository/Grease-Pharo30-Core.package/GRPackage.extension/properties.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,2 @@ | ||
| { | ||
| "name" : "GRPackage" | ||
| } | ||
| "name" : "GRPackage" } |
13 changes: 5 additions & 8 deletions
13
...itory/Grease-Pharo30-Core.package/GRPharoConverterCodecStream.class/methodProperties.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,10 @@ | ||
| { | ||
| "class" : { | ||
| "on:converter:" : "pmm 10/30/2010 18:58" }, | ||
| "instance" : { | ||
| "nextPut:" : "pmm 4/10/2010 13:30", | ||
| "greaseNext:putAll:startingAt:" : "pmm 12/28/2010 22:12", | ||
| "nextPutAll:" : "lr 2/7/2009 12:54", | ||
| "initializeOn:converter:" : "pmm 10/30/2010 18:58", | ||
| "next" : "pmm 4/10/2010 13:32", | ||
| "next:" : "lr 2/7/2009 12:57", | ||
| "initializeOn:converter:" : "pmm 10/30/2010 18:58" | ||
| }, | ||
| "class" : { | ||
| "on:converter:" : "pmm 10/30/2010 18:58" | ||
| } | ||
| } | ||
| "nextPut:" : "pmm 4/10/2010 13:30", | ||
| "nextPutAll:" : "lr 2/7/2009 12:54" } } |
19 changes: 10 additions & 9 deletions
19
repository/Grease-Pharo30-Core.package/GRPharoConverterCodecStream.class/properties.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,14 @@ | ||
| { | ||
| "commentStamp" : "pmm 6/25/2012 20:22", | ||
| "super" : "GRCodecStream", | ||
| "category" : "Grease-Pharo30-Core", | ||
| "classinstvars" : [ ], | ||
| "pools" : [ ], | ||
| "classvars" : [ ], | ||
| "classinstvars" : [ | ||
| ], | ||
| "classvars" : [ | ||
| ], | ||
| "commentStamp" : "pmm 6/25/2012 20:22", | ||
| "instvars" : [ | ||
| "converter" | ||
| ], | ||
| "converter" ], | ||
| "name" : "GRPharoConverterCodecStream", | ||
| "type" : "normal" | ||
| } | ||
| "pools" : [ | ||
| ], | ||
| "super" : "GRCodecStream", | ||
| "type" : "normal" } |
17 changes: 7 additions & 10 deletions
17
repository/Grease-Pharo30-Core.package/GRPharoGenericCodec.class/methodProperties.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,13 @@ | ||
| { | ||
| "class" : { | ||
| "basicForEncoding:" : "pmm 6/28/2009 15:43", | ||
| "codecs" : "pmm 8/16/2010 00:19", | ||
| "supportedEncodingNames" : "lr 7/25/2011 19:46", | ||
| "supportsEncoding:" : "pmm 6/28/2009 16:43" }, | ||
| "instance" : { | ||
| "converter" : "lr 7/25/2011 19:51", | ||
| "decoderFor:" : "lr 2/7/2009 12:52", | ||
| "url" : "lr 2/7/2009 12:36", | ||
| "encoderFor:" : "jf 9/30/2009 00:46", | ||
| "initializeWithName:" : "pmm 8/16/2010 11:52", | ||
| "name" : "lr 2/7/2009 10:16" | ||
| }, | ||
| "class" : { | ||
| "codecs" : "pmm 8/16/2010 00:19", | ||
| "supportsEncoding:" : "pmm 6/28/2009 16:43", | ||
| "basicForEncoding:" : "pmm 6/28/2009 15:43", | ||
| "supportedEncodingNames" : "lr 7/25/2011 19:46" | ||
| } | ||
| } | ||
| "name" : "lr 2/7/2009 10:16", | ||
| "url" : "lr 2/7/2009 12:36" } } |
19 changes: 10 additions & 9 deletions
19
repository/Grease-Pharo30-Core.package/GRPharoGenericCodec.class/properties.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,15 @@ | ||
| { | ||
| "commentStamp" : "", | ||
| "super" : "GRCodec", | ||
| "category" : "Grease-Pharo30-Core", | ||
| "classinstvars" : [ ], | ||
| "pools" : [ ], | ||
| "classvars" : [ ], | ||
| "classinstvars" : [ | ||
| ], | ||
| "classvars" : [ | ||
| ], | ||
| "commentStamp" : "", | ||
| "instvars" : [ | ||
| "name", | ||
| "urlCodec" | ||
| ], | ||
| "urlCodec" ], | ||
| "name" : "GRPharoGenericCodec", | ||
| "type" : "normal" | ||
| } | ||
| "pools" : [ | ||
| ], | ||
| "super" : "GRCodec", | ||
| "type" : "normal" } |
19 changes: 8 additions & 11 deletions
19
repository/Grease-Pharo30-Core.package/GRPharoLatin1Codec.class/methodProperties.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,12 @@ | ||
| { | ||
| "class" : { | ||
| "basicForEncoding:" : "pmm 8/16/2010 00:36", | ||
| "codecs" : "lr 7/25/2011 19:46", | ||
| "supportedEncodingNames" : "lr 7/25/2011 19:46", | ||
| "supportsEncoding:" : "pmm 8/16/2010 00:36" }, | ||
| "instance" : { | ||
| "decoderFor:" : "pmm 8/16/2010 00:32", | ||
| "decode:" : "pmm 8/16/2010 09:20", | ||
| "initializeWithName:" : "pmm 8/25/2016 11:00", | ||
| "decoderFor:" : "pmm 8/16/2010 00:32", | ||
| "encoderFor:" : "pmm 8/16/2010 00:32", | ||
| "name" : "pmm 8/16/2010 00:32" | ||
| }, | ||
| "class" : { | ||
| "codecs" : "lr 7/25/2011 19:46", | ||
| "supportsEncoding:" : "pmm 8/16/2010 00:36", | ||
| "basicForEncoding:" : "pmm 8/16/2010 00:36", | ||
| "supportedEncodingNames" : "lr 7/25/2011 19:46" | ||
| } | ||
| } | ||
| "initializeWithName:" : "pmm 8/25/2016 11:00", | ||
| "name" : "pmm 8/16/2010 00:32" } } |
19 changes: 10 additions & 9 deletions
19
repository/Grease-Pharo30-Core.package/GRPharoLatin1Codec.class/properties.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,14 @@ | ||
| { | ||
| "commentStamp" : "<historical>", | ||
| "super" : "GRNullCodec", | ||
| "category" : "Grease-Pharo30-Core", | ||
| "classinstvars" : [ ], | ||
| "pools" : [ ], | ||
| "classvars" : [ ], | ||
| "classinstvars" : [ | ||
| ], | ||
| "classvars" : [ | ||
| ], | ||
| "commentStamp" : "<historical>", | ||
| "instvars" : [ | ||
| "name" | ||
| ], | ||
| "name" ], | ||
| "name" : "GRPharoLatin1Codec", | ||
| "type" : "normal" | ||
| } | ||
| "pools" : [ | ||
| ], | ||
| "super" : "GRNullCodec", | ||
| "type" : "normal" } |
9 changes: 4 additions & 5 deletions
9
repository/Grease-Pharo30-Core.package/GRPharoLatin1CodecStream.class/methodProperties.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,6 @@ | ||
| { | ||
| "class" : { | ||
| }, | ||
| "instance" : { | ||
| "next:" : "lr 7/25/2011 19:50", | ||
| "next" : "pmm 8/16/2010 09:16" | ||
| }, | ||
| "class" : { } | ||
| } | ||
| "next" : "pmm 8/16/2010 09:16", | ||
| "next:" : "lr 7/25/2011 19:50" } } |
Oops, something went wrong.