From 1dd1ba377bebb7d4ae2089cda25eca1d3f6bd490 Mon Sep 17 00:00:00 2001
From: IgorCielniak <igorcielniak.contact@gmail.com>
Date: Sun, 14 Dec 2025 17:02:09 +0100
Subject: [PATCH] added support for raw l2 statementrs inside 'fn' decls

---
 a.out          | Bin 7616 -> 7760 bytes
 build/t.asm    |  27 +++++++++++++++++++++++++++
 build/t.o      | Bin 3984 -> 4128 bytes
 build/test.asm |  40 ++++++++++++++++++++--------------------
 build/test.o   | Bin 7472 -> 7472 bytes
 fn.sl          |  43 +++++++++++++++++++++++++++++++++++++++++--
 t.sl           |   8 +++++---
 7 files changed, 93 insertions(+), 25 deletions(-)

diff --git a/a.out b/a.out
index 5ea17b99f8ed72a413c43acc14dfde00853217e9..b3b29121da1194e429d505e59de9100342b01006 100755
GIT binary patch
delta 354
zcmX?LeZgje2IGZ^n)#f^SQx<I*v5s0{EUs8g$2x6>R+t<|NsAsB|yTn`3;BXaTXOu
zprRLNe<K7ynqKTfSFskPuj?<6=mfD^fW%>#5zIgxFg6oN_cV}_N;ESM17#*hiHL2^
z7s+HX{1391fstXlhy#cL2b>@S7=VO=16&Nm5SaW?LYz?=Oe#%QloV&w1(W8J10}^J
zy?`17fTl4Bpz3m++z3<|2qqmiZ<G{bVouA?pS)N4(BuXg1;%5O7s`~2o)Cf9)WHg&
cLE&aTSyxt@Ge8O=5-~YZ)|_$0<e9SS0MAQm*8l(j

delta 180
zcmca$bHI9n2BX77&3w*q76vc~-?*@lpV4Hquz)$s<eegFn;(c|urM-APLvd9WS=|{
zND6^T$;k(SY!whGsmBD;%EZv1-~=%QN;*#d2vlP;Sy4)y(F07HZ?=>YVwxNxvu85D
ttRiFhWJB3<(FhTU`T|x64RVRu<h`=moF^n9BL0&<%9=BZPu7%E2LLe<B+38)

diff --git a/build/t.asm b/build/t.asm
index f74035a..7e46e8e 100644
--- a/build/t.asm
+++ b/build/t.asm
@@ -362,7 +362,34 @@ word_rpick:
 	sub r12, 8
 	mov [r12], rax
     ret
+word_foo:
+    call word__3er
+    call word__3er
+    ; push 1
+    sub r12, 8
+    mov qword [r12], 1
+    call word_puts
+    ; push 0
+    sub r12, 8
+    mov qword [r12], 0
+    call word_rpick
+    ; push 1
+    sub r12, 8
+    mov qword [r12], 1
+    call word_rpick
+    call word__2b
+    call word_rdrop
+    call word_rdrop
+    ret
 word_main:
+    ; push 3
+    sub r12, 8
+    mov qword [r12], 3
+    ; push 2
+    sub r12, 8
+    mov qword [r12], 2
+    call word_foo
+    call word_puts
     ; push 0
     sub r12, 8
     mov qword [r12], 0
diff --git a/build/t.o b/build/t.o
index c1e85278562ccd4efbb96aa8ac03ee758a99a7e0..0ea6b002457362013319686525e35b6e86cba0bf 100644
GIT binary patch
delta 313
zcmbOrzd&Ka0>)z#7n(B(uupUpoA^Nk$e1j}Xa}OA80|y@*crfJ2P=eT15!4V*D`8z
z3h+Wi5+*-nG-oQ{pDe{>!PvMtn8}=_{>94w|Np;O0wg?}-*9*yXHj7UDt>YHH$niU
z`NckT6>CBIy8Z%*P7tdFNF0V4!3@*^V>5wtPXj5bL^Ja+P-gQ?Hhxw~Hjp9)MuzDu
zAQ}M#CLiRMoqUX2h*^b+VX`BmD5Lh|kKE#nW?<5GvLcT-qX(D_njFYuFfo8*b0ZHU
S6LVUA{^T0I=*bWGHUI#zU}uy7

delta 175
zcmZ3WFhPF80><!(3(c7puuXInoA^Nk$e1j}Xa}OA80|zKurYwa0#*nO;#yB$%c#xS
zzylEppZt)~oaq7IWGN;KMw89KOy(@Sp3QGKJdd-efK(jb%+4;z%E&(1kVl+R2uR9K
wPU8_`RGK^y$kzpvCX){W+4f-4bMj3dgUy1xj7*cI`9nD%b}%qZ&gb6<08#TNzW@LL

diff --git a/build/test.asm b/build/test.asm
index d8efd13..90ffe3c 100644
--- a/build/test.asm
+++ b/build/test.asm
@@ -594,18 +594,18 @@ word_test_2dif:
     mov rax, [r12]
     add r12, 8
     test rax, rax
-    jz L_if_false_34
+    jz L_if_false_40
     ; push 111
     sub r12, 8
     mov qword [r12], 111
     call word_puts
-    jmp L_if_end_35
-L_if_false_34:
+    jmp L_if_end_41
+L_if_false_40:
     ; push 222
     sub r12, 8
     mov qword [r12], 222
     call word_puts
-L_if_end_35:
+L_if_end_41:
     ret
 word_test_2delse_2dif:
     ; push 2
@@ -619,13 +619,13 @@ word_test_2delse_2dif:
     mov rax, [r12]
     add r12, 8
     test rax, rax
-    jz L_if_false_36
+    jz L_if_false_42
     ; push 50
     sub r12, 8
     mov qword [r12], 50
     call word_puts
-    jmp L_if_end_37
-L_if_false_36:
+    jmp L_if_end_43
+L_if_false_42:
     call word_dup
     ; push 2
     sub r12, 8
@@ -634,19 +634,19 @@ L_if_false_36:
     mov rax, [r12]
     add r12, 8
     test rax, rax
-    jz L_if_false_38
+    jz L_if_false_44
     ; push 60
     sub r12, 8
     mov qword [r12], 60
     call word_puts
-    jmp L_if_end_39
-L_if_false_38:
+    jmp L_if_end_45
+L_if_false_44:
     ; push 70
     sub r12, 8
     mov qword [r12], 70
     call word_puts
-L_if_end_39:
-L_if_end_37:
+L_if_end_45:
+L_if_end_43:
     call word_drop
     ret
 word_test_2dfor:
@@ -659,10 +659,10 @@ word_test_2dfor:
     mov rax, [r12]
     add r12, 8
     cmp rax, 0
-    jle L_for_end_41
+    jle L_for_end_47
     sub r13, 8
     mov [r13], rax
-L_for_loop_40:
+L_for_loop_46:
     ; push 1
     sub r12, 8
     mov qword [r12], 1
@@ -670,9 +670,9 @@ L_for_loop_40:
     mov rax, [r13]
     dec rax
     mov [r13], rax
-    jg L_for_loop_40
+    jg L_for_loop_46
     add r13, 8
-L_for_end_41:
+L_for_end_47:
     call word_puts
     ret
 word_test_2dfor_2dzero:
@@ -685,17 +685,17 @@ word_test_2dfor_2dzero:
     mov rax, [r12]
     add r12, 8
     cmp rax, 0
-    jle L_for_end_43
+    jle L_for_end_49
     sub r13, 8
     mov [r13], rax
-L_for_loop_42:
+L_for_loop_48:
     call word_drop
     mov rax, [r13]
     dec rax
     mov [r13], rax
-    jg L_for_loop_42
+    jg L_for_loop_48
     add r13, 8
-L_for_end_43:
+L_for_end_49:
     call word_puts
     ret
 word_test_2dstruct:
diff --git a/build/test.o b/build/test.o
index 8ab8ab8318f34bd75f6a89c3074d8bd01b459d76..bdfbac0b3bc4931fc68ed187689da36f9b14ed65 100644
GIT binary patch
delta 134
zcmdmBwZUqGj5ME#0fSF`W?Fn|UP`=);bbjorC<{yh)`N$PH}3yi3ySdQzW)ALwSBt
vN_<IbaY?*UN?LvqP!34O=j7)X#G9Bwd0=zRC(oBw;j=&%vfO-8I-U^#aLp`L

delta 134
zcmdmBwZUqGj5MFI34>33W?Fn|UP`>N>0~WwrC?(-h)`N$PH}3yu?3O>OC+{ALwSBt
wN_<IbaY?*UN?LvqP!34O=j7)X#G4pEc_4F53@6W*R^c;37Bb#^Q97Ox0CkTnPXGV_

diff --git a/fn.sl b/fn.sl
index b2914a6..9c011a3 100644
--- a/fn.sl
+++ b/fn.sl
@@ -128,6 +128,46 @@ compile-only
 ;
 compile-only
 
+
+: fn-filter-raw-body             # bodyLexemes -- tokens
+	list-new swap                   # out body
+begin
+	dup list-empty? if
+		drop                           # out
+		exit
+	then
+	list-pop-front                  # out body' tok
+	swap >r                         # out tok           (r: body')
+	dup "return" string= if
+		drop
+		r>
+		continue
+	then
+	dup ";" string= if
+		drop
+		r>
+		continue
+	then
+	list-append                     # out'
+	r>                              # out' body'
+	continue
+again
+;
+compile-only
+
+
+: fn-body->tokens                # bodyLexemes -- tokens
+	dup list-length 0 == if "empty function body" parse-error then
+	dup 0 list-get token-lexeme "return" string= if
+		fn-validate-body              # expr
+		shunt                         # postfix
+		exit
+	then
+	fn-filter-raw-body
+	dup list-length 0 == if "empty function body" parse-error then
+;
+compile-only
+
 : fn-emit-prologue             # params out -- params out
 	over list-length              # params out n
 begin
@@ -322,8 +362,7 @@ compile-only
 	fn-collect-body                   # params bodyTokens
 	swap >r                           # bodyTokens (r: params)
 	fn-lexemes-from-tokens            # lexemes
-	fn-validate-body                  # expr
-	shunt                             # postfix
+	fn-body->tokens                   # tokens
 	r>                                # postfix params
 	fn-build-body                     # body
 	r> drop                           # drop name string
diff --git a/t.sl b/t.sl
index 4833ba2..7eee533 100644
--- a/t.sl
+++ b/t.sl
@@ -1,13 +1,15 @@
 import stdlib.sl
 import fn.sl
 
-fn foo(int a){
-    return a + 1;
+fn foo(int a, int b){
+    1
+    puts
+    return a b +;
 }
 
 : main
     extend-syntax
-    foo(1)
+    foo(3, 2)
     puts
     0
 ;
\ No newline at end of file