Merge pull request #101 from jecisc/update-extensions

jecisc · web-flow · commit a365df1036c3 · 2025-03-05T16:58:51.000+01:00
Update extensions of classes that got renamed
diff --git a/src/Sindarin/ASTAssignmentNode.extension.st b/src/Sindarin/ASTAssignmentNode.extension.st
diff --git a/src/Sindarin/ASTMessageNode.extension.st b/src/Sindarin/ASTMessageNode.extension.st
diff --git a/src/Sindarin/ASTReturnNode.extension.st b/src/Sindarin/ASTReturnNode.extension.st
diff --git a/src/Sindarin/OCAssignmentNode.extension.st b/src/Sindarin/OCAssignmentNode.extension.st
@@ -0,0 +1,7 @@
+Extension { #name : 'OCAssignmentNode' }
+
+{ #category : '*Sindarin' }
+OCAssignmentNode >> skipWithDebugger: aSindarinDebugger [
+
+	aSindarinDebugger skipAssignmentNodeCompletely 
+]
diff --git a/src/Sindarin/OCBlockNode.extension.st b/src/Sindarin/OCBlockNode.extension.st
@@ -1,7 +1,7 @@
-Extension { #name : 'ASTBlockNode' }
+Extension { #name : 'OCBlockNode' }
 
 { #category : '*Sindarin' }
-ASTBlockNode >> executedNodesAfter: aNode [
+OCBlockNode >> executedNodesAfter: aNode [
 
 	"Gives all nodes that are executed after aNode. Assuming that aNode is a recursive child, then all nodes executed after it are all nodes after it in allChildrenPostOrder"
 
@@ -14,13 +14,13 @@ ASTBlockNode >> executedNodesAfter: aNode [
 ]
 
 { #category : '*Sindarin' }
-ASTBlockNode >> firstPCOfStatement: aStatementNode [
+OCBlockNode >> firstPCOfStatement: aStatementNode [
 
 	^ self bcToASTCache firstRecursiveBcOffsetForStatementNode: aStatementNode
 ]
 
 { #category : '*Sindarin' }
-ASTBlockNode >> nextExecutedNodeAfter: aNode [
+OCBlockNode >> nextExecutedNodeAfter: aNode [
 
 	"Find first node that is after aNode that has an associated pc in method node all children (post-order)"
 
@@ -32,7 +32,7 @@ ASTBlockNode >> nextExecutedNodeAfter: aNode [
 ]
 
 { #category : '*Sindarin' }
-ASTBlockNode >> parentOfIdenticalSubtree: subtree [
+OCBlockNode >> parentOfIdenticalSubtree: subtree [
 
 	^ self allChildren reversed
 		  detect: [ :e | e == subtree ]
@@ -41,7 +41,7 @@ ASTBlockNode >> parentOfIdenticalSubtree: subtree [
 ]
 
 { #category : '*Sindarin' }
-ASTBlockNode >> skipWithDebugger: aSindarinDebugger [
+OCBlockNode >> skipWithDebugger: aSindarinDebugger [
 
 	aSindarinDebugger skipBlockNode 
 ]
diff --git a/src/Sindarin/OCMessageNode.extension.st b/src/Sindarin/OCMessageNode.extension.st
@@ -0,0 +1,7 @@
+Extension { #name : 'OCMessageNode' }
+
+{ #category : '*Sindarin' }
+OCMessageNode >> skipWithDebugger: aSindarinDebugger [
+
+	aSindarinDebugger skipMessageNode 
+]
diff --git a/src/Sindarin/OCMethodNode.extension.st b/src/Sindarin/OCMethodNode.extension.st
@@ -1,7 +1,7 @@
-Extension { #name : 'ASTMethodNode' }
+Extension { #name : 'OCMethodNode' }
 
 { #category : '*Sindarin' }
-ASTMethodNode >> executedNodesAfter: aNode [
+OCMethodNode >> executedNodesAfter: aNode [
 
 	"Gives all nodes that are executed after aNode. Assuming that aNode is a recursive child, then all nodes executed after it are all nodes after it in allChildrenPostOrder"
 
@@ -14,13 +14,13 @@ ASTMethodNode >> executedNodesAfter: aNode [
 ]
 
 { #category : '*Sindarin' }
-ASTMethodNode >> firstPCOfStatement: aStatementNode [
+OCMethodNode >> firstPCOfStatement: aStatementNode [
 
 	^ self bcToASTCache firstRecursiveBcOffsetForStatementNode: aStatementNode
 ]
 
 { #category : '*Sindarin' }
-ASTMethodNode >> nextExecutedNodeAfter: aNode [
+OCMethodNode >> nextExecutedNodeAfter: aNode [
 
 	"Find first node that is after aNode that has an associated pc in method node all children (post-order)"
 
@@ -32,7 +32,7 @@ ASTMethodNode >> nextExecutedNodeAfter: aNode [
 ]
 
 { #category : '*Sindarin' }
-ASTMethodNode >> parentOfIdenticalSubtree: subtree [
+OCMethodNode >> parentOfIdenticalSubtree: subtree [
 
 	^ self allChildren reversed
 		  detect: [ :e | e == subtree ]
@@ -41,7 +41,7 @@ ASTMethodNode >> parentOfIdenticalSubtree: subtree [
 ]
 
 { #category : '*Sindarin' }
-ASTMethodNode >> statementNodeContaining: aNode [
+OCMethodNode >> statementNodeContaining: aNode [
 
 	| statementNode parentOfStatementNode |
 	statementNode := aNode.
diff --git a/src/Sindarin/OCProgramNode.extension.st b/src/Sindarin/OCProgramNode.extension.st
@@ -1,7 +1,7 @@
-Extension { #name : 'ASTProgramNode' }
+Extension { #name : 'OCProgramNode' }
 
 { #category : '*Sindarin' }
-ASTProgramNode >> allChildrenPostOrder [
+OCProgramNode >> allChildrenPostOrder [
 
 	| children |
 	children := OrderedCollection new.
@@ -12,7 +12,7 @@ ASTProgramNode >> allChildrenPostOrder [
 ]
 
 { #category : '*Sindarin' }
-ASTProgramNode >> skipWithDebugger: aSindarinDebugger [
+OCProgramNode >> skipWithDebugger: aSindarinDebugger [
 
 	aSindarinDebugger step
 ]
diff --git a/src/Sindarin/OCReturnNode.extension.st b/src/Sindarin/OCReturnNode.extension.st
@@ -0,0 +1,7 @@
+Extension { #name : 'OCReturnNode' }
+
+{ #category : '*Sindarin' }
+OCReturnNode >> skipWithDebugger: aSindarinDebugger [
+
+	aSindarinDebugger skipReturnNode
+]
diff --git a/src/Sindarin/RBBlockDefinitionSearchingVisitor.class.st b/src/Sindarin/RBBlockDefinitionSearchingVisitor.class.st
@@ -1,6 +1,6 @@
 Class {
 	#name : 'RBBlockDefinitionSearchingVisitor',
-	#superclass : 'ASTProgramNodeVisitor',
+	#superclass : 'OCProgramNodeVisitor',
 	#instVars : [
 		'blockToSearch',
 		'isBlockFound'

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-Extension { #name : 'ASTBlockNode' }`
	`1`	`+Extension { #name : 'OCBlockNode' }`
`2`	`2`
`3`	`3`	`{ #category : '*Sindarin' }`
`4`		`-ASTBlockNode >> executedNodesAfter: aNode [`
	`4`	`+OCBlockNode >> executedNodesAfter: aNode [`
`5`	`5`
`6`	`6`	`"Gives all nodes that are executed after aNode. Assuming that aNode is a recursive child, then all nodes executed after it are all nodes after it in allChildrenPostOrder"`
`7`	`7`
`@@ -14,13 +14,13 @@ ASTBlockNode >> executedNodesAfter: aNode [`
`14`	`14`	`]`
`15`	`15`
`16`	`16`	`{ #category : '*Sindarin' }`
`17`		`-ASTBlockNode >> firstPCOfStatement: aStatementNode [`
	`17`	`+OCBlockNode >> firstPCOfStatement: aStatementNode [`
`18`	`18`
`19`	`19`	`^ self bcToASTCache firstRecursiveBcOffsetForStatementNode: aStatementNode`
`20`	`20`	`]`
`21`	`21`
`22`	`22`	`{ #category : '*Sindarin' }`
`23`		`-ASTBlockNode >> nextExecutedNodeAfter: aNode [`
	`23`	`+OCBlockNode >> nextExecutedNodeAfter: aNode [`
`24`	`24`
`25`	`25`	`"Find first node that is after aNode that has an associated pc in method node all children (post-order)"`
`26`	`26`
`@@ -32,7 +32,7 @@ ASTBlockNode >> nextExecutedNodeAfter: aNode [`
`32`	`32`	`]`
`33`	`33`
`34`	`34`	`{ #category : '*Sindarin' }`
`35`		`-ASTBlockNode >> parentOfIdenticalSubtree: subtree [`
	`35`	`+OCBlockNode >> parentOfIdenticalSubtree: subtree [`
`36`	`36`
`37`	`37`	`^ self allChildren reversed`
`38`	`38`	`detect: [ :e \| e == subtree ]`
`@@ -41,7 +41,7 @@ ASTBlockNode >> parentOfIdenticalSubtree: subtree [`
`41`	`41`	`]`
`42`	`42`
`43`	`43`	`{ #category : '*Sindarin' }`
`44`		`-ASTBlockNode >> skipWithDebugger: aSindarinDebugger [`
	`44`	`+OCBlockNode >> skipWithDebugger: aSindarinDebugger [`
`45`	`45`
`46`	`46`	`aSindarinDebugger skipBlockNode`
`47`	`47`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-Extension { #name : 'ASTProgramNode' }`
	`1`	`+Extension { #name : 'OCProgramNode' }`
`2`	`2`
`3`	`3`	`{ #category : '*Sindarin' }`
`4`		`-ASTProgramNode >> allChildrenPostOrder [`
	`4`	`+OCProgramNode >> allChildrenPostOrder [`
`5`	`5`
`6`	`6`	`\| children \|`
`7`	`7`	`children := OrderedCollection new.`
`@@ -12,7 +12,7 @@ ASTProgramNode >> allChildrenPostOrder [`
`12`	`12`	`]`
`13`	`13`
`14`	`14`	`{ #category : '*Sindarin' }`
`15`		`-ASTProgramNode >> skipWithDebugger: aSindarinDebugger [`
	`15`	`+OCProgramNode >> skipWithDebugger: aSindarinDebugger [`
`16`	`16`
`17`	`17`	`aSindarinDebugger step`
`18`	`18`	`]`