From 4cc1c32ae24f4734a1062c465fcb93a91ffa48a7 Mon Sep 17 00:00:00 2001 From: Marcus Denker Date: Fri, 10 Jul 2020 08:53:00 +0200 Subject: [PATCH] #methodComments is a strang method... it returns all comments at the level of the method, but including comments on arguments. There are no clients. It is not clear why this is needed as an API method. --- src/AST-Core/RBMethodNode.class.st | 8 -------- src/AST-Core/RBProgramNode.class.st | 5 ----- src/AST-Core/RBSequenceNode.class.st | 10 ---------- src/Deprecated90/RBMethodNode.extension.st | 9 +++++++++ src/Deprecated90/RBProgramNode.extension.st | 9 +++++++++ src/Deprecated90/RBSequenceNode.extension.st | 12 ++++++++++++ 6 files changed, 30 insertions(+), 23 deletions(-) create mode 100644 src/Deprecated90/RBProgramNode.extension.st create mode 100644 src/Deprecated90/RBSequenceNode.extension.st diff --git a/src/AST-Core/RBMethodNode.class.st b/src/AST-Core/RBMethodNode.class.st index cb26adda4a5..7d7ab4c6313 100644 --- a/src/AST-Core/RBMethodNode.class.st +++ b/src/AST-Core/RBMethodNode.class.st @@ -472,14 +472,6 @@ RBMethodNode >> methodClass: aClass [ self compilationContext class: aClass ] -{ #category : #accessing } -RBMethodNode >> methodComments [ - | methodComments | - methodComments := OrderedCollection withAll: self comments. - arguments do: [:each | methodComments addAll: each comments]. - ^methodComments asSortedCollection: [:a :b | a start < b start] -] - { #category : #accessing } RBMethodNode >> methodNode [ ^self diff --git a/src/AST-Core/RBProgramNode.class.st b/src/AST-Core/RBProgramNode.class.st index 74d84bb3caa..5ab2ffa7867 100644 --- a/src/AST-Core/RBProgramNode.class.st +++ b/src/AST-Core/RBProgramNode.class.st @@ -655,11 +655,6 @@ RBProgramNode >> matchList: matchNodes index: matchIndex against: programNodes i inContext: aDictionary ] -{ #category : #accessing } -RBProgramNode >> methodComments [ - ^self comments -] - { #category : #accessing } RBProgramNode >> methodNode [ ^parent ifNotNil: [parent methodNode] diff --git a/src/AST-Core/RBSequenceNode.class.st b/src/AST-Core/RBSequenceNode.class.st index ecb7ac270cc..532d4c94646 100644 --- a/src/AST-Core/RBSequenceNode.class.st +++ b/src/AST-Core/RBSequenceNode.class.st @@ -358,16 +358,6 @@ RBSequenceNode >> match: aNode inContext: aDictionary [ inContext: aDictionary] ] -{ #category : #accessing } -RBSequenceNode >> methodComments [ - | methodComments | - methodComments := OrderedCollection withAll: self comments. - temporaries do: [:each | methodComments addAll: each comments]. - (parent notNil and: [parent isBlock]) - ifTrue: [parent arguments do: [:each | methodComments addAll: each comments]]. - ^methodComments asSortedCollection: [:a :b | a start < b start] -] - { #category : #'accessing-token' } RBSequenceNode >> periods [ ^ periods diff --git a/src/Deprecated90/RBMethodNode.extension.st b/src/Deprecated90/RBMethodNode.extension.st index ff428c79115..1eb55f24f3d 100644 --- a/src/Deprecated90/RBMethodNode.extension.st +++ b/src/Deprecated90/RBMethodNode.extension.st @@ -1,5 +1,14 @@ Extension { #name : #RBMethodNode } +{ #category : #'*Deprecated90' } +RBMethodNode >> methodComments [ + | methodComments | + self deprecated: 'no users, will be removed in Pharo10'. + methodComments := OrderedCollection withAll: self comments. + arguments do: [:each | methodComments addAll: each comments]. + ^methodComments asSortedCollection: [:a :b | a start < b start] +] + { #category : #'*Deprecated90' } RBMethodNode >> primitiveSources [ self deprecated: 'please use the #pragmas directly'. diff --git a/src/Deprecated90/RBProgramNode.extension.st b/src/Deprecated90/RBProgramNode.extension.st new file mode 100644 index 00000000000..1956a398aa5 --- /dev/null +++ b/src/Deprecated90/RBProgramNode.extension.st @@ -0,0 +1,9 @@ +Extension { #name : #RBProgramNode } + +{ #category : #'*Deprecated90' } +RBProgramNode >> methodComments [ + self + deprecated: 'Please use #comments instead' + transformWith: '`@receiver methodComments' -> '`@receiver comments'. + ^self comments +] diff --git a/src/Deprecated90/RBSequenceNode.extension.st b/src/Deprecated90/RBSequenceNode.extension.st new file mode 100644 index 00000000000..8c50da334ba --- /dev/null +++ b/src/Deprecated90/RBSequenceNode.extension.st @@ -0,0 +1,12 @@ +Extension { #name : #RBSequenceNode } + +{ #category : #'*Deprecated90' } +RBSequenceNode >> methodComments [ + | methodComments | + self deprecated: 'no users, will be removed in Pharo10'. + methodComments := OrderedCollection withAll: self comments. + temporaries do: [:each | methodComments addAll: each comments]. + (parent notNil and: [parent isBlock]) + ifTrue: [parent arguments do: [:each | methodComments addAll: each comments]]. + ^methodComments asSortedCollection: [:a :b | a start < b start] +]