chapter17: catch up with main

Author: RobertObkircher

README.md

@@ -6,4 +6,4 @@ Rust implementation of https://github.com/SeaOfNodes/Simple
 
 This is still a **work in progress** and the code is not very readable.
 
-The code is currently equivalent to `chapter17` of the Java implementation at commit `8d9cd9a0`.
+The code is currently equivalent to `chapter17` of the Java implementation at commit `fd5178db`.

src/sea_of_nodes/nodes.rs

@@ -357,6 +357,8 @@ impl Node {
         };
         match self.downcast(&sea.ops) {
             TypedNode::And(_) => binary_ints("&"),
+            TypedNode::Add(_) => binary_ints(&sea[self].label()),
+            TypedNode::Mul(_) => binary_ints(&sea[self].label()),
             TypedNode::Or(_) => binary_ints("|"),
             TypedNode::Xor(_) => binary_ints("^"),
             TypedNode::Sar(_) => binary_ints(">>"),

src/sea_of_nodes/nodes/idealize.rs

@@ -59,6 +59,9 @@ impl Add {
     fn idealize_add(self, sea: &mut Nodes) -> Option<Node> {
         let lhs = self.inputs(sea)[1]?;
         let rhs = self.inputs(sea)[2]?;
+        if rhs.err(sea).is_some() {
+            return None;
+        }
         let t2 = rhs.ty(sea)?;
 
         // Add of 0.  We do not check for (0+x) because this will already

src/sea_of_nodes/tests/chapter13.rs

@@ -168,6 +168,16 @@ return n.i;
     );
 }
 
+#[test]
+fn test_null_ref_4() {
+    test_error_iterate("-null-5/null-5;", "Cannot 'Add' null");
+}
+
+#[test]
+fn test_null_ref_5() {
+    test_error_iterate("return null+42;", "Cannot 'Add' null");
+}
+
 #[test]
 fn test_empty() {
     let arena = DroplessArena::new();

src/sea_of_nodes/tests/chapter17.rs

@@ -9,15 +9,7 @@ use crate::sea_of_nodes::types::Types;
 fn test_jig() {
     let arena = DroplessArena::new();
     let types = Types::new(&arena);
-    let mut parser = Parser::new(
-        "\
-int i = 0;
-i=i=1;
-return i;
-                                   //return 3.14;
-",
-        &types,
-    );
+    let mut parser = Parser::new("return 1;", &types);
     let stop = parser.parse().unwrap();
     parser.iterate(stop);
     parser.type_check(stop).unwrap();