From aecfff9b31a0a4f041ebdcaf52f4edd36abe7303 Mon Sep 17 00:00:00 2001
From: Robert-M-Lucas <robert-m-lucas@example.com>
Date: Fri, 7 Jun 2024 22:12:26 +0100
Subject: [PATCH] Testing

---
 .idea/workspace.xml                    |  22 +++++++++--
 build/out.asm                          |  52 ++++++++++++++++++-------
 build/out.o                            | Bin 704 -> 784 bytes
 build/out.out                          | Bin 16512 -> 16536 bytes
 main.why                               |   7 +++-
 src/root/compiler/compile_evaluable.rs |  13 ++++++-
 todo.txt                               |   6 +++
 7 files changed, 79 insertions(+), 21 deletions(-)
 create mode 100644 todo.txt

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff53f32..3e680f9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,8 +7,13 @@
     <cargoProject FILE="$PROJECT_DIR$/Cargo.toml" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="6ca282eb-dc8c-4af0-945c-cd77d70c6194" name="Changes" comment="Got functions working (maybe)">
+    <list default="true" id="6ca282eb-dc8c-4af0-945c-cd77d70c6194" name="Changes" comment="Testing">
+      <change afterPath="$PROJECT_DIR$/todo.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/build/out.asm" beforeDir="false" afterPath="$PROJECT_DIR$/build/out.asm" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/build/out.o" beforeDir="false" afterPath="$PROJECT_DIR$/build/out.o" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/build/out.out" beforeDir="false" afterPath="$PROJECT_DIR$/build/out.out" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/main.why" beforeDir="false" afterPath="$PROJECT_DIR$/main.why" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/root/compiler/compile_evaluable.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/root/compiler/compile_evaluable.rs" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -152,7 +157,7 @@
       <workItem from="1717718549578" duration="18000" />
       <workItem from="1717763561634" duration="6367000" />
       <workItem from="1717781715695" duration="1569000" />
-      <workItem from="1717788640969" duration="5582000" />
+      <workItem from="1717788640969" duration="6030000" />
     </task>
     <task id="LOCAL-00001" summary="Changes">
       <option name="closed" value="true" />
@@ -330,7 +335,15 @@
       <option name="project" value="LOCAL" />
       <updated>1717794101530</updated>
     </task>
-    <option name="localTasksCounter" value="23" />
+    <task id="LOCAL-00023" summary="Testing">
+      <option name="closed" value="true" />
+      <created>1717794233364</created>
+      <option name="number" value="00023" />
+      <option name="presentableId" value="LOCAL-00023" />
+      <option name="project" value="LOCAL" />
+      <updated>1717794233364</updated>
+    </task>
+    <option name="localTasksCounter" value="24" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -362,6 +375,7 @@
     <MESSAGE value="Added ability for first inline function to run" />
     <MESSAGE value="Improved function call code" />
     <MESSAGE value="Got functions working (maybe)" />
-    <option name="LAST_COMMIT_MESSAGE" value="Got functions working (maybe)" />
+    <MESSAGE value="Testing" />
+    <option name="LAST_COMMIT_MESSAGE" value="Testing" />
   </component>
 </project>
\ No newline at end of file
diff --git a/build/out.asm b/build/out.asm
index b8b4c39..556c2a7 100644
--- a/build/out.asm
+++ b/build/out.asm
@@ -2,20 +2,6 @@
 
     section .text
 
-_1:
-    push rbp
-    mov rbp, rsp
-    
-    mov rax, qword [rbp+16]
-    mov qword [rbp-8], rax
-    mov rax, qword [rbp+24]
-    mov qword [rbp-16], rax
-    mov rax, qword [rbp-8]
-    add rax, qword [rbp-16]
-    mov qword [rbp+32], rax
-    leave
-    ret
-
 main:
     push rbp
     mov rbp, rsp
@@ -35,3 +21,41 @@ main:
 	leave
 	ret
 
