restructured filetree

slothlang · Sep 6, 2023 · 7b67ab3 · 7b67ab3
1 parent 739421c
commit 7b67ab3
Show file tree

Hide file tree

Showing 15 changed files with 12 additions and 28 deletions.
diff --git a/build.sh b/build.sh
@@ -1,12 +1,12 @@
 # Build Sloth
 cargo build
-rm output.o
 FILENAME="$1"
 # Compile standard library
 ./target/debug/sloth std/extern.sloth std/stdmath.sloth std/stdio.sloth $FILENAME
 
 # Generate binary
-clang --verbose -lm output.o std/stdio.c std/stdlib.c std/stdmath.c -o "${FILENAME%.sloth}"
+clang -lm output.o std/stdio.c std/stdlib.c std/stdmath.c -o "${FILENAME%.sloth}"
 
 # Move file
-mv "${FILENAME%.sloth}" .
+mv "${FILENAME%.sloth}" out/
+rm output.o
diff --git a/examples/guessing.sloth b/examples/guessing.sloth
@@ -1,5 +1,5 @@
 fn main() Int {
-	var computer: Int = randGen(1, 10);
+	val computer: Int = randGen(1, 10);
 	var tries: Int = 0;
 	var correct: Bool = false;
 

diff --git a/out/arguments b/out/arguments
diff --git a/out/cgol b/out/cgol
diff --git a/out/chatbot b/out/chatbot
diff --git a/out/guessing b/out/guessing
diff --git a/out/hello b/out/hello
diff --git a/out/mandelbrot b/out/mandelbrot
diff --git a/out/mutable b/out/mutable
diff --git a/out/read b/out/read
diff --git a/out/system b/out/system
diff --git a/sloth/src/codegen/mod.rs b/sloth/src/codegen/mod.rs
@@ -71,7 +71,6 @@ impl<'ctx> Codegen<'ctx> {
 
         for stmt in stmts {
             self.codegen_stmt(stmt);
-            self.current_func.unwrap().print_to_stderr();
         }
     }
 

diff --git a/std/stdsocket.c b/std/stdsocket.c
@@ -1,4 +1,3 @@
-#include "stdlib.c"
 #include <netinet/in.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -66,6 +65,14 @@ char *recvsock(int soc) {
   return buf;
 }
 
+size_t
+strlen(const char *str)
+{
+    const char *s;
+    for (s = str; *s; ++s);
+    return(s - str);
+}
+
 void sendsock(char *msg, int soc) { send(soc, msg, strlen(msg), 0); }
 
 void closesock(int soc, bool server) {

diff --git a/test.c b/test.c
diff --git a/test.sh b/test.sh