From bf647e430e3a3642c8199dc81a411d5e1586cabb Mon Sep 17 00:00:00 2001 From: nic-gaffney Date: Sun, 25 Jun 2023 18:55:58 -0500 Subject: Standard library beginnings --- std/stdlib.sloth | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 std/stdlib.sloth (limited to 'std/stdlib.sloth') diff --git a/std/stdlib.sloth b/std/stdlib.sloth new file mode 100644 index 0000000..7b6e2f9 --- /dev/null +++ b/std/stdlib.sloth @@ -0,0 +1,14 @@ +foreign fn wait(x: Int) Void; +foreign fn print(str: String) Void; + +fn termpos(x: int, y: int) Void { + print("\x1b["); + print(x); + print(";"); + print(y); + print("H"); +} + +fn termclear() Void { + print("\x1b[2J\x1b[H"); +} -- cgit v1.2.3 From 28ab9c8ba094d86dbcb9abb853dddd83dca028cc Mon Sep 17 00:00:00 2001 From: nic-gaffney Date: Sun, 25 Jun 2023 19:41:03 -0500 Subject: Standard library updated and llvm-sys added to cargo.toml --- Cargo.lock | 1 + examples/mergesort.sloth | 4 ++++ sloth/Cargo.toml | 1 + std/stdlib.c | 8 ++++++++ std/stdlib.sloth | 2 ++ std/stdmath.c | 11 +++++++++++ std/stdmath.sloth | 2 +- 7 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 examples/mergesort.sloth create mode 100644 std/stdmath.c (limited to 'std/stdlib.sloth') diff --git a/Cargo.lock b/Cargo.lock index 1d886a8..8652bed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -254,6 +254,7 @@ version = "0.1.0" dependencies = [ "inkwell", "itertools", + "llvm-sys", "rand", "thiserror", ] diff --git a/examples/mergesort.sloth b/examples/mergesort.sloth new file mode 100644 index 0000000..f1e5901 --- /dev/null +++ b/examples/mergesort.sloth @@ -0,0 +1,4 @@ +fn merge_sort(list: List) { + print(list); + +} diff --git a/sloth/Cargo.toml b/sloth/Cargo.toml index 1146e8e..f58f40e 100644 --- a/sloth/Cargo.toml +++ b/sloth/Cargo.toml @@ -6,6 +6,7 @@ version.workspace = true edition.workspace = true [dependencies] +llvm-sys = "150" inkwell = { version = "0.2.0", features = ["llvm15-0"] } itertools = "0.10.5" rand = "0.8.5" diff --git a/std/stdlib.c b/std/stdlib.c index b50c0c5..f8df9e8 100644 --- a/std/stdlib.c +++ b/std/stdlib.c @@ -3,3 +3,11 @@ void wait(long long x) { sleep(x); } + +int len(char *str) { + return strlen(str); +} + +char charAt(char *str, int) { + return str[int]; +} diff --git a/std/stdlib.sloth b/std/stdlib.sloth index 7b6e2f9..36f3879 100644 --- a/std/stdlib.sloth +++ b/std/stdlib.sloth @@ -1,5 +1,7 @@ foreign fn wait(x: Int) Void; foreign fn print(str: String) Void; +foreign fn len(str: String) Int; +foreign fn charAt(str: String) Char; fn termpos(x: int, y: int) Void { print("\x1b["); diff --git a/std/stdmath.c b/std/stdmath.c new file mode 100644 index 0000000..c9a91c3 --- /dev/null +++ b/std/stdmath.c @@ -0,0 +1,11 @@ +#include +#include +#include + +int randGen(int min, int max) { + time_t t; + + srand((unsigned) time(&t)); + + return rand() % (max - min + 1) + min; +} diff --git a/std/stdmath.sloth b/std/stdmath.sloth index ebf9a7c..0f967eb 100644 --- a/std/stdmath.sloth +++ b/std/stdmath.sloth @@ -1,4 +1,4 @@ -foreign fn rand() Int; +foreign fn randGen(min: Int, max: Int) Int; fn abs(x: Int) Int { if x < 0 { -- cgit v1.2.3 From debb3b9a9c2cab0791396f008af7021968121001 Mon Sep 17 00:00:00 2001 From: nic-gaffney Date: Sun, 25 Jun 2023 20:18:08 -0500 Subject: stdlib --- std/stdlib.c | 2 +- std/stdlib.sloth | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'std/stdlib.sloth') diff --git a/std/stdlib.c b/std/stdlib.c index f8df9e8..d27b36f 100644 --- a/std/stdlib.c +++ b/std/stdlib.c @@ -4,7 +4,7 @@ void wait(long long x) { sleep(x); } -int len(char *str) { +int slen(char *str) { return strlen(str); } diff --git a/std/stdlib.sloth b/std/stdlib.sloth index 36f3879..b1849e3 100644 --- a/std/stdlib.sloth +++ b/std/stdlib.sloth @@ -1,6 +1,6 @@ foreign fn wait(x: Int) Void; foreign fn print(str: String) Void; -foreign fn len(str: String) Int; +foreign fn slen(str: String) Int; foreign fn charAt(str: String) Char; fn termpos(x: int, y: int) Void { -- cgit v1.2.3 From c3bb1751d7f62a13a46f28c1eb67d9e20d8d6f7f Mon Sep 17 00:00:00 2001 From: nic-gaffney Date: Sun, 25 Jun 2023 23:21:02 -0500 Subject: Fixed standard library --- std/stdio.c | 2 +- std/stdlib.c | 14 ++++++++++---- std/stdlib.sloth | 1 + std/stdmath.c | 10 ++++------ 4 files changed, 16 insertions(+), 11 deletions(-) (limited to 'std/stdlib.sloth') diff --git a/std/stdio.c b/std/stdio.c index d1bc69a..1a4d98c 100644 --- a/std/stdio.c +++ b/std/stdio.c @@ -8,5 +8,5 @@ char* readln() { } void print(char *str) { - puts(str); + fputs(str, stdout); } diff --git a/std/stdlib.c b/std/stdlib.c index d27b36f..7e77385 100644 --- a/std/stdlib.c +++ b/std/stdlib.c @@ -1,13 +1,19 @@ #include +#include +#include void wait(long long x) { sleep(x); } -int slen(char *str) { - return strlen(str); +long long slen(char *str) { + return (long long) strlen(str); } -char charAt(char *str, int) { - return str[int]; +char charAt(char *str, long long x) { + return str[x]; +} + +long long parse_int(char *str) { + return (long long) atoi(str); } diff --git a/std/stdlib.sloth b/std/stdlib.sloth index b1849e3..d7ddeff 100644 --- a/std/stdlib.sloth +++ b/std/stdlib.sloth @@ -2,6 +2,7 @@ foreign fn wait(x: Int) Void; foreign fn print(str: String) Void; foreign fn slen(str: String) Int; foreign fn charAt(str: String) Char; +foreign fn parse_int(str: String) Int; fn termpos(x: int, y: int) Void { print("\x1b["); diff --git a/std/stdmath.c b/std/stdmath.c index c9a91c3..dad292f 100644 --- a/std/stdmath.c +++ b/std/stdmath.c @@ -2,10 +2,8 @@ #include #include -int randGen(int min, int max) { - time_t t; - - srand((unsigned) time(&t)); - - return rand() % (max - min + 1) + min; + +long long randGen(long long min, long long max) { + srandom((unsigned) time(NULL)); + return random() % (max - min + 1) + min; } -- cgit v1.2.3