cursor: fix regression in step through from 2d02fde

hpi-swa-lab · Jan 3, 2024 · ac8d8c6 · ac8d8c6
1 parent 877d5b8
commit ac8d8c6
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 3 deletions.
diff --git a/packages/TraceDebugger.package/TDBCursor.class/instance/stepToHome..st b/packages/TraceDebugger.package/TDBCursor.class/instance/stepToHome..st
@@ -13,7 +13,6 @@ stepToHome: aContext
 	home := homeTrace contextAtTime: self timeIndex.
 	home isDead ifTrue:
 		[^ self context].
-	home := home tdbproxyYourself.
 	^ self stepUntil: [:context |
 		home isDead
-			or: [context tdbHasHome: home]]
+			or: [context tdbHasHome: home tdbproxyYourself]]
diff --git a/packages/TraceDebugger.package/TDBCursor.class/methodProperties.json b/packages/TraceDebugger.package/TDBCursor.class/methodProperties.json
@@ -103,7 +103,7 @@
 		"stepBackToSendOrReturn" : "ct 3/16/2022 00:26",
 		"stepBackUntil:" : "ct 3/11/2022 18:31",
 		"stepOverUnhandledError:from:until:" : "ct 3/17/2022 15:24",
-		"stepToHome:" : "ct 12/31/2023 00:11",
+		"stepToHome:" : "ct 1/3/2024 00:27",
 		"stepToSendOrReturn" : "ct 3/11/2022 18:44",
 		"stepUntil:" : "ct 3/17/2022 14:38",
 		"timeIndex" : "ct 3/16/2022 17:16",

diff --git a/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepThroughHistory.st b/packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testDoStepThroughHistory.st
@@ -0,0 +1,18 @@
+tests - stepping
+testDoStepThroughHistory
+
+	self
+		runCursorFrom: (Context
+			sender: nil
+			receiver: TDBTestLogic new
+			method: TDBTestLogic >> #griffleMethodReturnHome2
+			arguments: #())
+		stepsAndAssertions:
+			#((doStepOver nil (willReallySend willReturn))
+			(doRestart nil (willReallySend))
+			(doStepInto griffleMethodReturn2 (willReallySend))
+			(doStepThrough (griffleMethodReturn2 isExecutingBlock) (willReallySend willReallySend))
+			(doStepThrough (griffleMethodReturn2 isExecutingBlock) (willReallySend willReturn))
+			(doStepThrough (griffleMethodReturn2 isExecutingBlock) (willReturn))
+			(doStepThrough (griffleMethodReturn2 isExecutingBlock) (willReallySend willReturn))
+			(doStepThrough griffleMethodReturn2 (willReturn))).
diff --git a/packages/TraceDebuggerTests.package/TDBCursorTest.class/methodProperties.json b/packages/TraceDebuggerTests.package/TDBCursorTest.class/methodProperties.json
@@ -29,6 +29,7 @@
 		"testDoStepRestart" : "ct 12/30/2023 23:12",
 		"testDoStepRestartFromSender" : "ct 1/20/2022 20:50",
 		"testDoStepThrough" : "ct 12/30/2023 22:30",
+		"testDoStepThroughHistory" : "ct 1/3/2024 01:56",
 		"testDoStepThroughUntil" : "ct 2/17/2022 19:09",
 		"testDoStepThroughUntilFromSender" : "ct 3/13/2022 14:54",
 		"testReturnValue" : "ct 3/17/2022 00:55",

diff --git a/packages/TraceDebuggerTests.package/TDBTestLogic.class/instance/griffleMethodReturn2.st b/packages/TraceDebuggerTests.package/TDBTestLogic.class/instance/griffleMethodReturn2.st
@@ -0,0 +1,4 @@
+as yet unclassified
+griffleMethodReturn2
+
+	^ self griffle: [self griffle: [self wiffy1] with: self wiffy2] with: [self wiffy2]
diff --git a/packages/TraceDebuggerTests.package/TDBTestLogic.class/instance/griffleMethodReturnHome2.st b/packages/TraceDebuggerTests.package/TDBTestLogic.class/instance/griffleMethodReturnHome2.st
@@ -0,0 +1,4 @@
+as yet unclassified
+griffleMethodReturnHome2
+
+	^ self griffleMethodReturn2
diff --git a/packages/TraceDebuggerTests.package/TDBTestLogic.class/methodProperties.json b/packages/TraceDebuggerTests.package/TDBTestLogic.class/methodProperties.json
@@ -15,7 +15,9 @@
 		"griffle" : "ct 12/2/2021 02:06",
 		"griffle:with:" : "ct 12/2/2021 02:06",
 		"griffleMethodReturn" : "ct 12/2/2021 02:06",
+		"griffleMethodReturn2" : "ct 1/3/2024 01:52",
 		"griffleMethodReturnHome" : "ct 12/31/2023 01:12",
+		"griffleMethodReturnHome2" : "ct 1/3/2024 01:54",
 		"handleError" : "ct 3/21/2022 18:05",
 		"loop" : "ct 2/21/2022 03:30",
 		"mixYinYang" : "ct 7/7/2022 19:31",

diff --git a/...es/TraceDebuggerTests.package/TDBTestLogicTest.class/instance/testGriffleMethodReturn2.st b/...es/TraceDebuggerTests.package/TDBTestLogicTest.class/instance/testGriffleMethodReturn2.st
@@ -0,0 +1,4 @@
+tests
+testGriffleMethodReturn2
+
+	self assert: 18 equals: logic griffleMethodReturn2.
diff --git a/packages/TraceDebuggerTests.package/TDBTestLogicTest.class/methodProperties.json b/packages/TraceDebuggerTests.package/TDBTestLogicTest.class/methodProperties.json
@@ -11,6 +11,7 @@
 		"testDoYinYang" : "ct 7/21/2022 15:31",
 		"testGriffle" : "ct 12/8/2021 23:23",
 		"testGriffleMethodReturn" : "ct 12/8/2021 23:23",
+		"testGriffleMethodReturn2" : "ct 1/3/2024 01:57",
 		"testHandleError" : "ct 3/21/2022 18:02",
 		"testPlonk" : "ct 12/8/2021 23:22",
 		"testPlonkLong" : "ct 3/17/2022 02:31",