toni/zern
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small fixes

Browse Source
This commit is contained in:
Antoni Piasecki
2025-06-23 17:00:58 +02:00
parent e15715f86d
commit 26598fe6f2
6 changed files with 36 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/euler12.zr
View File

@@ -1,14 +1,14 @@
func num_divisors[n: I64] : I64 func num_divisors[n: I64] : I64
let end: I64 = Math.isqrt(n) let end: I64 = Math.isqrt(n)
let result: I64 = 0 let out: I64 = 0
for i in 1..end+1 for i in 1..end+1
if n % i == 0 if n % i == 0
result = result + 2 out = out + 2
if end * end == n if end * end == n
result = result - 1 out = out - 1
return result return out
func main[] : I64 func main[] : I64
let n: I64 = 0 let n: I64 = 0

2
examples/quicksort.zr
View File

@@ -1,13 +1,11 @@
func quicksort[arr: Array] : I64 func quicksort[arr: Array] : I64
do_quicksort(arr, 0, Array.size(arr)-1) do_quicksort(arr, 0, Array.size(arr)-1)
return 0
func do_quicksort[arr: Array, low: I64, high: I64] : I64 func do_quicksort[arr: Array, low: I64, high: I64] : I64
if low < high if low < high
let i: I64 = partition(arr, low, high) let i: I64 = partition(arr, low, high)
do_quicksort(arr, low, i - 1) do_quicksort(arr, low, i - 1)
do_quicksort(arr, i + 1, high) do_quicksort(arr, i + 1, high)
return 0
func partition[arr: Array, low: I64, high: I64] : I64 func partition[arr: Array, low: I64, high: I64] : I64
let pivot: I64 = Array.nth(arr, high) let pivot: I64 = Array.nth(arr, high)

7
examples/strings.zr
View File

@@ -1,7 +0,0 @@
func main[] : I64
let a: String = I64.to_string(58394)
print_i64(strlen(a))
let b: String = String.concat(a, "test")
print_i64(strlen(b))
free(a)
free(b)

5
src/codegen_x86_64.rs
View File

@@ -112,7 +112,7 @@ extern strcmp
extern strcat extern strcat
extern strcpy extern strcpy
extern strdup extern strdup
extern strlcpy extern strncpy
extern fgets extern fgets
extern fopen extern fopen
extern fseek extern fseek
@@ -360,6 +360,9 @@ Array.free:
// TODO // TODO
if name.lexeme == "main" { if name.lexeme == "main" {
emit!(&mut self.output, "global {}", name.lexeme); emit!(&mut self.output, "global {}", name.lexeme);
if return_type.lexeme != "I64" {
return error!(&name.loc, "main must return I64");
}
} }
emit!(&mut self.output, "section .text.{}", name.lexeme); emit!(&mut self.output, "section .text.{}", name.lexeme);
emit!(&mut self.output, "{}:", name.lexeme); emit!(&mut self.output, "{}:", name.lexeme);

53
src/std.zr
View File

