Skip to content

Commit

Permalink
Merge pull request #26 from SeasideSt/bugfix-dynvar-pharo345
Browse files Browse the repository at this point in the history 
Pharo3-4-5: #defaultValue should not be called from within #use:during:
  • Loading branch information
Johan Brichau authored Jul 24, 2017
2 parents c9f536d + 4b69983 commit 439aed8
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
8 changes: 8 additions & 0 deletions repository/Grease-Pharo30-Core.package/GRDynamicVariable.class/instance/value.during..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
accessing
value: anObject during: aBlock
| p oldValue |
p := Processor activeProcess.
oldValue := p psValueAt: index.
^ [
p psValueAt: index put: anObject.
aBlock value ] ensure: [ p psValueAt: index put: oldValue ]
3 changes: 2 additions & 1 deletion repository/Grease-Pharo30-Core.package/GRDynamicVariable.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
"defaultValue" : "JohanBrichau 7/23/2017 17:55",
"use:during:" : "MaxLeske 5/16/2017 21:54" },
"instance" : {
"default" : "JohanBrichau 7/23/2017 17:56" } }
"default" : "JohanBrichau 7/23/2017 17:56",
"value:during:" : "JohanBrichau 7/23/2017 21:20" } }
2 changes: 1 addition & 1 deletion repository/Grease-Pharo30-Core.package/monticello.meta/version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
(name 'Grease-Pharo30-Core-JohanBrichau.24' message 'Added GRDynamicVariable class>>defaultValue to represent the default value of a GRDynamicVariable. Previously, this was GRDynamicvariable>>default but this was not compatible for all platforms' id 'ae256fa1-7340-4d02-8b46-ddabaf8c0196' date '23 July 2017' time '5:56:18.263198 pm' author 'JohanBrichau' ancestors ((name 'Grease-Pharo30-Core-MaxLeske.23' message 'merged by GitFileTree-MergeDriver' id 'bf826cec-f28e-4871-a5a8-f86c21244de8' date '25 May 2017' time '2:48:46.179573 pm' author 'MaxLeske' ancestors ((name 'Grease-Pharo30-Core-MaxLeske.22' message '* added GRDynamicVariable as replacement for WADynamicVariable' id 'ea9f25a6-270c-0d00-82d8-687107321642' date '18 May 2017' time '7:45:27.980288 am' author 'MaxLeske' ancestors ((name 'Grease-Pharo30-Core-pmm.21' message '- direct rendering for ScaledDecimal' id 'db8b6a8e-ce95-4c7b-817a-0fc352c0c000' date '26 August 2016' time '8:56:20.501423 am' author 'pmm' ancestors ((name 'Grease-Pharo30-Core-pmm.20' message '- lint fixes' id 'ec123007-ffe6-483d-aba9-e36840b7a24c' date '25 August 2016' time '11:03:48.029702 am' author 'pmm' ancestors ((name 'Grease-Pharo30-Core-JohanBrichau.19' message 'Added missing method GRPharoUtf8Coded>>invalidUtf8' id '3fc62b04-668c-4f6d-801d-54640757217c' date '18 January 2016' time '8:15:58.41072 am' author 'JohanBrichau' ancestors ((name 'Grease-Pharo30-Core-JohanBrichau.18' message 'Implements #bindingOf: in Pharo3+' id 'cbd9dc15-a5ad-4b29-8399-e185c2b38f8e' date '12 July 2015' time '2:47:09.890712 pm' author 'JohanBrichau' ancestors ((name 'Grease-Pharo30-Core-JohanBrichau.17' message 'Missing sign on ScaledDecimal>>greaseString(https://github.com/SeasideSt/Grease/issues/1)Thanks Hilaire!' id 'bd1dc3a1-c04d-47ab-9637-c6ba13afe679' date '25 May 2015' time '9:05:39.60184 am' author 'JohanBrichau' ancestors ((name 'Grease-Pharo30-Core-JohanBrichau.16' message 'additional file library methods' id 'bd9e3924-0ff7-443a-a361-68768ee52b77' date '3 October 2014' time '8:05:16.758249 pm' author 'JohanBrichau' ancestors ((name 'Grease-Pharo30-Core-pmm.15' message 'Issue 792: Issue encoding a non-ascii character preceded by an xml-unsafe one- https://code.google.com/p/seaside/issues/detail?id=792' id 'ee0aef7f-007a-4b55-ab96-ac338d55fed0' date '21 May 2014' time '9:30:02.077151 pm' author 'pmm' ancestors ((name 'Grease-Pharo30-Core-JohanBrichau.14' message 'Issue 789: Running WAFilelibraryTest on Pharo3 leaves Seaside-Tests-Core package in a dirty state https://code.google.com/p/seaside/issues/detail?id=789' id 'e845ca33-9427-435c-9a3c-f3d3a6669295' date '19 April 2014' time '5:23:30.089075 pm' author 'JohanBrichau' ancestors ((name 'Grease-Pharo30-Core-JohanBrichau.13' message 'move GRCountingStream from Pharo-only package to Core' id 'af3fd2e2-3290-4de5-8ea1-a92a78eeed4a' date '16 February 2014' time '9:29:51.277053 pm' author 'JohanBrichau' ancestors ((name 'Grease-Pharo30-Core-JohanBrichau.12' message 'bugfix #readWriteByteStream http://forum.world.st/errorImproperStore-error-because-of-change-in-GRPharoPlatform-gt-gt-readWriteByteStream-td4737266.html' id 'f0022f14-d33b-47cd-98e9-891c3d72e7af' date '18 January 2014' time '7:06:52.139327 am' author 'JohanBrichau' ancestors ((name 'Grease-Pharo30-Core-pmm.11' message 'Issue 770: ScaledDecimal rendering supporthttp://code.google.com/p/seaside/issues/detail?id=770' id '9cfba12f-0b05-432d-84d1-d5cd8bf23dfe' date '15 September 2013' time '12:25:15.521 pm' author 'pmm' ancestors ((name 'Grease-Pharo30-Core-pmm.10' message '- add #doSilentlyBack:' id '5ccc9407-d97b-45f3-b9b0-c5135257da27' date '12 September 2013' time '6:07:05.251 pm' author 'pmm' ancestors ((name 'Grease-Pharo30-Core-pmm.9' message '- fix URLs' id 'd89a3a93-8df2-4fef-b4ed-6d99b3e4befb' date '12 September 2013' time '4:01:20.912841 pm' author 'pmm' ancestors ((name 'Grease-Pharo30-Core-pmm.8' message '- fix metadata' id '53897910-3143-4a50-8b56-3af0a1219593' date '12 September 2013' time '3:55:52.88988 pm' author 'pmm' ancestors ((name 'Grease-Pharo30-Core-pmm.7' message 'Issue 760: addAllFilesIn: is broken in Pharo 20http://code.google.com/p/seaside/issues/detail?id=760' id '326a7053-4672-4be5-b268-90e286a74f6c' date '12 September 2013' time '12:14:04.352265 pm' author 'pmm' ancestors ((name 'Grease-Pharo30-Core-pmm.6' message 'Issue 760: addAllFilesIn: is broken in Pharo 20http://code.google.com/p/seaside/issues/detail?id=760' id 'e43e7571-1bd1-4733-b53f-72a19245eed1' date '12 September 2013' time '12:10:25.447758 pm' author 'pmm' ancestors ((name 'Grease-Pharo30-Core-pmm.5' message '- FileSystem fixes' id '2a3dc16b-d38e-4f50-be28-2138a431d832' date '12 September 2013' time '12:05:46.224478 pm' author 'pmm' ancestors ((name 'Grease-Pharo30-Core-pmm.4' message '- fix compilation' id '8d649251-34e2-4ed0-a007-223b556888a8' date '12 September 2013' time '11:25:48.069182 am' author 'pmm' ancestors ((name 'Grease-Pharo30-Core-DamienCassou.3' message '- Pharo 3.0: no need for sending #defaultMethodTrailer anymore' id 'c5d1b0db-bf87-43a3-bd4b-9d4d47169699' date '9 September 2013' time '10:39:38.671985 am' author 'DamienCassou' ancestors ((name 'Grease-Pharo30-Core-MattSpr.2' message 'Fixed #compile:into:classified: for Pharo3.0.' id '26925549-0374-4ecc-a49b-fd8d4e28962d' date '28 August 2013' time '10:43:32.58787 am' author 'MattSpr' ancestors ((name 'Grease-Pharo30-Core-MattSpr.1' message 'Copy of package from Pharo 2.0.' id '6da53441-b2d0-49dc-ae04-15d757b7a8af' date '28 August 2013' time '10:41:57.145859 am' author 'MattSpr' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(name 'Grease-Pharo30-Core-PavelKrivanek.22' message 'move extensions of Behavior to TBehavior' id '72b159cb-0b0a-0d00-90c8-922f067edcaa' date '21 April 2017' time '11:41:09.810975 am' author 'PavelKrivanek' ancestors ((id 'db8b6a8e-ce95-4c7b-817a-0fc352c0c000')) stepChildren ())) stepChildren ())) stepChildren ())
(name 'Grease-Pharo30-Core-JohanBrichau.25' message 'Override on GRDynamicVariable: #defaultValue should not be called from within #use:during:' id 'b1abf22f-4255-4003-9ccb-7690ff121a19' date '24 July 2017' time '8:07:45.175466 am' author 'JohanBrichau' ancestors ((name 'Grease-Pharo30-Core-JohanBrichau.24' message 'Added GRDynamicVariable class>>defaultValue to represent the default value of a GRDynamicVariable. Previously, this was GRDynamicvariable>>default but this was not compatible for all platforms' id 'ae256fa1-7340-4d02-8b46-ddabaf8c0196' date '23 July 2017' time '5:56:18.263198 pm' author 'JohanBrichau' ancestors ((name 'Grease-Pharo30-Core-MaxLeske.23' message 'merged by GitFileTree-MergeDriver' id 'bf826cec-f28e-4871-a5a8-f86c21244de8' date '25 May 2017' time '2:48:46.179573 pm' author 'MaxLeske' ancestors ((name 'Grease-Pharo30-Core-MaxLeske.22' message '* added GRDynamicVariable as replacement for WADynamicVariable' id 'ea9f25a6-270c-0d00-82d8-687107321642' date '18 May 2017' time '7:45:27.980288 am' author 'MaxLeske' ancestors ((name 'Grease-Pharo30-Core-pmm.21' message '- direct rendering for ScaledDecimal' id 'db8b6a8e-ce95-4c7b-817a-0fc352c0c000' date '26 August 2016' time '8:56:20.501423 am' author 'pmm' ancestors ((name 'Grease-Pharo30-Core-pmm.20' message '- lint fixes' id 'ec123007-ffe6-483d-aba9-e36840b7a24c' date '25 August 2016' time '11:03:48.029702 am' author 'pmm' ancestors ((name 'Grease-Pharo30-Core-JohanBrichau.19' message 'Added missing method GRPharoUtf8Coded>>invalidUtf8' id '3fc62b04-668c-4f6d-801d-54640757217c' date '18 January 2016' time '8:15:58.41072 am' author 'JohanBrichau' ancestors ((name 'Grease-Pharo30-Core-JohanBrichau.18' message 'Implements #bindingOf: in Pharo3+' id 'cbd9dc15-a5ad-4b29-8399-e185c2b38f8e' date '12 July 2015' time '2:47:09.890712 pm' author 'JohanBrichau' ancestors ((name 'Grease-Pharo30-Core-JohanBrichau.17' message 'Missing sign on ScaledDecimal>>greaseString(https://github.com/SeasideSt/Grease/issues/1)Thanks Hilaire!' id 'bd1dc3a1-c04d-47ab-9637-c6ba13afe679' date '25 May 2015' time '9:05:39.60184 am' author 'JohanBrichau' ancestors ((name 'Grease-Pharo30-Core-JohanBrichau.16' message 'additional file library methods' id 'bd9e3924-0ff7-443a-a361-68768ee52b77' date '3 October 2014' time '8:05:16.758249 pm' author 'JohanBrichau' ancestors ((name 'Grease-Pharo30-Core-pmm.15' message 'Issue 792: Issue encoding a non-ascii character preceded by an xml-unsafe one- https://code.google.com/p/seaside/issues/detail?id=792' id 'ee0aef7f-007a-4b55-ab96-ac338d55fed0' date '21 May 2014' time '9:30:02.077151 pm' author 'pmm' ancestors ((name 'Grease-Pharo30-Core-JohanBrichau.14' message 'Issue 789: Running WAFilelibraryTest on Pharo3 leaves Seaside-Tests-Core package in a dirty state https://code.google.com/p/seaside/issues/detail?id=789' id 'e845ca33-9427-435c-9a3c-f3d3a6669295' date '19 April 2014' time '5:23:30.089075 pm' author 'JohanBrichau' ancestors ((name 'Grease-Pharo30-Core-JohanBrichau.13' message 'move GRCountingStream from Pharo-only package to Core' id 'af3fd2e2-3290-4de5-8ea1-a92a78eeed4a' date '16 February 2014' time '9:29:51.277053 pm' author 'JohanBrichau' ancestors ((name 'Grease-Pharo30-Core-JohanBrichau.12' message 'bugfix #readWriteByteStream http://forum.world.st/errorImproperStore-error-because-of-change-in-GRPharoPlatform-gt-gt-readWriteByteStream-td4737266.html' id 'f0022f14-d33b-47cd-98e9-891c3d72e7af' date '18 January 2014' time '7:06:52.139327 am' author 'JohanBrichau' ancestors ((name 'Grease-Pharo30-Core-pmm.11' message 'Issue 770: ScaledDecimal rendering supporthttp://code.google.com/p/seaside/issues/detail?id=770' id '9cfba12f-0b05-432d-84d1-d5cd8bf23dfe' date '15 September 2013' time '12:25:15.521 pm' author 'pmm' ancestors ((name 'Grease-Pharo30-Core-pmm.10' message '- add #doSilentlyBack:' id '5ccc9407-d97b-45f3-b9b0-c5135257da27' date '12 September 2013' time '6:07:05.251 pm' author 'pmm' ancestors ((name 'Grease-Pharo30-Core-pmm.9' message '- fix URLs' id 'd89a3a93-8df2-4fef-b4ed-6d99b3e4befb' date '12 September 2013' time '4:01:20.912841 pm' author 'pmm' ancestors ((name 'Grease-Pharo30-Core-pmm.8' message '- fix metadata' id '53897910-3143-4a50-8b56-3af0a1219593' date '12 September 2013' time '3:55:52.88988 pm' author 'pmm' ancestors ((name 'Grease-Pharo30-Core-pmm.7' message 'Issue 760: addAllFilesIn: is broken in Pharo 20http://code.google.com/p/seaside/issues/detail?id=760' id '326a7053-4672-4be5-b268-90e286a74f6c' date '12 September 2013' time '12:14:04.352265 pm' author 'pmm' ancestors ((name 'Grease-Pharo30-Core-pmm.6' message 'Issue 760: addAllFilesIn: is broken in Pharo 20http://code.google.com/p/seaside/issues/detail?id=760' id 'e43e7571-1bd1-4733-b53f-72a19245eed1' date '12 September 2013' time '12:10:25.447758 pm' author 'pmm' ancestors ((name 'Grease-Pharo30-Core-pmm.5' message '- FileSystem fixes' id '2a3dc16b-d38e-4f50-be28-2138a431d832' date '12 September 2013' time '12:05:46.224478 pm' author 'pmm' ancestors ((name 'Grease-Pharo30-Core-pmm.4' message '- fix compilation' id '8d649251-34e2-4ed0-a007-223b556888a8' date '12 September 2013' time '11:25:48.069182 am' author 'pmm' ancestors ((name 'Grease-Pharo30-Core-DamienCassou.3' message '- Pharo 3.0: no need for sending #defaultMethodTrailer anymore' id 'c5d1b0db-bf87-43a3-bd4b-9d4d47169699' date '9 September 2013' time '10:39:38.671985 am' author 'DamienCassou' ancestors ((name 'Grease-Pharo30-Core-MattSpr.2' message 'Fixed #compile:into:classified: for Pharo3.0.' id '26925549-0374-4ecc-a49b-fd8d4e28962d' date '28 August 2013' time '10:43:32.58787 am' author 'MattSpr' ancestors ((name 'Grease-Pharo30-Core-MattSpr.1' message 'Copy of package from Pharo 2.0.' id '6da53441-b2d0-49dc-ae04-15d757b7a8af' date '28 August 2013' time '10:41:57.145859 am' author 'MattSpr' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(name 'Grease-Pharo30-Core-PavelKrivanek.22' message 'move extensions of Behavior to TBehavior' id '72b159cb-0b0a-0d00-90c8-922f067edcaa' date '21 April 2017' time '11:41:09.810975 am' author 'PavelKrivanek' ancestors ((id 'db8b6a8e-ce95-4c7b-817a-0fc352c0c000')) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
Expand Down

0 comments on commit 439aed8

Please sign in to comment.