fix print privous return value in repl error

kanaka · Jul 8, 2023 · 96cda20 · 96cda20
1 parent b61c648
commit 96cda20
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 30 deletions.
diff --git a/impls/vbs/step1_read_print.vbs b/impls/vbs/step1_read_print.vbs
@@ -19,12 +19,13 @@ Sub REPL()
 		Dim strRes
 		On Error Resume Next
 			strRes = REP(strCode)
-			If strRes <> "" Then
-				WScript.Echo strRes
-			End If
 			If Err.Number <> 0 Then
 				'WScript.StdErr.WriteLine Err.Source + ": " + Err.Description 
 				WScript.StdErr.WriteLine "Exception: " + Err.Description 
+			Else
+				If strRes <> "" Then
+					WScript.Echo strRes
+				End If
 			End If
 		On Error Goto 0
 	Wend

diff --git a/impls/vbs/step2_eval.vbs b/impls/vbs/step2_eval.vbs
@@ -102,12 +102,13 @@ Sub REPL()
 		Dim strRes
 		On Error Resume Next
 			strRes = REP(strCode)
-			If strRes <> "" Then
-				WScript.Echo strRes
-			End If
 			If Err.Number <> 0 Then
 				'WScript.StdErr.WriteLine Err.Source + ": " + Err.Description 
 				WScript.StdErr.WriteLine "Exception: " + Err.Description 
+			Else
+				If strRes <> "" Then
+					WScript.Echo strRes
+				End If
 			End If
 		On Error Goto 0
 	Wend

diff --git a/impls/vbs/step3_env.vbs b/impls/vbs/step3_env.vbs
@@ -113,12 +113,13 @@ Sub REPL()
 		Dim strRes
 		On Error Resume Next
 			strRes = REP(strCode)
-			If strRes <> "" Then
-				WScript.Echo strRes
-			End If
 			If Err.Number <> 0 Then
 				'WScript.StdErr.WriteLine Err.Source + ": " + Err.Description 
 				WScript.StdErr.WriteLine "Exception: " + Err.Description 
+			Else
+				If strRes <> "" Then
+					WScript.Echo strRes
+				End If
 			End If
 		On Error Goto 0
 	Wend

diff --git a/impls/vbs/step4_if_fn_do.vbs b/impls/vbs/step4_if_fn_do.vbs
@@ -127,12 +127,13 @@ Sub REPL()
 		Dim strRes
 		On Error Resume Next
 			strRes = REP(strCode)
-			If strRes <> "" Then
-				WScript.Echo strRes
-			End If
 			If Err.Number <> 0 Then
 				'WScript.StdErr.WriteLine Err.Source + ": " + Err.Description 
 				WScript.StdErr.WriteLine "Exception: " + Err.Description 
+			Else
+				If strRes <> "" Then
+					WScript.Echo strRes
+				End If
 			End If
 		On Error Goto 0
 	Wend

diff --git a/impls/vbs/step5_tco.vbs b/impls/vbs/step5_tco.vbs
@@ -136,12 +136,13 @@ Sub REPL()
 		Dim strRes
 		On Error Resume Next
 			strRes = REP(strCode)
-			If strRes <> "" Then
-				WScript.Echo strRes
-			End If
 			If Err.Number <> 0 Then
 				'WScript.StdErr.WriteLine Err.Source + ": " + Err.Description 
 				WScript.StdErr.WriteLine "Exception: " + Err.Description 
+			Else
+				If strRes <> "" Then
+					WScript.Echo strRes
+				End If
 			End If
 		On Error Goto 0
 	Wend

diff --git a/impls/vbs/step6_file.vbs b/impls/vbs/step6_file.vbs
@@ -164,12 +164,13 @@ Sub REPL()
 		Dim strRes
 		On Error Resume Next
 			strRes = REP(strCode)
-			If strRes <> "" Then
-				WScript.Echo strRes
-			End If
 			If Err.Number <> 0 Then
 				'WScript.StdErr.WriteLine Err.Source + ": " + Err.Description 
 				WScript.StdErr.WriteLine "Exception: " + Err.Description 
+			Else
+				If strRes <> "" Then
+					WScript.Echo strRes
+				End If
 			End If
 		On Error Goto 0
 	Wend

diff --git a/impls/vbs/step7_quote.vbs b/impls/vbs/step7_quote.vbs
@@ -288,12 +288,13 @@ Sub REPL()
 		Dim strRes
 		On Error Resume Next
 			strRes = REP(strCode)
-			If strRes <> "" Then
-				WScript.Echo strRes
-			End If
 			If Err.Number <> 0 Then
 				'WScript.StdErr.WriteLine Err.Source + ": " + Err.Description 
 				WScript.StdErr.WriteLine "Exception: " + Err.Description 
+			Else
+				If strRes <> "" Then
+					WScript.Echo strRes
+				End If
 			End If
 		On Error Goto 0
 	Wend

diff --git a/impls/vbs/step8_macros.vbs b/impls/vbs/step8_macros.vbs
@@ -342,12 +342,13 @@ Sub REPL()
 		Dim strRes
 		On Error Resume Next
 			strRes = REP(strCode)
-			If strRes <> "" Then
-				WScript.Echo strRes
-			End If
 			If Err.Number <> 0 Then
 				'WScript.StdErr.WriteLine Err.Source + ": " + Err.Description
 				WScript.StdErr.WriteLine "Exception: " + Err.Description
+			Else
+				If strRes <> "" Then
+					WScript.Echo strRes
+				End If
 			End If
 		On Error Goto 0
 	Wend

diff --git a/impls/vbs/step9_try.vbs b/impls/vbs/step9_try.vbs
@@ -402,9 +402,6 @@ Sub REPL()
 		Dim strRes
 		On Error Resume Next
 			strRes = REP(strCode)
-			If strRes <> "" Then
-				WScript.Echo strRes
-			End If
 			If Err.Number <> 0 Then
 				If Err.Source = "MThrow" Then
 					'WScript.StdErr.WriteLine Err.Source + ": " + _
@@ -415,6 +412,10 @@ Sub REPL()
 					'WScript.StdErr.WriteLine Err.Source + ": " + Err.Description
 					WScript.StdErr.WriteLine "Exception: " + Err.Description
 				End If
+			Else
+				If strRes <> "" Then
+					WScript.Echo strRes
+				End If
 			End If
 		On Error Goto 0
 	Wend

diff --git a/impls/vbs/stepA_mal.vbs b/impls/vbs/stepA_mal.vbs
@@ -403,9 +403,6 @@ Sub REPL()
 		Dim strRes
 		On Error Resume Next
 			strRes = REP(strCode)
-			If strRes <> "" Then
-				WScript.Echo strRes
-			End If
 			If Err.Number <> 0 Then
 				If Err.Source = "MThrow" Then
 					'WScript.StdErr.WriteLine Err.Source + ": " + _
@@ -416,6 +413,10 @@ Sub REPL()
 					'WScript.StdErr.WriteLine Err.Source + ": " + Err.Description
 					WScript.StdErr.WriteLine "Exception: " + Err.Description
 				End If
+			Else
+				If strRes <> "" Then
+					WScript.Echo strRes
+				End If
 			End If
 		On Error Goto 0
 	Wend