better diag

SquareBracketAssociates · Nov 27, 2024 · 39266f2 · 39266f2
1 parent f6131c6
commit 39266f2
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 3 deletions.
diff --git a/Part1-InterpreterAndBytecode/3-SemanticsByExample/figures/interpreter_activation-ascii.txt b/Part1-InterpreterAndBytecode/3-SemanticsByExample/figures/interpreter_activation-ascii.txt
@@ -2,11 +2,11 @@
 -> 28 "<00> push instance variable: x" | "Point>>#x"  |
    29 "<5C> return top of stack"       | "pc = 28"    |
                                        | receiver  ---+-> 1@2
-                                       | temps - - - -|
+                                       |- temps - - --|
                                        | empty        |
-                                       | stack - - - -|
+                                       |- stack - - --|
                                        | empty        |
-                                       | - - - - - - -|
+                                       |- - - - - - --|
                                        | sender    -+ |
                                        +------------+-+
                                                     |

diff --git a/...terpreterAndBytecode/3-SemanticsByExample/figures/interpreter_activation-rescue-ascii.txt b/...terpreterAndBytecode/3-SemanticsByExample/figures/interpreter_activation-rescue-ascii.txt
@@ -0,0 +1,28 @@
+                                 +-context -----+
+-> 28 "push instance variable: x"| "Point>>#x"  |
+   29 "return top of stack"      | "pc = 28"    |
+                                 | receiver  ---+--------------------------.
+                                 | temps - - - -|                          |
+                                 | empty        |                          |
+                                 | stack - - - -|                          |
+                                 | empty        |                          |
+                                 | - - - - - - -|                          |
+                                 | sender    -+ |                          |
+                                 +------------+-+                          |
+                                              |                            v
+                                              v                .->+-----+ +-----+
+      "                              " +-context ------------+ |  | 1@2 | | 3@4 |
+   25 "push instance variable: corner" | "Rectangle>>#width" | |  +-----+ +-----+
+   26 "send: x                       " | "pc = 27"           | '-------------. ^
+-> 27 "pop into temporary: cornerX   " | receiver          --+-> +---------+ | |
+   28 "push instance variable: origin" |- temps - - - - - - -|   | origin -+-' |
+   29 "send: x                       " | "originX = nil"     |   | corner -+---'
+   30 "pop into temporary: originX   " | "cornerX = nil"     |   +---------+
+   31 "push temporary: cornerX       " |- stack - - - - - - -|
+   32 "push temporary: originX       " | empty               | 
+   33 "send: -                       " |- - - - - - - - - - -|
+   34 "returnTop                     " | sender           -+ |
+      "                              " +-------------------+-+
+      "                              "                     |
+      "                              "                     v
+      "                              "                    ...
diff --git a/Part1-InterpreterAndBytecode/3-SemanticsByExample/figures/interpreter_activation-rescue.pdf b/Part1-InterpreterAndBytecode/3-SemanticsByExample/figures/interpreter_activation-rescue.pdf
diff --git a/Part1-InterpreterAndBytecode/3-SemanticsByExample/figures/interpreter_activation.pdf b/Part1-InterpreterAndBytecode/3-SemanticsByExample/figures/interpreter_activation.pdf