Ported ANSI Booleans transformation Slime rule

Johan Brichau · Johan Brichau · commit 002bf2e272bd · 2024-01-07T20:05:55.000+01:00
diff --git a/repository/Grease-Pharo110-Slime.package/GRAnsiBooleansRule.class/README.md b/repository/Grease-Pharo110-Slime.package/GRAnsiBooleansRule.class/README.md
diff --git a/repository/Grease-Pharo110-Slime.package/GRAnsiBooleansRule.class/instance/group.st b/repository/Grease-Pharo110-Slime.package/GRAnsiBooleansRule.class/instance/group.st
@@ -0,0 +1,4 @@
+accessing
+group
+
+	^ 'ANSI Compatibility'
diff --git a/repository/Grease-Pharo110-Slime.package/GRAnsiBooleansRule.class/instance/initialize.st b/repository/Grease-Pharo110-Slime.package/GRAnsiBooleansRule.class/instance/initialize.st
@@ -0,0 +1,19 @@
+initialization
+initialize
+
+	super initialize.
+	self
+		replace: '``@expr1 and: [ | `@temp2 | ``@expr2 ] and: [ | `@temp3 | ``@expr3 ]'
+			with: '``@expr1 and: [ | `@temp2 | ``@expr2 and: [ | `@temp3 | ``@expr3 ] ]';
+		replace: '``@expr1 and: [ | `@temp2 | ``@expr2 ] and: [ | `@temp3 | ``@expr3 ] and: [ | `@temp4 | ``@expr4 ]'
+			with: '``@expr1 and: [ | `@temp2 | ``@expr2 and: [ | `@temp3 | ``@expr3 and: [ | `@temp4 | ``@expr4 ] ] ]';
+		replace: '``@expr1 and: [ | `@temp2 | ``@expr2 ] and: [ | `@temp3 | ``@expr3 ] and: [ | `@temp4 | ``@expr4 ] and: [  | `@temp5 | ``@expr5 ]'
+			with: '``@expr1 and: [ | `@temp2 | ``@expr2 and: [ | `@temp3 | ``@expr3 and: [ | `@temp4 | ``@expr4 and: [ | `@temp5 | ``@expr5 ] ] ] ]';
+		replace: '``@expr1 or: [ | `@temp2 | ``@expr2 ] or: [ | `@temp3 | ``@expr3 ]'
+			with: '``@expr1 or: [ | `@temp2 | ``@expr2 or: [ | `@temp3 | ``@expr3 ] ]';
+		replace: '``@expr1 or: [ | `@temp2 | ``@expr2 ] or: [ | `@temp3 | ``@expr3 ] or: [ | `@temp4 | ``@expr4 ]'
+			with: '``@expr1 or: [ | `@temp2 | ``@expr2 or: [ | `@temp3 | ``@expr3 or: [ | `@temp4 | ``@expr4 ] ] ]';
+		replace: '``@expr1 or: [ | `@temp2 | ``@expr2 ] or: [ | `@temp3 | ``@expr3 ] or: [ | `@temp4 | ``@expr4 ] or: [ | `@temp5 | ``@expr5 ]'
+			with: '``@expr1 or: [ | `@temp2 | ``@expr2 or: [ | `@temp3 | ``@expr3 or: [ | `@temp4 | ``@expr4 or: [ | `@temp5 | ``@expr5 ] ] ] ]';
+		replace: '``@expr1 or: [ | `@temp2 | ``@expr2 ] or: [ | `@temp3 | ``@expr3 ] or: [ | `@temp4 | ``@expr4 ] or: [ | `@temp5 | ``@expr5 ] or: [ | `@temp6 | ``@expr6 ]'
+			with: '``@expr1 or: [ | `@temp2 | ``@expr2 or: [ | `@temp3 | ``@expr3 or: [ | `@temp4 | ``@expr4 or: [ | `@temp5 | ``@expr5 or: [ | `@temp6 | ``@expr6 ] ] ] ] ]'
diff --git a/repository/Grease-Pharo110-Slime.package/GRAnsiBooleansRule.class/instance/name.st b/repository/Grease-Pharo110-Slime.package/GRAnsiBooleansRule.class/instance/name.st
@@ -0,0 +1,4 @@
+accessing
+name
+
+	^ 'Booleans'
diff --git a/repository/Grease-Pharo110-Slime.package/GRAnsiBooleansRule.class/instance/rationale.st b/repository/Grease-Pharo110-Slime.package/GRAnsiBooleansRule.class/instance/rationale.st
@@ -0,0 +1,4 @@
+accessing
+rationale
+
+	^ '#and:and: and #or:or: are not ANSI compatible.'
diff --git a/repository/Grease-Pharo110-Slime.package/GRAnsiBooleansRule.class/properties.json b/repository/Grease-Pharo110-Slime.package/GRAnsiBooleansRule.class/properties.json
@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "",
+	"super" : "GRReSlimeTransformationRule",
+	"category" : "Grease-Pharo110-Slime",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "GRAnsiBooleansRule",
+	"type" : "normal"
+}
diff --git a/repository/Grease-Pharo110-Slime.package/GRAnsiCharactersRule.class/README.md b/repository/Grease-Pharo110-Slime.package/GRAnsiCharactersRule.class/README.md
diff --git a/repository/Grease-Pharo110-Slime.package/GRAnsiCharactersRule.class/properties.json b/repository/Grease-Pharo110-Slime.package/GRAnsiCharactersRule.class/properties.json
@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "",
+	"super" : "GRReSlimeTransformationRule",
+	"category" : "Grease-Pharo110-Slime",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "GRAnsiCharactersRule",
+	"type" : "normal"
+}
diff --git a/repository/Grease-Pharo110-Slime.package/GRReSlimeBlockLintRule.class/class/isVisible.st b/repository/Grease-Pharo110-Slime.package/GRReSlimeBlockLintRule.class/class/isVisible.st
@@ -0,0 +1,4 @@
+testing
+isVisible
+
+	^ self name ~= #GRReSlimeBlockLintRule
diff --git a/repository/Grease-Pharo110-Slime.package/GRReSlimeParseTreeLintRule.class/class/isVisible.st b/repository/Grease-Pharo110-Slime.package/GRReSlimeParseTreeLintRule.class/class/isVisible.st
@@ -0,0 +1,4 @@
+testing
+isVisible
+
+	^ self name ~= #GRReSlimeParseTreeLintRule
diff --git a/repository/Grease-Pharo110-Slime.package/GRReSlimeTransformationRule.class/README.md b/repository/Grease-Pharo110-Slime.package/GRReSlimeTransformationRule.class/README.md
diff --git a/repository/Grease-Pharo110-Slime.package/GRReSlimeTransformationRule.class/class/isVisible.st b/repository/Grease-Pharo110-Slime.package/GRReSlimeTransformationRule.class/class/isVisible.st
@@ -0,0 +1,4 @@
+testing
+isVisible
+
+	^ self name ~= #GRReSlimeTransformationRule
diff --git a/repository/Grease-Pharo110-Slime.package/GRReSlimeTransformationRule.class/properties.json b/repository/Grease-Pharo110-Slime.package/GRReSlimeTransformationRule.class/properties.json
@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "",
+	"super" : "ReNodeRewriteRule",
+	"category" : "Grease-Pharo110-Slime",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "GRReSlimeTransformationRule",
+	"type" : "normal"
+}
diff --git a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/rules.st b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/rules.st
@@ -4,5 +4,5 @@ rules
 	^ (OrderedCollection new
 		addAll: GRReSlimeBlockLintRule allSubclasses;
 		addAll: GRReSlimeParseTreeLintRule allSubclasses;
-"		addAll: GRSlimeTransformationRule allSubclasses;"
+		addAll: GRReSlimeTransformationRule allSubclasses;
 		yourself) reject: #isAbstract