+_1:
+    push rbp
+    mov rbp, rsp
+    
+    mov rax, qword [rbp+16]
+    mov qword [rbp-8], rax
+    mov rax, qword [rbp+24]
+    mov qword [rbp-16], rax
+    mov rax, qword [rbp-8]
+    mov qword [rbp-40], rax
+    mov rax, qword [rbp-16]
+    mov qword [rbp-48], rax
+    sub rsp, 48
+    call _2
+    add rsp, 48
+    mov rax, qword [rbp-32]
+    mov qword [rbp+32], rax
+    leave
+    ret
+
+_2:
+    push rbp
+    mov rbp, rsp
+    
+    mov rax, qword [rbp+16]
+    mov qword [rbp-16], rax
+    mov rax, qword [rbp+24]
+    mov qword [rbp-24], rax
+    mov rax, qword [rbp-16]
+    add rax, qword [rbp-24]
+    mov qword [rbp-8], rax
+    mov qword [rbp-32], 1
+    mov rax, qword [rbp-8]
+    add rax, qword [rbp-32]
+    mov qword [rbp+32], rax
+    leave
+    ret
+
diff --git a/build/out.o b/build/out.o
index 067be45ff3121c501839e6ba8bfa8eedd661c372..38cd473cc6648467c191eb9ceee2542271b19a6a 100644
GIT binary patch
delta 259
zcmX@WI)QD%0>%v!7n(B}FipH=Cz`;-00t8v6ax#8W}U3dsLlBSDkC*Hkx^yxaz+&~
zA)uT`^AQV=Zr2+govuHC^pBH=CpR!kMsxy2x?Mj2MK5?XzcF~h2T^JO6np>_R5*D!
z)T8q$kS74-eE`xDK>7t(3p0=g8Ft+D0V7Bk&`=L%n6Akm7%R+0fWiz6j12Z*8bOGI
jnT!lo2q7?wA4m!?Fi!4gQV`5d%*<nmH)M!6f+_+4oX<nV

delta 186
zcmbQhc7S!l0>;FN3(c86FiyN>C#t~200tEhih%`4vrN`y)aG0Ol@Xtu$fz>;2%`um
zv+D<sPFIDKhbK2MYN~Gh|Np;7^AQV=Zr2+?;U7Ty$H~J`V_?)|1EvZ^elU*_CI+X4
nfGhz9Mh2ycjuP@orI|S?`uU|LdWprk4Dp5xxrv#1aHR|YM6W1F

