Skip to content

Fixing overlay experiments with instance variables #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
adri09070 wants to merge 10 commits into
base: master
Choose a base branch
from
Draft

Fixing overlay experiments with instance variables #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6b4de4b
updating ASTInterpreter and visitors according to nez API for Tempora…
adri09070 Aug 18, 2022
474dbd3
updating ASTInterpreter and ASTPostOrderTreeVisitor according to new …
adri09070 Aug 30, 2022
cae98fc
Merge pull request #1 from adri09070/Pharo11
adri09070 Sep 6, 2022
91d5689
removing deprecated spec-debugger dependency + adding espell dependen…
adri09070 Sep 6, 2022
a6aed4d
Merge pull request #2 from adri09070/fixing-baseline-dependencies
adri09070 Sep 9, 2022
0d010c7
Merge 34491bb2ac9f3c256eb734f8856e61c0ca1a9297
adri09070 Sep 23, 2022
21444f5
synch with RMODINRIA/DebuggableASTInterpreter
adri09070 Sep 23, 2022
cb8c885
putting ghost again in baseline
adri09070 Sep 23, 2022
01dd510
fixing instance variable overlays
adri09070 Sep 23, 2022
3571498
Merge branch 'master' into test-ghost-overlay
adri09070 Sep 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions BaselineOfDebuggableASTInterpreter/BaselineOfDebuggableASTInterpreter.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,23 @@ Class {
BaselineOfDebuggableASTInterpreter >> baseline: spec [

<baseline>
spec for: #common do: [
spec for: #common do: [ "Dependencies""Groups"
spec
baseline: 'Ghost'
with: [ spec repository: 'gitlab://gitlab.inria.fr:RMOD/Ghost' ].

"Packages"
spec
package: 'DebuggableASTInterpreter';
package: 'DebuggableASTDebugger' with: [
spec requires: #( 'DebuggableASTInterpreter' ) ] ].
package: 'DebuggableASTDebugger'
with: [ spec requires: #( 'DebuggableASTInterpreter' ) ];
package: 'DebuggableASTInterpreterOverlays'
with: [ spec requires: #( 'DebuggableASTDebugger'
'Ghost' ) ] ].

"Groups"
spec
group: 'default' with: #( 'Model' );
group: 'Model' with: #( 'DebuggableASTInterpreter' );
group: 'Debugger' with: #( 'DebuggableASTDebugger' )
group: 'Debugger' with: #( 'DebuggableASTDebugger' );
group: 'Overlay' with: #( 'DebuggableASTInterpreterOverlays' )
]
2 changes: 1 addition & 1 deletion DebuggableASTInterpreter/DASTContext.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,5 +768,5 @@ DASTContext >> write: value toInstVarNamed: name [
| index |
index := ((self evaluator classOf: self receiver) allInstVarNames indexOf: name).
(index = 0) ifTrue: [ InstanceVariableNotFound signalFor: name asString ].
self receiver instanceVariableAtIndex: index put: value
self receiver instVarAt: index put: value
]
14 changes: 12 additions & 2 deletions DebuggableASTInterpreter/DASTInterpreter.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,9 +401,19 @@ DASTInterpreter >> visitLiteralValueNode: aRBLiteralValueNode [
]

{ #category : #visiting }
DASTInterpreter >> visitLiteralVariableNode: aRBVariableNode [

^ self visitGlobalNode: aRBVariableNode
DASTInterpreter >> visitLiteralVariableNode: aNode [
"to be backward compatible, we visit for Gloabls here (there used to be no difference)"

^ self visitGlobalNode: aNode
]

{ #category : #visiting }
DASTInterpreter >> visitLocalVariableNode: aNode [

"call visitTemporaryNode: for backward compatibility"

^ self visitTemporaryNode: aNode
]

{ #category : #visiting }
Expand Down
17 changes: 13 additions & 4 deletions DebuggableASTInterpreter/DASTPostOrderTreeVisitor.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ DASTPostOrderTreeVisitor >> visitArgumentNode: aRBArgumentNode [
]

{ #category : #visiting }
DASTPostOrderTreeVisitor >> visitArgumentVariableNode: aRBVariableNode [
DASTPostOrderTreeVisitor >> visitArgumentVariableNode: aRBVariableNode [

^ self visitTemporaryNode: aRBVariableNode
]
Expand Down Expand Up @@ -108,9 +108,18 @@ DASTPostOrderTreeVisitor >> visitLiteralValueNode: aRBLiteralValueNode [
]

{ #category : #visiting }
DASTPostOrderTreeVisitor >> visitLiteralVariableNode: aRBVariableNode [
DASTPostOrderTreeVisitor >> visitLiteralVariableNode: aNode [
"to be backward compatible, we visit for Gloabls here (there used to be no difference)"

^ self visitGlobalNode: aRBVariableNode
^ self visitGlobalNode: aNode
]

{ #category : #visiting }
DASTPostOrderTreeVisitor >> visitLocalVariableNode: aNode [

"call visitTemporaryNode: for backward compatibility"

^ self visitTemporaryNode: aNode
]

{ #category : #visiting }
Expand Down Expand Up @@ -157,7 +166,7 @@ DASTPostOrderTreeVisitor >> visitSuperNode: aRBSuperNode [
^ stack push: aRBSuperNode
]

{ #category : #'as yet unclassified' }
{ #category : #visiting }
DASTPostOrderTreeVisitor >> visitTemporaryNode: aRBTemporaryNode [
stack push: aRBTemporaryNode
]
Expand Down
6 changes: 4 additions & 2 deletions DebuggableASTInterpreter/DASTSystemEnvironment.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ DASTSystemEnvironment >> assignClassVariable: name inObject: anObject value: val

{ #category : #'variables-instance' }
DASTSystemEnvironment >> assignInstanceVariable: name inObject: anObject value: value [
(anObject class allInstVarNames includes: name)
ifTrue: [ anObject instVarNamed: name put: value . ^ true].

(anObject class allInstVarNames includes: name) ifTrue: [
interpreter write: value toInstVarNamed: name.
^ true ].
^ false
]

Expand Down
9 changes: 4 additions & 5 deletions DebuggableASTInterpreterOverlays/DASTOverlayInterpreter.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ DASTOverlayInterpreter >> overlayCounter [
{ #category : #visiting }
DASTOverlayInterpreter >> overlayFor: anObject [
^ self objectStateOverlay
at: self receiver
ifAbsentPut: [ ObjectOverlay on: self receiver ]
at: anObject
ifAbsentPut: [ ObjectOverlay on: anObject ]
]

{ #category : #visiting }
Expand All @@ -44,9 +44,8 @@ DASTOverlayInterpreter >> overlaysForPC [

{ #category : #visiting }
DASTOverlayInterpreter >> readInstanceVariableNamed: name [
^ (self overlayFor: self receiver)
readInstanceVariableNamed: name
ifAbsent: [ ^ super readInstanceVariableNamed: name ]

^ self readInstanceVariableNamed: name for: self receiver
]

{ #category : #visiting }
Expand Down