From 5926f69e6c3112624d7579e2782d4c7e31be90af Mon Sep 17 00:00:00 2001
From: Jakub Doka <jakub.doka2@gmail.com>
Date: Sun, 27 Oct 2024 18:04:50 +0100
Subject: [PATCH] fixing missing upcast

---
 lang/src/fs.rs  |  6 ++++--
 lang/src/son.rs | 38 ++++++++++++++++++++++++--------------
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/lang/src/fs.rs b/lang/src/fs.rs
index 4f455fd..c62bf86 100644
--- a/lang/src/fs.rs
+++ b/lang/src/fs.rs
@@ -4,7 +4,7 @@ use {
         son,
     },
     alloc::{string::String, vec::Vec},
-    core::{fmt::Write, num::NonZeroUsize},
+    core::{fmt::Write, num::NonZeroUsize, ops::Deref},
     hashbrown::hash_map,
     std::{
         collections::VecDeque,
@@ -77,7 +77,9 @@ pub fn run_compiler(root_file: &str, options: Options, out: &mut Vec<u8>) -> std
     fn format_ast(ast: parser::Ast) -> std::io::Result<()> {
         let mut output = String::new();
         write!(output, "{ast}").unwrap();
-        std::fs::write(&*ast.path, output)?;
+        if ast.file.deref() != output.as_str() {
+            std::fs::write(&*ast.path, output)?;
+        }
         Ok(())
     }
 
diff --git a/lang/src/son.rs b/lang/src/son.rs
index 480048a..f073dac 100644
--- a/lang/src/son.rs
+++ b/lang/src/son.rs
@@ -2151,15 +2151,23 @@ impl<'a> Codegen<'a> {
                     );
                 }
 
-                if self.tys.size_of(val.ty) <= self.tys.size_of(ty) {
-                    val.ty = ty;
-                    return Some(val);
+                match self.tys.size_of(val.ty).cmp(&self.tys.size_of(ty)) {
+                    core::cmp::Ordering::Less => {
+                        self.extend(&mut val, ty);
+                        Some(val)
+                    }
+                    core::cmp::Ordering::Equal => Some(val.ty(ty)),
+                    core::cmp::Ordering::Greater => {
+                        let value = (1i64 << (self.tys.size_of(ty) * 8)) - 1;
+                        let mask = self.ci.nodes.new_node_nop(val.ty, Kind::CInt { value }, [VOID]);
+                        let inps = [VOID, val.id, mask];
+                        Some(self.ci.nodes.new_node_lit(
+                            ty,
+                            Kind::BinOp { op: TokenKind::Band },
+                            inps,
+                        ))
+                    }
                 }
-
-                let value = (1i64 << (self.tys.size_of(ty) * 8)) - 1;
-                let mask = self.ci.nodes.new_node_nop(val.ty, Kind::CInt { value }, [VOID]);
-                let inps = [VOID, val.id, mask];
-                Some(self.ci.nodes.new_node_lit(ty, Kind::BinOp { op: TokenKind::Band }, inps))
             }
             Expr::Directive { name: "as", args: [ty, expr], .. } => {
                 let ty = self.ty(ty);
@@ -3156,9 +3164,7 @@ impl<'a> Codegen<'a> {
             };
 
             if let Some(oper) = to_correct {
-                self.strip_ptr(oper);
-                oper.ty = upcasted;
-                oper.id = self.ci.nodes.new_node(upcasted, Kind::Extend, [VOID, oper.id]);
+                self.extend(oper, upcasted);
                 if matches!(op, TokenKind::Add | TokenKind::Sub)
                     && let Some(elem) = self.tys.base_of(upcasted)
                 {
@@ -3205,9 +3211,7 @@ impl<'a> Codegen<'a> {
                     self.ty_display(src.ty),
                     self.ty_display(upcasted)
                 );
-                self.strip_ptr(src);
-                src.ty = upcasted;
-                src.id = self.ci.nodes.new_node(upcasted, Kind::Extend, [VOID, src.id]);
+                self.extend(src, upcasted);
             }
             true
         } else {
@@ -3218,6 +3222,12 @@ impl<'a> Codegen<'a> {
         }
     }
 
+    fn extend(&mut self, value: &mut Value, to: ty::Id) {
+        self.strip_ptr(value);
+        value.ty = to;
+        value.id = self.ci.nodes.new_node(to, Kind::Extend, [VOID, value.id]);
+    }
+
     #[track_caller]
     fn report(&self, pos: Pos, msg: impl core::fmt::Display) {
         let mut buf = self.errors.borrow_mut();