Miscellaneous corrections (#713)

* 5.3.1

* all added according to sheet

Author: martin-henz

xml/chapter5/section3/subsection1.xml

@@ -519,9 +519,9 @@ perform(list(op("set_tail"), reg(<META>reg</META>$_1$), reg(<META>reg</META>$_2$
  (op vector-set!) (reg the-cdrs) (reg reg$_{1}$) (reg reg$_{2}$))
       </SCHEME>
       <JAVASCRIPT>
-perform(op("vector_set"), list(reg("the_heads"), reg(<META>reg</META>$_1$), reg(<META>reg</META>$_2$)))
+perform(list(op("vector_set"), reg("the_heads"), reg(<META>reg</META>$_1$), reg(<META>reg</META>$_2$)))
 
-perform(op("vector_set"), list(reg("the_tails"), reg(<META>reg</META>$_1$), reg(<META>reg</META>$_2$)))
+perform(list(op("vector_set"), reg("the_tails"), reg(<META>reg</META>$_1$), reg(<META>reg</META>$_2$)))
       </JAVASCRIPT>
     </SNIPPET>
   </TEXT>
@@ -609,10 +609,10 @@ assign(<META>reg</META>$_1$, list(op("pair"), reg(<META>reg</META>$_2$), reg(<ME
       (assign free (op +) (reg free) (const 1))
       </SCHEME>
       <JAVASCRIPT>
-perform(op("vector_set"),
-        list(reg("the_heads"), reg("free"), reg(<META>reg</META>$_2$))),
-perform(op("vector_set"),
-        list(reg("the_tails"), reg("free"), reg(<META>reg</META>$_3$))),
+perform(list(op("vector_set"),
+             reg("the_heads"), reg("free"), reg(<META>reg</META>$_2$))),
+perform(list(op("vector_set"),
+             reg("the_tails"), reg("free"), reg(<META>reg</META>$_3$))),
 assign(<META>reg</META>$_1$, reg("free")),
 assign("free", list(op("+"), reg("free"), constant(1)))
       </JAVASCRIPT>
@@ -716,7 +716,7 @@ assign("the_stack", list(op("tail"), reg("the_stack")))
       <SCHEME><SCHEMEINLINE>(perform (op initialize-stack))</SCHEMEINLINE>
       </SCHEME>
       <JAVASCRIPT>
-	<JAVASCRIPTINLINE>perform(op("initialize_stack"))</JAVASCRIPTINLINE>
+	<JAVASCRIPTINLINE>perform(list(op("initialize_stack")))</JAVASCRIPTINLINE>
       </JAVASCRIPT>
     </SPLITINLINE>
     can be implemented as

xml/chapter5/section3/subsection2.xml

@@ -751,7 +751,7 @@ already-moved
   branch(label("already_moved")),
   assign("new", reg("free")),     // new location for pair
   // Update $\texttt{free}$ pointer
-  assign("free", list((op("+"), reg("free"), constant(1))),
+  assign("free", list(op("+"), reg("free"), constant(1))),
   // Copy the head and tail to new memory
   perform(list(op("vector_set"),
                reg("new_heads"), reg("new"),

xml/chapter5/section5/subsection2.xml

@@ -291,9 +291,9 @@ function compile_name(component, target, linkage) {
       <JAVASCRIPT>
         The function <JAVASCRIPTINLINE>compile_assignment_declaration</JAVASCRIPTINLINE>
         recursively generates code that computes the value to be
-        associated with the symbol, appends to it a two-instruction
+        associated with the symbol and appends to it a two-instruction
         sequence that updates the value associated with the symbol
-        in the environment, and assigns the value of the whole component
+        in the environment and assigns the value of the whole component
         <!-- (the <JAVASCRIPTINLINE>final_value</JAVASCRIPTINLINE>) --> <!-- FIXME PAGINATION: can be restored if final_value is visible on this page -->
  (the assigned value for an assignment or <JAVASCRIPTINLINE>undefined</JAVASCRIPTINLINE> for a declaration) 
         to the target register. 
@@ -371,9 +371,9 @@ function compile_assignment_declaration(
                    make_instruction_sequence(list("env", "val"),
                                              list(target),
                        list(perform(list(op("assign_symbol_value"),
-                                    constant(symbol),
-                                    reg("val"),
-                                    reg("env"))),
+                                         constant(symbol),
+                                         reg("val"),
+                                         reg("env"))),
                             assign(target, final_value)))));
 }
       </JAVASCRIPT>

xml/chapter5/section5/subsection3.xml

@@ -541,7 +541,7 @@ primitive-branch
 after-call
       </SCHEME>
       <JAVASCRIPT latex="yes"><!-- The $\texttt{ }\texttt{ }$ below is a hack to ensure the leading spaces are not consumed-->
-$\texttt{ }\texttt{ }$test(op("primitive_function"), reg("fun")),
+$\texttt{ }\texttt{ }$test(list(op("primitive_function"), reg("fun"))),
   branch(label("primitive_branch")),
 "compiled_branch",
   <METAPHRASE>code to apply compiled function with given target and appropriate linkage</METAPHRASE>

xml/chapter5/section5/subsection5.xml

@@ -180,7 +180,7 @@ $\langle restore$ env $if\ saved\ above\rangle$
 perform(list(op("assign_symbol_value"),
              constant("factorial"),
              reg("val"),
-             reg("env")),
+             reg("env"))),
 assign("val", constant(undefined))
       </JAVASCRIPT>
     </SNIPPET>
@@ -1056,7 +1056,7 @@ primitive-branch22
     </SCHEME>
     <JAVASCRIPT><!-- The $\texttt{ }\texttt{ }$ below is a hack to ensure the leading spaces are not consumed-->
 $\texttt{ }\texttt{ }$assign("val", list(op("make_compiled_function"), 
-                                         label("entry1"), reg("env")))
+                     label("entry1"), reg("env"))),
 "entry1"
   assign("env", list(op("compiled_function_env"), reg("fun"))), 
   assign("env", list(op("extend_environment"), 
@@ -1272,8 +1272,8 @@ after-lambda15
 (assign val (op +) (reg val) (const 1))
       </SCHEME>
       <JAVASCRIPT>
-assign("val", list(op("lookup_symbol_value"), constant("a"), reg("env")),
-assign("val", list(op("+"), reg("val"), constant(1))
+assign("val", list(op("lookup_symbol_value"), constant("a"), reg("env"))),
+assign("val", list(op("+"), reg("val"), constant(1)))
       </JAVASCRIPT>
     </SNIPPET>
     In this exercise we will extend our compiler to support open coding of