better fix: implement #isGlobal on the AST level with the semantic th…

…at it is not global if it is isUndeclared
pharo-project · Jul 9, 2020 · f852d7f · f852d7f
1 parent 4422130
commit f852d7f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/OpalCompiler-Core/RBVariableNode.extension.st b/src/OpalCompiler-Core/RBVariableNode.extension.st
@@ -29,7 +29,7 @@ RBVariableNode >> isClean [
 { #category : #'*opalcompiler-core' }
 RBVariableNode >> isGlobal [
 	"the semantics here is bad: all Literal Variables are Globals on the AST Level"
-	^self binding isLiteralVariable
+	^variable isLiteralVariable and: [ variable isUndeclared not]
 ]
 
 { #category : #'*opalcompiler-core' }

diff --git a/src/Shout/SHRBTextStyler.class.st b/src/Shout/SHRBTextStyler.class.st
@@ -1024,7 +1024,7 @@ SHRBTextStyler >> resolveStyleFor: aVariableNode [
 	aVariableNode binding ifNil: [^#default].
 	aVariableNode isArg ifTrue: [ ^#methodArg].
 	aVariableNode isTemp ifTrue: [ ^#tempVar].
-	(aVariableNode isGlobal and: [ aVariableNode isUndeclared not]) ifTrue: [ ^#globalVar].
+	aVariableNode isGlobal ifTrue: [ ^#globalVar].
 	aVariableNode isInstance ifTrue: [ ^#instVar]. 
 
 	(self class formatIncompleteIdentifiers and: [ aVariableNode hasIncompleteIdentifier ])