diff --git a/build/out.out b/build/out.out
index a8496cf90c02a9b4d01bf921a80c7ae63130112f..01b4f8897ef6150436b5fd87fd8a3847fa25fe98 100755
GIT binary patch
delta 659
zcmZ9IyH6WI5XNWku!I$3?PBm@5s5p=5}+uU_!*EDt}!~N;34s>sM1h@lrjYu3S^Ly
zplQ;DhChH@gJ>`^5>OaO7bu7+kX(Rds0<ZzcQ%o|#g4x3H#0l4D<=DCvLAh{YqS5K
zx5&UbMN6<*spI<lgXi(=;|f&9a!<R5SH)3NvA)RrKE^T4FEAy-!FDPzRuA7B8=1dG
zE>opgJt-g;p}8D68<`5Z=f>*oVA=1c4w6|SQ#~n68@U@&oK%Hk7sawuB2%=R9c4=P
zNaR%wxn5;`7P|kpy5whhYk6Q__U467NdU)aM!Rt;8h&x|w$rFE9}T}cu2mF;jysZO
z@fc@p9JP3$6Tk=SHSBbyYY#<CVFk>_BcVT}83e%ipx3bzFL5)jgzg;L3FVPSD&qms
z2rZ*R5I}FFD&7<ACE6~vL46&kEnRO>ODLXUyOxFxuq;j{l+X-m0raP;+pDFP{s~Q@
zi%u^eOmLTaYBYvB2_^fLC<g^vn&$ZC_&(rG`=kAq6ol5M{9h=Nr_w^yx=JocmOfOH
r*cNK($p0U==F@9(n<2Z;zoyWEcO!4SdeU{aQPWf2o0O~Gk?MH{%f*uR

delta 536
zcmbQy$k@=xI6;GvVWQ@J&PGNCFlgK?$QaHf61XRM*Y@gn_L55)d%hRtZ|u|QVcuNB
zyq|~BXtIsK&B-BxBAm>wA3Qo;6;2+WEFh>Ux$*!1{~papEIhhhZvcgV0O=nm4+G8I
zd_d5FZ}I{bpG^t{e2gWV3-$IhbCw7?fUT>U+-M{{ImAeXvk)p$2ogc%O+H|x!d(NE
zZxnQxypc(9vw*PxBcs4%MHAu4BE}+&2PP+)=rf+1Jkdm4@;caPeg**rh$Ubyka#uu
zpousu1JI{JKqG`1btZo_5%-h@@&y>g7+4%oRjYv1G4V3MoC-5V3#y(0O}+W#KvQu^
zH=wK_6CVQyn%%*Z8-cP(V7=lD9B6veCvODG8h~tM;9*b@fVe~rYGwW8hd|kGuwEVp
zBWOUt+%sXapqV)1oXMJI=QjT`i(}dxYWbLnF>tb_jXpe>fuU~G&dh7T4ACS5q=YB4
XI%sohm_bAqO}2C}XFN5z&_NvlqX%sl

diff --git a/main.why b/main.why
index af803de..09c2ada 100644
--- a/main.why
+++ b/main.why
@@ -1,7 +1,10 @@
-
 impl int {
     fn sub(lhs: int, rhs: int) -> int {
-        return lhs + rhs + rhs;
+        return lhs == rhs;
+    }
+
+    fn eq(lhs: int, rhs: int) -> int {
+        return lhs + rhs + 1;
     }
 }
 
diff --git a/src/root/compiler/compile_evaluable.rs b/src/root/compiler/compile_evaluable.rs
index 237cc90..53a03ba 100644
--- a/src/root/compiler/compile_evaluable.rs
+++ b/src/root/compiler/compile_evaluable.rs
@@ -217,7 +217,18 @@ pub fn compile_evaluable_type_only(
             let tid = literal.literal().default_type();
             TypeRef::new(tid.clone(), Indirection(0))
         }
-        EvaluableTokens::InfixOperator(_, _, _) => todo!(),
+        EvaluableTokens::InfixOperator(lhs, op, _) => {
+            if op.is_prefix_opt_t() {
+                return Err(WErr::n(EvalErrs::FoundPrefixNotInfixOp(op.operator().to_str().to_string()), op.location().clone()));
+            }
+
+            // let (mut code, lhs) = compile_evaluable(fid, lhs, local_variables, global_table, function_calls)?;
+            let lhs_type = compile_evaluable_type_only(fid, lhs, local_variables, global_table, function_calls)?;
+            // code += "\n";
+            let op_fn = global_table.get_operator_function(*lhs_type.type_id(), op)?;
+            let signature = global_table.get_function_signature(op_fn);
+            signature.return_type().as_ref().unwrap().clone()
+        },
         EvaluableTokens::PrefixOperator(_, _) => todo!(),
         EvaluableTokens::DynamicAccess(_, _) => todo!(), // Accessed methods must be called
         EvaluableTokens::StaticAccess(_, n) => return Err(WErr::n(NRErrors::CannotFindConstantAttribute(n.name().clone()), n.location().clone())), // Accessed methods must be called
diff --git a/todo.txt b/todo.txt
new file mode 100644
index 0000000..aaec117
--- /dev/null
+++ b/todo.txt
@@ -0,0 +1,6 @@
+Add support for multiple functions with the same name but different signatures
+Allow operators to be both prefix and infix i.e. -a or a - b
+Fix evaluables such as (a + b) or (a + b) + c or a + b + c not working
+Add rich parser errors
+Add all errors in
+All other todos, of course
\ No newline at end of file