Skip to content

pick up latest on master branch for dev branch #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dalehenrich merged 10 commits into from
Sep 19, 2017
Merged

pick up latest on master branch for dev branch #9

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4b69983
Pharo3-4-5: #defaultValue should not be called from within #use:during:
Jul 24, 2017
439aed8
Merge pull request #26 from SeasideSt/bugfix-dynvar-pharo345
Jul 24, 2017
6ad0a6f
Switch build status to SVG
marschall Sep 5, 2017
3f844f3
Merge pull request #38 from marschall/master-buildstatus-svg
marschall Sep 5, 2017
919b273
cherry-pick of fixes to GRDynamicVariable (commit e5eee3b33b234bd6fb1…
Sep 8, 2017
b2e8396
Added a test for: Fix GRDynamicVariable>>use:during: in GemStone to …
Sep 8, 2017
9043ed1
Merge pull request #44 from SeasideSt/fix-grdynamicvar
Sep 9, 2017
fd4e6dc
Merge branch 'master' into master
Sep 9, 2017
99e0051
revert changes to README in previous commit
Sep 9, 2017
b85b74b
Merge pull request #8 from SeasideSt/master
dalehenrich Sep 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
cherry-pick of fixes to GRDynamicVariable (commit e5eee3b)
  • Loading branch information
Johan Brichau committed Sep 9, 2017
commit 919b273be54ea07430be16263a888b4e512cf6b3
13 changes: 10 additions & 3 deletions repository/Grease-GemStone-Core.package/GRDynamicVariable.class/class/use.during..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
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 hasOldValue oldValue result |
"Implementation cannot send a supercall to value:during: because:
- this method needs to return the value
- the defaultValue may not be invoked here to support throwing errors as defaultValue
- nil may not remain installed as the default value once the block has finished running"
p := Processor activeProcess.
hasOldValue := p environment includesKey: self.
oldValue := p environmentAt: self.
[
p environmentAt: self put: anObject.
result := aBlock value ]
ensure: [ p environmentAt: self put: oldValue ].
ensure: [
hasOldValue
ifFalse: [ p environment removeKey: self ]
ifTrue: [ p environmentAt: self put: oldValue ] ].
^ result
2 changes: 1 addition & 1 deletion repository/Grease-GemStone-Core.package/GRDynamicVariable.class/methodProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"class" : {
"default" : "JohanBrichau 07/23/2017 09:48",
"defaultValue" : "JohanBrichau 07/23/2017 09:47",
"use:during:" : "JohanBrichau 07/23/2017 07:39" },
"use:during:" : "JB 09/08/2017 00:34" },
"instance" : {
} }
Loading