thirteen

JonathanWoollett-Light · Dec 6, 2023 · 3092e4e · 3092e4e
1 parent 6804cf3
commit 3092e4e
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 7 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -2393,11 +2393,22 @@ mod tests {
         // Optimization
         let optimized = test_optimization(
             path,
-            &[Statement {
-                comptime: false,
-                op: Op::Syscall(Syscall::Exit),
-                arg: vec![Value::Literal(Literal::Integer(253))],
-            }],
+            &[
+                Statement {
+                    comptime: false,
+                    op: Op::Special(Special::Type),
+                    arg: vec![
+                        Value::Variable(Variable::new("x")),
+                        Value::Type(Type::U8),
+                        Value::Literal(Literal::Integer(1)),
+                    ],
+                },
+                Statement {
+                    comptime: false,
+                    op: Op::Syscall(Syscall::Exit),
+                    arg: vec![Value::Literal(Literal::Integer(253))],
+                },
+            ],
             HashSet::from([]),
             &[Statement {
                 comptime: false,

diff --git a/src/middle.rs b/src/middle.rs
@@ -175,6 +175,9 @@ pub unsafe fn build_optimized_tree(
                                             first_node = next_state_node.as_ref().statement;
                                         }
                                     }
+                                    next_state_node.as_mut().statement.as_mut().preceding =
+                                        current.as_ref().statement.as_ref().preceding;
+
                                     alloc::dealloc(
                                         current.as_ref().statement.as_ptr().cast(),
                                         alloc::Layout::new::<NewNode>(),
@@ -242,6 +245,9 @@ pub unsafe fn build_optimized_tree(
                                             first_node = next_state_node.as_ref().statement;
                                         }
                                     }
+                                    next_state_node.as_mut().statement.as_mut().preceding =
+                                        current.as_ref().statement.as_ref().preceding;
+
                                     alloc::dealloc(
                                         current.as_ref().statement.as_ptr().cast(),
                                         alloc::Layout::new::<NewNode>(),
@@ -308,7 +314,10 @@ pub unsafe fn build_optimized_tree(
                                             // is both the 1st node and last node, thus removing it is an error.
                                             first_node = next_state_node.as_ref().statement;
                                         }
-                                    }
+                                    };
+                                    next_state_node.as_mut().statement.as_mut().preceding =
+                                        current.as_ref().statement.as_ref().preceding;
+
                                     alloc::dealloc(
                                         current.as_ref().statement.as_ptr().cast(),
                                         alloc::Layout::new::<NewNode>(),
@@ -376,6 +385,9 @@ pub unsafe fn build_optimized_tree(
                                             first_node = next_state_node.as_ref().statement;
                                         }
                                     }
+                                    next_state_node.as_mut().statement.as_mut().preceding =
+                                        current.as_ref().statement.as_ref().preceding;
+
                                     alloc::dealloc(
                                         current.as_ref().statement.as_ptr().cast(),
                                         alloc::Layout::new::<NewNode>(),
@@ -437,6 +449,9 @@ pub unsafe fn build_optimized_tree(
                             first_node = next_state_node.as_ref().statement;
                         }
                     }
+                    next_state_node.as_mut().statement.as_mut().preceding =
+                        current.as_ref().statement.as_ref().preceding;
+
                     alloc::dealloc(
                         current.as_ref().statement.as_ptr().cast(),
                         alloc::Layout::new::<NewNode>(),
@@ -515,8 +530,8 @@ pub unsafe fn finish_optimized_tree(
                     identifier,
                     index: None,
                 }), Value::Type(_), Value::Literal(_)] => {
+                    dbg!(&read);
                     if !read.contains(identifier) {
-                        dbg!();
                         match current.as_ref().preceding {
                             Some(Preceding::Parent(mut parent)) => {
                                 parent.as_mut().child = current.as_ref().next;