chapter17: fix remaining compilation errors

Author: RobertObkircher

src/sea_of_nodes/nodes/idealize.rs

@@ -5,7 +5,7 @@ use crate::sea_of_nodes::nodes::node::{
     Sub, TypedNode,
 };
 use crate::sea_of_nodes::nodes::{BoolOp, Node, Nodes, Op};
-use crate::sea_of_nodes::types::{Int, Type};
+use crate::sea_of_nodes::types::Type;
 
 impl Node {
     /// do not peephole directly returned values!
@@ -534,15 +534,15 @@ impl Load {
                         name,
                         alias,
                         declared_ty,
-                        [mem.inputs(sea)[1].unwrap(), ptr],
+                        [mem.inputs(sea)[1].unwrap(), ptr, todo!()],
                         sea,
                     )
                     .peephole(sea);
                     let ld2 = Load::new(
                         name,
                         alias,
                         declared_ty,
-                        [mem.inputs(sea)[2].unwrap(), ptr],
+                        [mem.inputs(sea)[2].unwrap(), ptr, todo!()],
                         sea,
                     )
                     .peephole(sea);
@@ -629,9 +629,7 @@ impl Minus {
 impl Div {
     fn idealize_div(self, sea: &mut Nodes) -> Option<Node> {
         // Div of 1.
-        if let Some(Type::Int(Int::Constant(1))) =
-            self.inputs(sea)[2].and_then(|n| n.ty(sea)).as_deref()
-        {
+        if Some(*sea.tys.int_one) == self.inputs(sea)[2].and_then(|n| n.ty(sea)) {
             return self.inputs(sea)[1];
         }
         None

src/sea_of_nodes/nodes/peephole.rs

@@ -404,7 +404,7 @@ impl<'t> Node {
                 ts.push(types.ctrl);
                 ts.push(**ptr);
                 for (i, f) in fs.iter().enumerate() {
-                    let mem = in_ty(i+2).as_mem();
+                    let mem = in_ty(i + 2).as_mem();
                     let tfld = in_ty(2 + fs.len() + i).meet(mem.data().t, types);
                     ts.push(*types.get_mem(f.alias, tfld));
                 }

src/sea_of_nodes/nodes/scope.rs

@@ -8,7 +8,7 @@ use std::fmt;
 //
 
 #[derive(Clone, Debug)]
-struct Var<'t> {
+pub struct Var<'t> {
     /// index in containing scope
     pub index: usize,
     /// Declared name

src/sea_of_nodes/parser.rs

@@ -241,8 +241,8 @@ impl<'s, 't> Parser<'s, 't> {
     /// </pre>
     ///
     /// Does not parse the opening or closing `{}`
-    fn parse_block(&mut self, inCon: bool) -> PResult<()> {
-        self.scope.push(inCon, &mut self.nodes);
+    fn parse_block(&mut self, in_con: bool) -> PResult<()> {
+        self.scope.push(in_con, &mut self.nodes);
         while !self.peek('}') && !self.lexer.is_eof() {
             self.parse_statement()?;
         }
@@ -303,7 +303,7 @@ impl<'s, 't> Parser<'s, 't> {
         self.scope.push(false, &mut self.nodes); // Scope for the index variables
         if !self.match_(";") {
             // Can be empty init "for(;test;next) body"
-            self.parse_declaration_statement(); // Non-empty init
+            self.parse_declaration_statement()?; // Non-empty init
         }
         let rez = self.parse_looping(true);
         self.scope.pop(&mut self.nodes); // Exit index variable scope
@@ -629,7 +629,7 @@ impl<'s, 't> Parser<'s, 't> {
             )
             .peep(self)
         };
-        r.peephole(&mut self.nodes);
+        let _ = r.peephole(&mut self.nodes);
         Ok(ret)
     }