Merge pull request #108 from jecisc/follow-Pharo9-AST-changes

follow-Pharo9-AST-changes
jecisc · Aug 13, 2020 · 23e5380 · 23e5380
2 parents efc0de5 + 7e1277a
commit 23e5380
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 25 deletions.
diff --git a/src/BaselineOfChanel/BaselineOfChanel.class.st b/src/BaselineOfChanel/BaselineOfChanel.class.st
@@ -7,29 +7,32 @@ Class {
 	#category : #BaselineOfChanel
 }
 
-{ #category : #baseline }
+{ #category : #baselines }
 BaselineOfChanel >> baseline: spec [
 	<baseline>
-	spec
-		for: #common
-		do: [ self
-				iterators: spec;
-				tinyLogger: spec.
+	spec for: #common do: [ 
+		self
+			iterators: spec;
+			tinyLogger: spec.
 
-			spec
-				package: 'Chanel' with: [ spec requires: #('Iterators' 'TinyLogger') ];
-				package: 'Chanel-Tests' with: [ spec requires: #('Chanel') ].
+		spec
+			package: 'Chanel' with: [ spec requires: #( 'Iterators' 'TinyLogger' ) ];
+			package: 'Chanel-Tests' with: [ spec requires: #( 'Chanel' ) ].
 
-			spec
-				group: 'Core' with: #('Chanel');
-				group: 'Tests' with: #('Chanel-Tests') ].
+		spec
+			group: 'Core' with: #( 'Chanel' );
+			group: 'Tests' with: #( 'Chanel-Tests' ) ].
 
-	spec
-		for: #(#'pharo7.x')
-		do: [ self pharoBackwardCompatibility: spec.
-			spec
-				package: 'Chanel-Pharo7';
-				package: 'Chanel-Tests' with: [ spec requires: #('Chanel-Pharo7' 'PharoBackwardCompatibility') ] ]
+	spec for: #( #'pharo7.x' ) do: [ 
+		self pharoBackwardCompatibility: spec.
+		spec
+			package: 'Chanel-Pharo7';
+			package: 'Chanel-Tests' with: [ spec requires: #( 'Chanel-Pharo7' 'PharoBackwardCompatibility' ) ] ].
+
+	spec for: #( #'pharo7.x' #'pharo8.x' ) do: [ 
+		spec
+			package: 'Chanel-Pharo8';
+			package: 'Chanel' with: [ spec requires: #( 'Chanel-Pharo8' ) ] ]
 ]
 
 { #category : #dependencies }

diff --git a/src/Chanel-Pharo8/RBVariableNode.extension.st b/src/Chanel-Pharo8/RBVariableNode.extension.st
@@ -0,0 +1,6 @@
+Extension { #name : #RBVariableNode }
+
+{ #category : #'*Chanel-Pharo8' }
+RBVariableNode class >> superNode [
+	^ self named: #super
+]
diff --git a/src/Chanel-Pharo8/package.st b/src/Chanel-Pharo8/package.st
@@ -0,0 +1 @@
+Package { #name : #'Chanel-Pharo8' }
diff --git a/src/Chanel-Tests/ChanelClassifyUnclassifiedMethodsCleanerTest.class.st b/src/Chanel-Tests/ChanelClassifyUnclassifiedMethodsCleanerTest.class.st
@@ -13,7 +13,7 @@ ChanelClassifyUnclassifiedMethodsCleanerTest >> setUp [
 	class := self createDefaultClass
 ]
 
-{ #category : #running }
+{ #category : #tests }
 ChanelClassifyUnclassifiedMethodsCleanerTest >> testCannotCategorizeUncategorizedMethodNotPresentInProtocolOrganizer [
 	class compile: 'badetitou'. 
 
@@ -24,7 +24,7 @@ ChanelClassifyUnclassifiedMethodsCleanerTest >> testCannotCategorizeUncategorize
 	self assert: (class >> #badetitou) protocol equals: 'as yet unclassified'
 ]
 
-{ #category : #running }
+{ #category : #tests }
 ChanelClassifyUnclassifiedMethodsCleanerTest >> testCategorizeUncategorizedClassMethod [
 	class class compile: 'initialize'. 
 
@@ -35,7 +35,7 @@ ChanelClassifyUnclassifiedMethodsCleanerTest >> testCategorizeUncategorizedClass
 	self deny: (class class >> #initialize) protocol equals: 'as yet unclassified'
 ]
 
-{ #category : #running }
+{ #category : #tests }
 ChanelClassifyUnclassifiedMethodsCleanerTest >> testCategorizeUncategorizedMethod [
 	class compile: 'initialize'. 
 
@@ -46,7 +46,7 @@ ChanelClassifyUnclassifiedMethodsCleanerTest >> testCategorizeUncategorizedMetho
 	self deny: (class >> #initialize) protocol equals: 'as yet unclassified'
 ]
 
-{ #category : #running }
+{ #category : #tests }
 ChanelClassifyUnclassifiedMethodsCleanerTest >> testCategorizeUncategorizedMethodFromTrait [
 	class := self createDefaultTrait.
 
@@ -59,7 +59,7 @@ ChanelClassifyUnclassifiedMethodsCleanerTest >> testCategorizeUncategorizedMetho
 	self deny: (class >> #initialize) protocol equals: 'as yet unclassified'
 ]
 
-{ #category : #running }
+{ #category : #tests }
 ChanelClassifyUnclassifiedMethodsCleanerTest >> testDontCategorizeCategorizedMethod [
 	class compile: 'initialize' classified: 'peacock'. 
 
@@ -68,7 +68,7 @@ ChanelClassifyUnclassifiedMethodsCleanerTest >> testDontCategorizeCategorizedMet
 	self assert: (class >> #initialize) protocol equals: 'peacock'
 ]
 
-{ #category : #running }
+{ #category : #tests }
 ChanelClassifyUnclassifiedMethodsCleanerTest >> testDontCategorizeExtensionMethods [
 	class compile: 'initialize' classified: self extensionProtocol. 
 

diff --git a/src/Chanel/RBMessageNode.extension.st b/src/Chanel/RBMessageNode.extension.st
@@ -35,7 +35,7 @@ RBMessageNode >> isSuperSendTo: aSelector [
 
 { #category : #'*Chanel' }
 RBMessageNode class >> superSendTo: aSelector [
-	^ self receiver: (RBVariableNode named: #super) selector: aSelector
+  ^self receiver: RBVariableNode superNode selector: aSelector
 ]
 
 { #category : #'*Chanel' }