Remove handling of IN-PACKAGE frames (which no longer exist).

diff --git a/src/runtime/conpar.scm b/src/runtime/conpar.scm
index 8b2e34d67af909447ed0dc1c9cd388a9092b097d..ebb11ef4d3700f213c8ee9177e439a4898bc4916 100644 (file)
--- a/src/runtime/conpar.scm
+++ b/src/runtime/conpar.scm
@@ -793,35 +793,35 @@ USA.
       (stack-frame-type name #t #f length
                        (if (default-object? parser) parser/standard parser)))
 
-    (standard-frame 'RESTORE-INTERRUPT-MASK 2 parser/restore-interrupt-mask)
-    (standard-frame 'RESTORE-HISTORY 4 parser/restore-history)
-    (standard-frame 'RESTORE-DONT-COPY-HISTORY 4 parser/restore-history)
-    (standard-frame 'STACK-MARKER 3 parser/stack-marker)
-
-    (standard-frame 'NON-EXISTENT-CONTINUATION 2)
     (standard-frame 'HALT 2)
     (standard-frame 'JOIN-STACKLETS 2)
+    (standard-frame 'NON-EXISTENT-CONTINUATION 2)
     (standard-frame 'POP-RETURN-ERROR 2)
     (standard-frame 'RESTORE-VALUE 2)
 
-    (standard-subproblem 'IN-PACKAGE-CONTINUE 2)
+    (standard-frame 'RESTORE-DONT-COPY-HISTORY 4 parser/restore-history)
+    (standard-frame 'RESTORE-HISTORY 4 parser/restore-history)
+    (standard-frame 'RESTORE-INTERRUPT-MASK 2 parser/restore-interrupt-mask)
+    (standard-frame 'STACK-MARKER 3 parser/stack-marker)
+
     (standard-subproblem 'ACCESS-CONTINUE 2)
-    (standard-subproblem 'PRIMITIVE-COMBINATION-1-APPLY 2)
-    (standard-subproblem 'FORCE-SNAP-THUNK 2)
     (standard-subproblem 'ASSIGNMENT-CONTINUE 3)
-    (standard-subproblem 'DEFINITION-CONTINUE 3)
-    (standard-subproblem 'SEQUENCE-2-SECOND 3)
-    (standard-subproblem 'CONDITIONAL-DECIDE 3)
-    (standard-subproblem 'DISJUNCTION-DECIDE 3)
     (standard-subproblem 'COMBINATION-1-PROCEDURE 3)
     (standard-subproblem 'COMBINATION-2-FIRST-OPERAND 3)
+    (standard-subproblem 'COMBINATION-2-PROCEDURE 4)
+    (standard-subproblem 'CONDITIONAL-DECIDE 3)
+    (standard-subproblem 'DEFINITION-CONTINUE 3)
+    (standard-subproblem 'DISJUNCTION-DECIDE 3)
     (standard-subproblem 'EVAL-ERROR 3)
-    (standard-subproblem 'PRIMITIVE-COMBINATION-2-FIRST-OPERAND 3)
+    (standard-subproblem 'FORCE-SNAP-THUNK 2)
+    (standard-subproblem 'PRIMITIVE-COMBINATION-1-APPLY 2)
     (standard-subproblem 'PRIMITIVE-COMBINATION-2-APPLY 3)
-    (standard-subproblem 'PRIMITIVE-COMBINATION-3-SECOND-OPERAND 3)
-    (standard-subproblem 'COMBINATION-2-PROCEDURE 4)
-    (standard-subproblem 'PRIMITIVE-COMBINATION-3-FIRST-OPERAND 4)
+    (standard-subproblem 'PRIMITIVE-COMBINATION-2-FIRST-OPERAND 3)
     (standard-subproblem 'PRIMITIVE-COMBINATION-3-APPLY 4)
+    (standard-subproblem 'PRIMITIVE-COMBINATION-3-FIRST-OPERAND 4)
+    (standard-subproblem 'PRIMITIVE-COMBINATION-3-SECOND-OPERAND 3)
+    (standard-subproblem 'SEQUENCE-2-SECOND 3)
+
     (standard-subproblem 'COMBINATION-SAVE-VALUE length/combination-save-value)
 
     (let ((length (length/application-frame 2 0)))

diff --git a/src/runtime/framex.scm b/src/runtime/framex.scm
index 563ae539a6d5b629709550cf81602c81fd6d2a8b..4a7025b47781e94de850dd8c58e5317603fda697 100644 (file)
--- a/src/runtime/framex.scm
+++ b/src/runtime/framex.scm
@@ -289,8 +289,7 @@ USA.
   (record-method 'PRIMITIVE-COMBINATION-3-SECOND-OPERAND
                 (method/standard &vector-fourth))
   (let ((method (method/expression-only &pair-car)))
-    (record-method 'ACCESS-CONTINUE method)
-    (record-method 'IN-PACKAGE-CONTINUE method))
+    (record-method 'ACCESS-CONTINUE method))
   (record-method 'PRIMITIVE-COMBINATION-1-APPLY
                 (method/expression-only &pair-cdr))
   (record-method 'PRIMITIVE-COMBINATION-2-APPLY