@@ -1,15 +1,12 @@
func panic[msg: String] : I64 func panic[msg: String] : I64
printf("PANIC: %s\n", msg) printf("PANIC: %s\n", msg)
exit(1) exit(1)
return 0
func print[x: String] : I64 func print[x: String] : I64
printf("%s\n", x) printf("%s\n", x)
return 0
func print_i64[x: I64] : I64 func print_i64[x: I64] : I64
printf("%ld\n", x) printf("%ld\n", x)
return 0
func String.is_whitespace[c: U8] : Bool func String.is_whitespace[c: U8] : Bool
return c == ' ' || c == 10 || c == 13 || c == 9 return c == ' ' || c == 10 || c == 13 || c == 9
@@ -21,14 +18,19 @@ func String.concat[a: String, b: String] : String
return c return c
func String.find[s: String, needle: U8] : I64 func String.find[s: String, needle: U8] : I64
for i in 0..strlen(s) let s_len: I64 = strlen(s)
for i in 0..s_len
if String.nth(s, i) == needle if String.nth(s, i) == needle
return i return i
return -1 return -1
func String.substr[s: String, start: I64, length: I64] : String func String.substr[s: String, start: I64, length: I64] : String
if start < 0 || length < 0 || start + length > strlen(s)
panic("String.substr out of bounds")
let out: String = malloc(length + 1) let out: String = malloc(length + 1)
strlcpy(out, s + start, length + 1) strncpy(out, s + start, length)
String.set(out, length, 0)
return out return out
func String.trim[s: String] : String func String.trim[s: String] : String
@@ -80,7 +82,6 @@ func IO.write_file[path: String, content: String] : I64
fwrite(content, 1, strlen(content), file) fwrite(content, 1, strlen(content), file)
fclose(file) fclose(file)
return 0
func U8.parse_i64[c: U8]: I64 func U8.parse_i64[c: U8]: I64
return c - '0' return c - '0'
@@ -139,7 +140,7 @@ func Math.isqrt[n: I64] : I64
return guess return guess
func Math.is_prime[n: I64]: I64 func Math.is_prime[n: I64]: Bool
if n <= 1 if n <= 1
return false return false
if n == 2 || n == 3 if n == 2 || n == 3
@@ -156,7 +157,7 @@ func Math.is_prime[n: I64]: I64
func Math.urandom[]: I64 func Math.urandom[]: I64
let buffer: Ptr = malloc(8) let buffer: Ptr = malloc(8)
let file: Ptr = fopen("/dev/urandom", "r") let file: Ptr = fopen("/dev/urandom", "rb")
fread(buffer, 8, 1, file) fread(buffer, 8, 1, file)
fclose(file) fclose(file)
let n: I64 = deref(buffer) let n: I64 = deref(buffer)
@@ -183,18 +184,10 @@ func Crypto.hex_encode[s: String] : String
return out return out
func Crypto.from_hex_digit[d: U8] : I64 func Crypto.from_hex_digit[d: U8] : I64
if d == 'a' if d >= 'a' && d <= 'f'
return 10 return d - 'a' + 10
if d == 'b' if d >= 'A' && d <= 'F'
return 11 return d - 'A' + 10
if d == 'c'
return 12
if d == 'd'
return 13
if d == 'e'
return 14
if d == 'f'
return 15
return U8.parse_i64(d) return U8.parse_i64(d)
func Crypto.hex_decode[s: String] : String func Crypto.hex_decode[s: String] : String
@@ -246,7 +239,7 @@ func Crypto.rc4[key: String, plaintext: String]: String
func Crypto.base64_encode[s: String] : String func Crypto.base64_encode[s: String] : String
let chars: String = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/" let chars: String = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
let s_len: I64 = strlen(s) let s_len: I64 = strlen(s)
let output: String = malloc(s_len*2) let out: String = malloc(s_len*2)
let i: I64 = 0 let i: I64 = 0
let j: I64 = 0 let j: I64 = 0
@@ -261,21 +254,21 @@ func Crypto.base64_encode[s: String] : String
i = i + 3 i = i + 3
let triple: I64 = Bit.or(Bit.or(Bit.lshift(b1, 16), Bit.lshift(b2, 8)), b3) let triple: I64 = Bit.or(Bit.or(Bit.lshift(b1, 16), Bit.lshift(b2, 8)), b3)
String.set(output, j, String.nth(chars, Bit.and(Bit.rshift(triple, 18), 63))) String.set(out, j, String.nth(chars, Bit.and(Bit.rshift(triple, 18), 63)))
String.set(output, j+1, String.nth(chars, Bit.and(Bit.rshift(triple, 12), 63))) String.set(out, j+1, String.nth(chars, Bit.and(Bit.rshift(triple, 12), 63)))
String.set(output, j+2, String.nth(chars, Bit.and(Bit.rshift(triple, 6), 63))) String.set(out, j+2, String.nth(chars, Bit.and(Bit.rshift(triple, 6), 63)))
String.set(output, j+3, String.nth(chars, Bit.and(triple, 63))) String.set(out, j+3, String.nth(chars, Bit.and(triple, 63)))
j = j + 4 j = j + 4
let padding: I64 = s_len % 3 let padding: I64 = s_len % 3
if padding == 1 if padding == 1
String.set(output, j-2, '=') String.set(out, j-2, '=')
String.set(output, j-1, '=') String.set(out, j-1, '=')
else if padding == 2 else if padding == 2
String.set(output, j-1, '=') String.set(out, j-1, '=')
String.set(output, j, 0) String.set(out, j, 0)
return output return out
func Crypto.base64_decode[s: String] : String func Crypto.base64_decode[s: String] : String
let chars: String = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/" let chars: String = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"

5
test.zr
View File

@@ -1,4 +1,8 @@
func run_test[x: String] : I64 func run_test[x: String] : I64
// requires stdin
if strcmp(x, "guess_number.zr") == 0
return 0
printf("\033[93mBuilding %s...\033[0m", x) printf("\033[93mBuilding %s...\033[0m", x)
let cmd: String = String.concat("./target/release/zern examples/", x) let cmd: String = String.concat("./target/release/zern examples/", x)
@@ -16,7 +20,6 @@ func run_test[x: String] : I64
let run_end_time: I64 = OS.time() let run_end_time: I64 = OS.time()
printf("\033[93mRunning %s...\033[0m %ldms\n", x, run_end_time - run_start_time) printf("\033[93mRunning %s...\033[0m %ldms\n", x, run_end_time - run_start_time)
return 0
func main[] : I64 func main[] : I64
system("cargo build --release") system("cargo build --release")