Fix Symbol >> #greaseString

marschall · marschall · commit 69748ef48836 · 2017-09-09T15:56:03.000+02:00
- Fixes SeasideSt#46
diff --git a/repository/Grease-Core.package/String.extension/instance/greaseString.st b/repository/Grease-Core.package/String.extension/instance/greaseString.st
diff --git a/repository/Grease-Core.package/String.extension/methodProperties.json b/repository/Grease-Core.package/String.extension/methodProperties.json
@@ -1,15 +1,14 @@
 {
 	"instance" : {
+		"pluralize" : "jf 9/30/2009 00:37",
 		"excerpt:" : "lr 10/25/2009 11:19",
 		"excerpt:radius:" : "lr 10/25/2009 11:19",
-		"greaseString" : "pmm 9/8/2017 13:45",
 		"truncate" : "lr 10/25/2009 11:17",
-		"excerpt:radius:ellipsis:" : "jf 12/17/2009 10:49",
+		"truncate:" : "lr 10/25/2009 11:17",
+		"truncate:ellipsis:" : "lr 2/7/2008 09:22",
 		"greaseInteger" : "pmm 8/25/2016 14:02",
 		"print:on:" : "lr 7/24/2008 18:19",
-		"pluralize" : "jf 9/30/2009 00:37",
-		"truncate:" : "lr 10/25/2009 11:17",
-		"truncate:ellipsis:" : "lr 2/7/2008 09:22"
+		"excerpt:radius:ellipsis:" : "jf 12/17/2009 10:49"
 	},
 	"class" : { }
 }