diff --git a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/runTransformation.changes..st b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/runTransformation.changes..st
@@ -2,14 +2,14 @@ running-checks
 runTransformation: aClass changes: aCollection
 
 	| expected |
-	expected := aCollection 
-		collect: [ :each | RBParser parseMethod: each ].
-	self run: aClass ignoring: Array new do: [ :rule :rules |
-		rule changes do: [ :change |
+	expected := aCollection collect: [ :each | RBParser parseMethod: each ].
+	self run: aClass ignoring: Array new do: [ :critiques | | changes |
+		changes := critiques collect:[ :critique | critique change ].
+		changes do: [ :change |
 			self
 				assert: (expected anySatisfy: [ :parseTree | change parseTree = parseTree ])
-				description: change selector , ' should not be transformed' ].
+				description: ('{1} should not be transformed' format: { change selector }) ].
 		expected do: [ :parseTree |
 			self
-				assert: (rule changes anySatisfy: [ :change | change parseTree = parseTree ])
-				description: parseTree selector , ' should be transformed' ] ]
+				assert: (changes anySatisfy: [ :change | change parseTree = parseTree ])
+				description: ('{1} should be transformed' format: { parseTree selector }) ] ]
diff --git a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testAnsiBooleansRule.st b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testAnsiBooleansRule.st
@@ -1,6 +1,6 @@
 tests-transform
 testAnsiBooleansRule
-	<expectedFailure>
+
 	| class |
 	class := self defineSubClassOf: #GRObject.
 	self compile: 'and 1 and: [ 2 ] and: [ 3 ] and: [ 4 ]' in: class.
diff --git a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testReferencesNotPortableClass.st b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testReferencesNotPortableClass.st
@@ -8,4 +8,4 @@ testReferencesNotPortableClass
 	self compile: 'valid ^ GRObject new' in: class.
 	self 
 		assertRule: GRReferencesNotPortableClassRule
-		matches: { class>>#invalid }.
+		matches: { class>>#invalid }
diff --git a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testUnnecessaryLastPeriodRule.st b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testUnnecessaryLastPeriodRule.st
diff --git a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testUsesNotPortableClass.st b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testUsesNotPortableClass.st
@@ -8,4 +8,4 @@ testUsesNotPortableClass
 	self compile: 'valid ^ GRObject new' in: class.
 	self 
 		assertRule: GRReferencesNotPortableClassRule
-		matches: { class>>#invalid }.
+		matches: { class>>#invalid }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +accessing
 +group
++
 +	^ 'ANSI Compatibility'