Skip to content

Keep up with master #7

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 13 commits into from
Jul 23, 2017
Merged

Keep up with master #7

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4bc2f3c
Update README to reflect Grease is now on github
Jun 4, 2017
6a62ba3
Update README to reflect Grease is now on github
Jun 4, 2017
61126b9
Updated load snippets [ci skip]
Jun 4, 2017
9eaee5b
Added a test for GRDynamicVariable>>default override
Jul 23, 2017
4abf403
#defaultValue should not be called from within #use:during:
Jul 23, 2017
fbe6238
GRTestDynamicVariable should be a subclass of GRDynamicVariable
Jul 23, 2017
6bcefda
Added GRDynamicVariable class>>defaultValue to represent the default …
Jul 23, 2017
42fba2f
For Pharo3,4,5: Added GRDynamicVariable class>>defaultValue to repres…
Jul 23, 2017
c1dd973
For Gemstone3.2: Added GRDynamicVariable class>>defaultValue to repre…
Jul 23, 2017
5f867b2
For Squeak5: Added GRDynamicVariable class>>defaultValue to represent…
Jul 23, 2017
44ff4c3
- Removed pharo1.x and 2.x from the baseline since no longer supporte…
Jul 23, 2017
8fc05b0
Fixed dependency of Grease-Tests-Core on the platform packages for GR…
Jul 23, 2017
c9f536d
Merge pull request #25 from SeasideSt/bugfix-dynvar
Jul 23, 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
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
  • Loading branch information
Johan Brichau committed Jul 23, 2017
commit 6bcefdad575230a9ccc8cd504a31e2d9aceca5ff
3 changes: 3 additions & 0 deletions repository/Grease-Pharo60-Core.package/GRDynamicVariable.class/class/defaultValue.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
defaults
defaultValue
^ nil
3 changes: 3 additions & 0 deletions repository/Grease-Pharo60-Core.package/GRDynamicVariable.class/instance/default.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
default
^ self class defaultValue
5 changes: 4 additions & 1 deletion repository/Grease-Pharo60-Core.package/GRDynamicVariable.class/methodProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"instance" : { },
"instance" : {
"default" : "JohanBrichau 7/23/2017 17:45"
},
"class" : {
"defaultValue" : "JohanBrichau 7/23/2017 17:45",
"use:during:" : "MaxLeske 5/16/2017 21:54"
}
}
2 changes: 1 addition & 1 deletion repository/Grease-Pharo60-Core.package/monticello.meta/version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
(name 'Grease-Pharo60-Core-JohanBrichau.2' message 'Added GRDynamicVariable (copied from Grease-Pharo30-Core-MaxLeske.23)' id 'c95f31f1-ba0c-0d00-9a91-77be09e6dcd5' date '25 May 2017' time '3:29:07.233987 pm' author 'JohanBrichau' ancestors ((name 'Grease-Pharo60-Core-JohanBrichau.1' message 'Split from Grease-Pharo30-Core-PavelKrivanek.22with changes for Pharo6.0 onwards' id 'fec0f92f-b80c-0d00-b4b4-c13800bfc9db' date '25 May 2017' time '12:11:55.651574 pm' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())
(name 'Grease-Pharo60-Core-JohanBrichau.3' 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 'b7f896c0-5f11-0d00-87f2-d9cb08c307d1' date '23 July 2017' time '5:47:27.925141 pm' author 'JohanBrichau' ancestors ((name 'Grease-Pharo60-Core-JohanBrichau.2' message 'Added GRDynamicVariable (copied from Grease-Pharo30-Core-MaxLeske.23)' id 'c95f31f1-ba0c-0d00-9a91-77be09e6dcd5' date '25 May 2017' time '3:29:07.233987 pm' author 'JohanBrichau' ancestors ((name 'Grease-Pharo60-Core-JohanBrichau.1' message 'Split from Grease-Pharo30-Core-PavelKrivanek.22with changes for Pharo6.0 onwards' id 'fec0f92f-b80c-0d00-b4b4-c13800bfc9db' date '25 May 2017' time '12:11:55.651574 pm' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ())
Expand Down
2 changes: 1 addition & 1 deletion ...DynamicVariable.class/instance/default.st → ...namicVariable.class/class/defaultValue.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
defaults
default
defaultValue
^ 'default test value'
8 changes: 4 additions & 4 deletions repository/Grease-Tests-Core.package/GRTestDynamicVariable.class/methodProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"instance" : {
"default" : "JohanBrichau 7/23/2017 16:58"
},
"class" : { }
"instance" : { },
"class" : {
"defaultValue" : "JohanBrichau 7/23/2017 17:44"
}
}
2 changes: 1 addition & 1 deletion repository/Grease-Tests-Core.package/monticello.meta/version
View file
Open in desktop

Large diffs are not rendered by default.