From 40550357fa9a71d4362524dc313b801fa142b7a8 Mon Sep 17 00:00:00 2001 From: Denis Kudriashov Date: Sun, 21 Jun 2020 17:18:39 +0100 Subject: [PATCH] remove #variable part from "varNode binding variable". Now #binding returns actual variable. --- src/NautilusRefactoring/RBGlobalNode.extension.st | 2 +- src/OpalCompiler-Core/OCASTTranslatorForEffect.class.st | 2 +- src/Reflectivity/MetalinkTargetResolver.class.st | 2 +- src/Reflectivity/RFASTTranslator.class.st | 2 +- src/Reflectivity/RFASTTranslatorForEffect.class.st | 2 +- src/Reflectivity/RFSemanticAnalyzer.class.st | 2 +- src/Reflectivity/RFVariableReification.class.st | 2 +- src/Reflectivity/Variable.extension.st | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/NautilusRefactoring/RBGlobalNode.extension.st b/src/NautilusRefactoring/RBGlobalNode.extension.st index 7b72be040c0..dbe869351af 100644 --- a/src/NautilusRefactoring/RBGlobalNode.extension.st +++ b/src/NautilusRefactoring/RBGlobalNode.extension.st @@ -3,5 +3,5 @@ Extension { #name : #RBGlobalNode } { #category : #'*NautilusRefactoring' } RBGlobalNode >> executeRenameRefactoringBy: aNautilusRefactoring [ - self binding variable executeRenameRefactoringBy: aNautilusRefactoring inClass: self methodNode methodClass + self binding executeRenameRefactoringBy: aNautilusRefactoring inClass: self methodNode methodClass ] diff --git a/src/OpalCompiler-Core/OCASTTranslatorForEffect.class.st b/src/OpalCompiler-Core/OCASTTranslatorForEffect.class.st index d93589f7c47..e8091fe92bb 100644 --- a/src/OpalCompiler-Core/OCASTTranslatorForEffect.class.st +++ b/src/OpalCompiler-Core/OCASTTranslatorForEffect.class.st @@ -117,5 +117,5 @@ OCASTTranslatorForEffect >> visitVariableNode: aVariableNode [ | binding | binding := aVariableNode binding. (binding isLiteralVariable or: [ binding isUndeclared ]) - ifTrue: [ methodBuilder addLiteral: binding variable ] + ifTrue: [ methodBuilder addLiteral: binding ] ] diff --git a/src/Reflectivity/MetalinkTargetResolver.class.st b/src/Reflectivity/MetalinkTargetResolver.class.st index d1faf126ee7..695c57a1a5e 100644 --- a/src/Reflectivity/MetalinkTargetResolver.class.st +++ b/src/Reflectivity/MetalinkTargetResolver.class.st @@ -148,5 +148,5 @@ MetalinkTargetResolver class >> temporaryNamed: aTempVarName inMethod: aMethodNa { #category : #'resolving - private' } MetalinkTargetResolver class >> usingNodesForVariable: aVarOrSlot in: classes [ ^ (classes flatCollect: [ :c | c variableNodes ]) - select: [ :each | each binding variable == aVarOrSlot ] + select: [ :each | each binding == aVarOrSlot ] ] diff --git a/src/Reflectivity/RFASTTranslator.class.st b/src/Reflectivity/RFASTTranslator.class.st index 1cb01beef76..cdc2defbe2a 100644 --- a/src/Reflectivity/RFASTTranslator.class.st +++ b/src/Reflectivity/RFASTTranslator.class.st @@ -299,7 +299,7 @@ RFASTTranslator >> visitVariableNode: aVariableNode [ self emitMetaLinkBefore: aVariableNode. aVariableNode hasMetalinkInstead ifTrue: [ self emitMetaLinkInstead: aVariableNode ] - ifFalse: [ self visitVariableValue: aVariableNode binding variable]. + ifFalse: [ self visitVariableValue: aVariableNode binding]. self emitMetaLinkAfterNoEnsure: aVariableNode. diff --git a/src/Reflectivity/RFASTTranslatorForEffect.class.st b/src/Reflectivity/RFASTTranslatorForEffect.class.st index b0a72f77b74..8315b6d4bdb 100644 --- a/src/Reflectivity/RFASTTranslatorForEffect.class.st +++ b/src/Reflectivity/RFASTTranslatorForEffect.class.st @@ -137,7 +137,7 @@ RFASTTranslatorForEffect >> visitVariableNode: aVariableNode [ "when visiting a variable for effect, we could push it and then pop it, but we do nothing" binding := aVariableNode binding. (binding isLiteralVariable or: [ binding isUndeclared ]) - ifTrue: [ methodBuilder addLiteral: binding variable ]. + ifTrue: [ methodBuilder addLiteral: binding ]. self emitMetaLinkAfterNoEnsure: aVariableNode. diff --git a/src/Reflectivity/RFSemanticAnalyzer.class.st b/src/Reflectivity/RFSemanticAnalyzer.class.st index b2bc878656c..169dc06b563 100644 --- a/src/Reflectivity/RFSemanticAnalyzer.class.st +++ b/src/Reflectivity/RFSemanticAnalyzer.class.st @@ -44,7 +44,7 @@ RFSemanticAnalyzer >> analyseForLinksForNodes: aNode [ { #category : #visiting } RFSemanticAnalyzer >> analyseForLinksForVariables: aVariableNode [ | variable generator | - variable := aVariableNode binding variable. + variable := aVariableNode binding. variable hasMetalink ifFalse: [ ^ self ]. generator := HookGeneratorForVariables entity: variable node: aVariableNode. diff --git a/src/Reflectivity/RFVariableReification.class.st b/src/Reflectivity/RFVariableReification.class.st index 5a460399a67..a7eff85cee1 100644 --- a/src/Reflectivity/RFVariableReification.class.st +++ b/src/Reflectivity/RFVariableReification.class.st @@ -36,5 +36,5 @@ RFVariableReification >> genForLiteralVariable [ RFVariableReification >> genForRBVariableNode [ entity isTemp ifTrue: [ ^self error: 'Temps can not be reified yet' ]. - ^RFLiteralVariableNode value: entity binding variable + ^RFLiteralVariableNode value: entity binding ] diff --git a/src/Reflectivity/Variable.extension.st b/src/Reflectivity/Variable.extension.st index f643eb49e46..bc5a5eae75f 100644 --- a/src/Reflectivity/Variable.extension.st +++ b/src/Reflectivity/Variable.extension.st @@ -21,7 +21,7 @@ Variable >> assignmentNodes [ Variable >> astNodes [ "by default we search the usingMethods for all AST nodes" ^self usingMethods flatCollect: [ :method | - method variableNodes select: [: each| each binding variable == self ]] + method variableNodes select: [: each| each binding == self ]] ] { #category : #'*Reflectivity' }