diff --git a/repository/Grease-Core.package/monticello.meta/version b/repository/Grease-Core.package/monticello.meta/version
diff --git a/repository/Grease-Pharo60-Core.package/String.extension/instance/greaseString.st b/repository/Grease-Pharo60-Core.package/String.extension/instance/greaseString.st
@@ -0,0 +1,3 @@
+*grease-pharo60-core
+greaseString
+	^ self
diff --git a/repository/Grease-Pharo60-Core.package/String.extension/methodProperties.json b/repository/Grease-Pharo60-Core.package/String.extension/methodProperties.json
@@ -0,0 +1,6 @@
+{
+	"instance" : {
+		"greaseString" : "pmm 9/8/2017 13:45"
+	},
+	"class" : { }
+}
diff --git a/repository/Grease-Pharo60-Core.package/String.extension/properties.json b/repository/Grease-Pharo60-Core.package/String.extension/properties.json
@@ -0,0 +1,3 @@
+{
+	"name" : "String"
+}
diff --git a/repository/Grease-Pharo60-Core.package/Symbol.extension/instance/greaseString.st b/repository/Grease-Pharo60-Core.package/Symbol.extension/instance/greaseString.st
@@ -0,0 +1,3 @@
+*grease-pharo60-core
+greaseString
+	^ self asString
diff --git a/repository/Grease-Pharo60-Core.package/Symbol.extension/methodProperties.json b/repository/Grease-Pharo60-Core.package/Symbol.extension/methodProperties.json
@@ -0,0 +1,6 @@
+{
+	"instance" : {
+		"greaseString" : "pmm 9/9/2017 15:48"
+	},
+	"class" : { }
+}
diff --git a/repository/Grease-Pharo60-Core.package/Symbol.extension/properties.json b/repository/Grease-Pharo60-Core.package/Symbol.extension/properties.json
@@ -0,0 +1,3 @@
+{
+	"name" : "Symbol"
+}
diff --git a/repository/Grease-Pharo60-Core.package/monticello.meta/version b/repository/Grease-Pharo60-Core.package/monticello.meta/version
@@ -1 +1 @@
-(name 'Grease-Pharo60-Core-pmm.8' message 'merged by GitFileTree-MergeDriver' id '49e9a6d2-4afa-43e9-b883-fbc1000ce921' date '9 September 2017' time '1:17:24.700967 pm' author 'pmm' ancestors ((name 'Grease-Pharo60-Core-pmm.7' message 'Small optimization- avoid table lookup in common case' id 'b99d6b17-1115-0d00-9402-d53004aeb9ca' date '8 September 2017' time '5:37:28.7948 pm' author 'pmm' ancestors ((name 'Grease-Pharo60-Core-pmm.6' message 'Add thisContext method to GRPlatform' id 'b01ff64f-d114-0d00-9d20-ac690c6d599d' date '5 September 2017' time '1:31:59.489145 pm' author 'pmm' ancestors ((name 'Grease-Pharo60-Core-pmm.5' message 'Add comments to classes who were previously missing them.' id '3f01c4b7-cc14-0d00-9c48-5d25066d8f9e' date '5 September 2017' time '8:03:06.198613 am' author 'pmm' ancestors ((name 'Grease-Pharo60-Core-pmm.4' message 'Kick explorer support from Pharo 6- Closes #31' id 'f1e4d024-cc14-0d00-9c47-1a66066d8f9e' date '5 September 2017' time '7:22:00.792553 am' author 'pmm' ancestors ((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.22with 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 ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(name 'Grease-Pharo60-Core-JohanBrichau.4' message 'merged by GitFileTree-MergeDriver' id '4a6b82fe-1522-4a8e-b82c-fc7704ba922a' date '23 July 2017' time '11:33:53.453973 am' author 'JohanBrichau' ancestors ((id 'b7f896c0-5f11-0d00-87f2-d9cb08c307d1')) stepChildren ())) stepChildren ())
+(name 'Grease-Pharo60-Core-pmm.9' message 'Fix Symbol >> #greaseString- #46' id '365d1ec1-2315-0d00-978e-af4507fe6076' date '9 September 2017' time '3:53:25.27002 pm' author 'pmm' ancestors ((name 'Grease-Pharo60-Core-pmm.7' message 'Small optimization- avoid table lookup in common case' id 'b99d6b17-1115-0d00-9402-d53004aeb9ca' date '8 September 2017' time '5:37:28.7948 pm' author 'pmm' ancestors ((name 'Grease-Pharo60-Core-pmm.6' message 'Add thisContext method to GRPlatform' id 'b01ff64f-d114-0d00-9d20-ac690c6d599d' date '5 September 2017' time '1:31:59.489145 pm' author 'pmm' ancestors () stepChildren ())) stepChildren ())) stepChildren ())
diff --git a/repository/Grease-Tests-Core.package/GRDynamicVariableTest.class/methodProperties.json b/repository/Grease-Tests-Core.package/GRDynamicVariableTest.class/methodProperties.json
@@ -1,9 +1,10 @@
 {
-	"class" : {
-		 },
 	"instance" : {
+		"testWithoutValue" : "MaxLeske 5/18/2017 07:42",
 		"testAnswer" : "MaxLeske 5/18/2017 07:42",
-		"testDefaultValue" : "JohanBrichau 9/9/2017 11:09",
 		"testWithNestedValue" : "MaxLeske 5/18/2017 07:42",
-		"testWithValue" : "MaxLeske 5/18/2017 07:42",
-		"testWithoutValue" : "MaxLeske 5/18/2017 07:42" } }
+		"testDefaultValue" : "JohanBrichau 9/9/2017 11:09",
+		"testWithValue" : "MaxLeske 5/18/2017 07:42"
+	},
+	"class" : { }
+}
diff --git a/repository/Grease-Tests-Core.package/GRNotificationBasedDynamicVariableTest.class/methodProperties.json b/repository/Grease-Tests-Core.package/GRNotificationBasedDynamicVariableTest.class/methodProperties.json
@@ -1,10 +1,10 @@
 {
 	"instance" : {
-		"testWithoutValue" : "JohanBrichau 9/9/2017 10:52",
-		"testAnswer" : "JohanBrichau 9/9/2017 10:52",
+		"testWithoutValue" : "pmm 9/5/2017 14:39",
+		"testAnswer" : "pmm 9/5/2017 14:37",
 		"testWithNestedValue" : "pmm 9/5/2017 14:38",
 		"testDefaultValue" : "JohanBrichau 9/9/2017 11:10",
-		"testWithValue" : "JohanBrichau 9/9/2017 10:52"
+		"testWithValue" : "pmm 9/5/2017 14:39"
 	},
 	"class" : { }
 }
diff --git a/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testGreaseString.st b/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testGreaseString.st
@@ -2,6 +2,7 @@ tests
 testGreaseString
 	self assert: 'Timberwolf' greaseString = 'Timberwolf'.
 	self assert: #DireWolf greaseString = 'DireWolf'.
+	self deny: #DireWolf greaseString isSymbol.
 	self assert: true greaseString = 'true'.
 	self assert: 666 greaseString = '666'.
 	"make sure we're not immediate"
diff --git a/repository/Grease-Tests-Core.package/GRPlatformTest.class/methodProperties.json b/repository/Grease-Tests-Core.package/GRPlatformTest.class/methodProperties.json
@@ -23,7 +23,7 @@
 		"testStackDepth" : "lr 9/29/2009 22:54",
 		"testBlockValuableProtocol" : "jf 12/18/2009 12:26",
 		"testSecureHashFor" : "lr 3/16/2009 19:18",
-		"testGreaseString" : "pmm 7/16/2015 15:58",
+		"testGreaseString" : "pmm 9/9/2017 15:45",
 		"testDaysInMonthForYear" : "jf 12/18/2009 10:30",
 		"testGreaseIntegerOnString" : "jf 9/30/2009 01:08",
 		"testReadWriteStreamNegativeSkip" : "jf 9/30/2009 00:19",
diff --git a/repository/Grease-Tests-Core.package/monticello.meta/version b/repository/Grease-Tests-Core.package/monticello.meta/version

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+*grease-pharo60-core`
	`2`	`+greaseString`
	`3`	`+ ^ self`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-(name 'Grease-Pharo60-Core-pmm.8' message 'merged by GitFileTree-MergeDriver' id '49e9a6d2-4afa-43e9-b883-fbc1000ce921' date '9 September 2017' time '1:17:24.700967 pm' author 'pmm' ancestors ((name 'Grease-Pharo60-Core-pmm.7' message 'Small optimization- avoid table lookup in common case' id 'b99d6b17-1115-0d00-9402-d53004aeb9ca' date '8 September 2017' time '5:37:28.7948 pm' author 'pmm' ancestors ((name 'Grease-Pharo60-Core-pmm.6' message 'Add thisContext method to GRPlatform' id 'b01ff64f-d114-0d00-9d20-ac690c6d599d' date '5 September 2017' time '1:31:59.489145 pm' author 'pmm' ancestors ((name 'Grease-Pharo60-Core-pmm.5' message 'Add comments to classes who were previously missing them.' id '3f01c4b7-cc14-0d00-9c48-5d25066d8f9e' date '5 September 2017' time '8:03:06.198613 am' author 'pmm' ancestors ((name 'Grease-Pharo60-Core-pmm.4' message 'Kick explorer support from Pharo 6- Closes #31' id 'f1e4d024-cc14-0d00-9c47-1a66066d8f9e' date '5 September 2017' time '7:22:00.792553 am' author 'pmm' ancestors ((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 ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(name 'Grease-Pharo60-Core-JohanBrichau.4' message 'merged by GitFileTree-MergeDriver' id '4a6b82fe-1522-4a8e-b82c-fc7704ba922a' date '23 July 2017' time '11:33:53.453973 am' author 'JohanBrichau' ancestors ((id 'b7f896c0-5f11-0d00-87f2-d9cb08c307d1')) stepChildren ())) stepChildren ())
	`1`	+(name 'Grease-Pharo60-Core-pmm.9' message 'Fix Symbol >> #greaseString- #46' id '365d1ec1-2315-0d00-978e-af4507fe6076' date '9 September 2017' time '3:53:25.27002 pm' author 'pmm' ancestors ((name 'Grease-Pharo60-Core-pmm.7' message 'Small optimization- avoid table lookup in common case' id 'b99d6b17-1115-0d00-9402-d53004aeb9ca' date '8 September 2017' time '5:37:28.7948 pm' author 'pmm' ancestors ((name 'Grease-Pharo60-Core-pmm.6' message 'Add thisContext method to GRPlatform' id 'b01ff64f-d114-0d00-9d20-ac690c6d599d' date '5 September 2017' time '1:31:59.489145 pm' author 'pmm' ancestors () stepChildren ())) stepChildren ())) stepChildren ())