13 files changed, 36 insertions, 16 deletions
diff --git a/comp/lucas-standen-NEA/code2/Makefile b/comp/lucas-standen-NEA/code2/Makefile
index 60e84c6..9db83ac 100644
--- a/comp/lucas-standen-NEA/code2/Makefile
+++ b/comp/lucas-standen-NEA/code2/Makefile
@@ -8,6 +8,7 @@ all:
 clean:
 	rm -rf zpy *.o *.core sample out stdlib/*.o
 	cd stdlib && make clean
+	cd examples && make clean
 
 install: all 
 	mkdir -p /usr/local/share/zpylib
@@ -16,5 +17,8 @@ install: all
 
 	cd stdlib && make install
 
+example: all
+	cd examples && make
+
 uninstall: 
 	rm /usr/local/bin/zpy
diff --git a/comp/lucas-standen-NEA/code2/comp.c b/comp/lucas-standen-NEA/code2/comp.c
index 6d96994..c21bc3a 100644
--- a/comp/lucas-standen-NEA/code2/comp.c
+++ b/comp/lucas-standen-NEA/code2/comp.c
@@ -158,7 +158,7 @@ char *compile(astNode *node){
 		out = appendsnprintf(out, MAXOUTLEN, "}\n");
 	}
 	else if (strcmp(names[6], node->func) == 0){
-		out = appendsnprintf(out, MAXOUTLEN, "else if (%s", node->args[0]);
+		out = appendsnprintf(out, MAXOUTLEN, "}else if (%s", node->args[0]);
 		out = appendsnprintf(out, MAXOUTLEN, "){\n");
 	}
 	else if (strcmp(names[7], node->func) == 0){
diff --git a/comp/lucas-standen-NEA/code2/examples/Makefile b/comp/lucas-standen-NEA/code2/examples/Makefile
index ccb9b35..13178a5 100644
--- a/comp/lucas-standen-NEA/code2/examples/Makefile
+++ b/comp/lucas-standen-NEA/code2/examples/Makefile
@@ -3,4 +3,4 @@ all:
 	zpy fib_example.zpy -o fib_example -f -ggdb
 	zpy str_example.zpy -o str_example -f -ggdb
 clean:
-	rm -rf fib_example raylib_example
+	rm -rf fib_example raylib_example str_example
diff --git a/comp/lucas-standen-NEA/code2/examples/dvd.png b/comp/lucas-standen-NEA/code2/examples/dvd.png
new file mode 100644
index 0000000..8e219f7
--- /dev/null
+++ b/comp/lucas-standen-NEA/code2/examples/dvd.png
diff --git a/comp/lucas-standen-NEA/code2/examples/fib_example b/comp/lucas-standen-NEA/code2/examples/fib_example
index e81a20c..d9748fd 100755
--- a/comp/lucas-standen-NEA/code2/examples/fib_example
+++ b/comp/lucas-standen-NEA/code2/examples/fib_example
diff --git a/comp/lucas-standen-NEA/code2/examples/raylib_example b/comp/lucas-standen-NEA/code2/examples/raylib_example
index 2e3f1e9..5b946d1 100755
--- a/comp/lucas-standen-NEA/code2/examples/raylib_example
+++ b/comp/lucas-standen-NEA/code2/examples/raylib_example
diff --git a/comp/lucas-standen-NEA/code2/examples/raylib_example.c b/comp/lucas-standen-NEA/code2/examples/raylib_example.c
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/comp/lucas-standen-NEA/code2/examples/raylib_example.c
diff --git a/comp/lucas-standen-NEA/code2/examples/raylib_example.zpy b/comp/lucas-standen-NEA/code2/examples/raylib_example.zpy
index 931c0e4..10f326e 100644
--- a/comp/lucas-standen-NEA/code2/examples/raylib_example.zpy
+++ b/comp/lucas-standen-NEA/code2/examples/raylib_example.zpy
@@ -1,16 +1,36 @@
 (defun main int)
-	(InitWindow 800 800 "test")
-	(SetTargetFPS 40)
-	(let x:int 0)
-	(let y:int 0)
+	(InitWindow 800 800 "test_test")
+	(SetTargetFPS 60)
+
+	(let img:Image (LoadImage "dvd.png"))
+	(let tex:Texture (LoadTextureFromImage img))
+	(UnloadImage img)
+
+	(let x:int (randint 1 9))
+	(let y:int (randint 1 9))
+	(let xd:int (randint 1 5))
+	(let yd:int (randint 1 5))
+
 	(for i:int 0 (= (WindowShouldClose) 0) 0)
 		(BeginDrawing)
 		(ClearBackground RAYWHITE)
-		(DrawText "test" x y 40 RED)
+		(DrawTexture tex x y WHITE)
 		(EndDrawing)
 
-		(set x (+ x 5))
-		(set y (+ y 5))
+		(set x (+ x xd))
+		(set y (+ y yd))
+
+		(if (> x 750))
+			(set xd -xd)
+		(elif (< x 0))
+			(set xd -xd)
+		(endif)
+		(if (> y 750))
+			(set yd -yd)
+		(elif (< y 0))
+			(set yd -yd)
+		(endif)
+
 	(endfor)
 	(CloseWindow)
 (endfun)
diff --git a/comp/lucas-standen-NEA/code2/examples/str_example b/comp/lucas-standen-NEA/code2/examples/str_example
index ca715dd..b73017f 100755
--- a/comp/lucas-standen-NEA/code2/examples/str_example
+++ b/comp/lucas-standen-NEA/code2/examples/str_example
diff --git a/comp/lucas-standen-NEA/code2/stdlib/zpylib.c b/comp/lucas-standen-NEA/code2/stdlib/zpylib.c
index 11b6a88..9932785 100644
--- a/comp/lucas-standen-NEA/code2/stdlib/zpylib.c
+++ b/comp/lucas-standen-NEA/code2/stdlib/zpylib.c
@@ -35,6 +35,5 @@ double readfloat(){
 }
 
 int randint(int lower, int upper){
-	srand(time(NULL));
-	return rand() % (((upper + 1) - lower) + lower);
+	return random() % (((upper + 1) - lower) + lower);
 }
diff --git a/comp/lucas-standen-NEA/code2/tokenizer.c b/comp/lucas-standen-NEA/code2/tokenizer.c
index 6275a7a..7e8cae1 100644
--- a/comp/lucas-standen-NEA/code2/tokenizer.c
+++ b/comp/lucas-standen-NEA/code2/tokenizer.c
@@ -3,6 +3,7 @@
 #include<string.h>
 
 #include "util.h"
+#include "appendsnprintf.h"
 
 typedef struct astNode {
 	char *func;
@@ -68,7 +69,7 @@ top:
 			} else{
 				head->args[argCount] = chunk;
 				argCount++;
-			}
+			} 
 		}
 	}
 
diff --git a/comp/lucas-standen-NEA/code2/zpy b/comp/lucas-standen-NEA/code2/zpy
index 10b0fdd..df68993 100755
--- a/comp/lucas-standen-NEA/code2/zpy
+++ b/comp/lucas-standen-NEA/code2/zpy
diff --git a/comp/lucas-standen-NEA/code2/zpy.sh b/comp/lucas-standen-NEA/code2/zpy.sh
deleted file mode 100755
index bd212fb..0000000
--- a/comp/lucas-standen-NEA/code2/zpy.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-CC=cc
-warnings="-Wno-builtin-declaration-mismatch -Wno-implicit -Wno-missing-declarations" 
-./zpy $1 | ${CC} ${warnings} -x c - -o $2