Fixed merge conflict

Author: TobiasWrigstad

xml/chapter5/section4/subsection4.xml

@@ -290,7 +290,7 @@ const eceval_operations =
   |  number
   |  expr(expr, expr, ...)
   binop   ::= + | - | * | / | % | < | > | <= | >= 
-  | === | !== |  && | ||
+  | === | !== |  && | ||
   unop    ::= ! | -
 */
 
@@ -309,7 +309,7 @@ function is_self_evaluating(stmt) {
 // kind of statement/expression they are
 
 function is_tagged_list(stmt, the_tag) {
-    return is_pair(stmt) && head(stmt) === the_tag;
+    return is_pair(stmt) && head(stmt) === the_tag;
 }
 
 /* NAMES */
@@ -710,7 +710,7 @@ function extend_environment(names, vals, base_env) {
             ),
             base_env
         );
-    } else if (length(names) < length(vals)) {
+    } else if (length(names) &lt; length(vals)) {
         error(
             "Too many arguments supplied: " +
                 stringify(names) +
@@ -732,7 +732,7 @@ const the_empty_environment = null;
 // support both binary minus and unary minus
 
 function minus(x, y) {
-    if (is_number(x) && is_number(y)) {
+    if (is_number(x) &amp;&amp; is_number(y)) {
         return x - y;
     } else {
         return -x;
@@ -752,10 +752,10 @@ const primitive_functions = list(
     list("%", (x, y) => x % y),
     list("===", (x, y) => x === y),
     list("!==", (x, y) => x !== y),
-    list("<", (x, y) => x < y),
-    list("<=", (x, y) => x <= y),
-    list(">", (x, y) => x > y),
-    list(">=", (x, y) => x >= y),
+    list("&lt;", (x, y) => x &lt; y),
+    list("&lt;=", (x, y) => x &lt;= y),
+    list("&gt;", (x, y) => x &gt; y),
+    list("&gt;=", (x, y) => x &gt;= y),
     list("!", (x) => !x)
 );
 
@@ -1390,7 +1390,7 @@ function make_operation_exp(exp, machine, labels, operations) {
 }
 
 function is_operation_exp(exp) {
-    return is_pair(exp) && is_tagged_list(head(exp), "op");
+    return is_pair(exp) &amp;&amp; is_tagged_list(head(exp), "op");
 }
 
 function operation_exp_op(operation_exp) {
@@ -2068,7 +2068,7 @@ factorial(5);
     <JAVASCRIPT>
 function factorial(n) {
     function iter(product, counter, max_count) {
-        return counter > max_count
+        return counter &gt; max_count
                ? product
                : fact_iter(counter * product,
                            counter + 1,

xml/chapter5/section5/subsection3.xml

@@ -649,15 +649,15 @@ function compile_procedure_call(target, linkage) {
     </SCHEME>
     <JAVASCRIPT>
 function compile_proc_appl(target, linkage) {
-    if (target === "val" && linkage !== "return") {
+    if (target === "val" &amp;&amp; linkage !== "return") {
         return make_instruction_sequence(
             list("proc"),
             all_regs,
             list(
                 assign("continue", list(label(linkage))),
                 assign("val", list(op("compiled_procedure_entry"), reg("proc"))),
                 go_to(reg("val"))));
-    } else if (target !== "val" && linkage !== "return") {
+    } else if (target !== "val" &amp;&amp; linkage !== "return") {
         const proc_return = make_label("proc_return");
 
         return make_instruction_sequence(
@@ -670,14 +670,14 @@ function compile_proc_appl(target, linkage) {
                 proc_return,
                 assign(target, list(reg("val"))),
                 go_to(label(linkage))));
-    } else if (target === "val" && linkage === "return") {
+    } else if (target === "val" &amp;&amp; linkage === "return") {
         return make_instruction_sequence(
             list("proc", "continue"),
             all_regs,
             list(
                 assign("val", list(op("compiled_procedure_entry"), reg("proc"))),
                 go_to(reg("val"))));
-    } else if (target !== "val" && linkage === "return") {
+    } else if (target !== "val" &amp;&amp; linkage === "return") {
         error(target, "return linkage, target not val - - COMPILE");
     }
 }

xml/chapter5/section5/subsection4.xml

@@ -242,7 +242,7 @@ function preserving(regs, seq1, seq2) {
     } else {
         const first_reg = head(regs);
 
-        if (need_register(seq2, first_reg) && modifies_register(seq1, first_reg)) {
+        if (need_register(seq2, first_reg) && modifies_register(seq1, first_reg)) {
             return preserving(
                 tail(regs),
                 make_instruction_sequence(

xml/chapter5/section5/subsection5.xml

@@ -356,7 +356,7 @@ function factorial_alt(n) {
     <JAVASCRIPT>
 function factorial(n) {
     function iter(product, counter) {
-        return counter > n
+        return counter &gt; n
             ? product
             : iter(product * counter, counter + 1);
     }