Update scope to be more memory efficient (#17)

Author: OJddJO

benchmark/README.md

@@ -7,35 +7,45 @@ This directory contains the benchmarking code for the project. The benchmarking
 On my pc:
 ```
 Running benchmark for 'if' scripts
-Python: 17.039089 s for 500 iterations (avg: 0.034078 s/iter)
-Word: 1.779429 s for 500 iterations (avg: 0.003559 s/iter)
-Ratio python/word: 9.58x
+Python: 3.458411 s for 100 iterations (avg: 0.034584 s/iter)
+Word: 0.359912 s for 100 iterations (avg: 0.003599 s/iter)
+Ratio python/word: 9.61x
 
 Running benchmark for 'while' scripts
-Python: 18.221854 s for 500 iterations (avg: 0.036444 s/iter)
-Word: 1.875409 s for 500 iterations (avg: 0.003751 s/iter)
-Ratio python/word: 9.72x
-
-Running benchmark for 'fibonacci' scripts
-Python: 17.432245 s for 500 iterations (avg: 0.034864 s/iter)
-Word: 2.396842 s for 500 iterations (avg: 0.004794 s/iter)
-Ratio python/word: 7.27x
+Python: 3.489668 s for 100 iterations (avg: 0.034897 s/iter)
+Word: 0.358798 s for 100 iterations (avg: 0.003588 s/iter)
+Ratio python/word: 9.73x
+
+Running benchmark for 'fibonacci_10' scripts
+Python: 3.48353 s for 100 iterations (avg: 0.034835 s/iter)
+Word: 0.448602 s for 100 iterations (avg: 0.004486 s/iter)
+Ratio python/word: 7.77x
+
+Running benchmark for 'fibonacci_20' scripts
+Python: 3.564039 s for 100 iterations (avg: 0.03564 s/iter)
+Word: 7.678685 s for 100 iterations (avg: 0.076787 s/iter)
+Ratio python/word: 0.46x
 ```
 
 On Github Actions:
 ```
 Running benchmark for 'if' scripts
-Python: 2.042915 s for 100 iterations (avg: 0.020429 s/iter)
-Word: 0.395542 s for 100 iterations (avg: 0.003955 s/iter)
-Ratio python/word: 5.16x
+Python: 1.965424 s for 100 iterations (avg: 0.019654 s/iter)
+Word: 0.384423 s for 100 iterations (avg: 0.003844 s/iter)
+Ratio python/word: 5.11x
 
 Running benchmark for 'while' scripts
-Python: 2.008363 s for 100 iterations (avg: 0.020084 s/iter)
-Word: 0.376756 s for 100 iterations (avg: 0.003768 s/iter)
-Ratio python/word: 5.33x
-
-Running benchmark for 'fibonacci' scripts
-Python: 2.001812 s for 100 iterations (avg: 0.020018 s/iter)
-Word: 0.558315 s for 100 iterations (avg: 0.005583 s/iter)
-Ratio python/word: 3.59x
+Python: 2.005564 s for 100 iterations (avg: 0.020056 s/iter)
+Word: 0.388103 s for 100 iterations (avg: 0.003881 s/iter)
+Ratio python/word: 5.17x
+
+Running benchmark for 'fibonacci_10' scripts
+Python: 1.979016 s for 100 iterations (avg: 0.01979 s/iter)
+Word: 0.520043 s for 100 iterations (avg: 0.0052 s/iter)
+Ratio python/word: 3.81x
+
+Running benchmark for 'fibonacci_20' scripts
+Python: 2.141 s for 100 iterations (avg: 0.02141 s/iter)
+Word: 13.687988 s for 100 iterations (avg: 0.13688 s/iter)
+Ratio python/word: 0.16x
 ```

benchmark/benchmark.py

@@ -1,34 +1,51 @@
-import timeit
-import subprocess
-import sys
+import timeit, subprocess, sys, os
 
 def execute_python():
-    subprocess.run(["python", f"./scripts/{file}.py"], stdout=subprocess.DEVNULL)
+    out = subprocess.run(["python", f"./scripts/{file}.py"], stdout=subprocess.DEVNULL, stderr=subprocess.PIPE)
+    if out.returncode != 0:
+        raise Exception(f"Error while executing python script [Code: {out.returncode}]\n{out.stderr.decode('utf-8')}")
 
 def execute_word():
-    subprocess.run(["../bin/word.exe", f"./scripts/{file}.w"], stdout=subprocess.DEVNULL)
+    out = subprocess.run(["../bin/word.exe", f"./scripts/{file}.w"], stdout=subprocess.DEVNULL, stderr=subprocess.PIPE)
+    if out.returncode != 0:
+        raise Exception(f"Error while executing word script [Code: {out.returncode}]\n{out.stderr.decode('utf-8')}")
 
 def execute_py_output():
     out = subprocess.run(["python", f"./scripts/{file}.py"], stdout=subprocess.PIPE)
+    if out.returncode != 0:
+        raise Exception(f"Error while executing python script [Code: {out.returncode}]\n{out.stderr.decode('utf-8')}")
     print(out.stdout.decode("utf-8"))
 
 def execute_word_output():
     out = subprocess.run(["../bin/word.exe", f"./scripts/{file}.w"], stdout=subprocess.PIPE)
+    if out.returncode != 0:
+        raise Exception(f"Error while executing word script [Code: {out.returncode}]\n{out.stderr.decode('utf-8')}")
     print(out.stdout.decode("utf-8"))
 
 if __name__ == "__main__":
     if len(sys.argv) > 1:
         nb_iterations = int(sys.argv[1])
     else:
         nb_iterations = 1000
-    file_list = ["if", "while", "fibonacci"]
-    for file in file_list:
+
+    #Get list of files
+    file_list = [file.split(".")[0] for file in os.listdir("./scripts") if file.endswith(".py")]
+
+    for file in file_list: # Benchmark for each file
         print(f"Running benchmark for '{file}' scripts")
+
+        #Python
         py_time = timeit.timeit(execute_python, number=nb_iterations)
         print(f"Python: {round(py_time, 6)} s for {nb_iterations} iterations (avg: {round(py_time/nb_iterations, 6)} s/iter)")
+
+        #Word
         word_time = timeit.timeit(execute_word, number=nb_iterations)
         print(f"Word: {round(word_time, 6)} s for {nb_iterations} iterations (avg: {round(word_time/nb_iterations, 6)} s/iter)")
+
+        #Ratio python/word
         print(f"Ratio python/word: {round(py_time/word_time, 2)}x")
+
+        #Outputs
         print("Output for Python:")
         execute_py_output()
         print("Output for Word:")

benchmark/scripts/fibonacci.py renamed to benchmark/scripts/fibonacci_10.py

@@ -0,0 +1,10 @@
+def fibonacci(n):
+    if n == 0:
+        return 0
+    elif n == 1:
+        return 1
+    else:
+        return fibonacci(n-1) + fibonacci(n-2)
+
+result = fibonacci(20)
+print("Fibonacci of 20 is", result)

benchmark/scripts/fibonacci.w renamed to benchmark/scripts/fibonacci_10.w

@@ -0,0 +1,14 @@
+def int fibonacci with int n
+    if n equal 0
+        return 0
+    elif n equal 1
+        return 1
+    else
+        call fibonacci with n minus 1 store result1
+        call fibonacci with n minus 2 store result2
+        return result1 plus result2
+    endif
+enddef
+
+call fibonacci with 20 store result
+print "Fibonacci of 20 is" result

benchmark/scripts/fibonacci_20.py

@@ -1,9 +1,12 @@
-int value assign 3
+def int fibonacci with int n
+    if n less 2
+        return n
+    else
+        call fibonacci with n minus 1 store result1
+        call fibonacci with n minus 2 store result2
+        return result1 plus result2
+    endif
+enddef
 
-if value equal 0
-    print "Value is 0"
-elif value equal 1
-    print "Value is 1"
-else
-    print "Value is neither 0 nor 1"
-endif
+call fibonacci with 10 store result
+print result

benchmark/scripts/fibonacci_20.w

@@ -5,17 +5,18 @@
 #include <stdio.h>
 #include "lexer.h"
 #include "parser.h"
+#include "scope.h"
 #include "w_stdlib.h"
 
 char *type_keywords[] = {
     "null", "int", "float", "str", "bool", "list",
 };
 
-void *execute(list *parsed_code, W_Dict *args, W_Type return_type);
+void *execute(list *parsed_code, Scope *current_scope, W_Type return_type, bool destroy_vars_on_exit);
 
 // Utility
 
-void eval_parsed_lines(list_element *parsed_line, W_Dict *variables, list *stack);
+void eval_parsed_lines(list_element *parsed_line, Scope *scope, list *stack);
 char *remove_dot(W_Word *word);
 bool is_type_keyword(char *word);
 bool is_float(char *str);

bin/test.w

@@ -24,6 +24,8 @@ typedef struct _list {
 list *list_init();
 void list_append(list *l, void *value);
 void list_remove(list *l, int index);
+void *list_get(list *l, int index);
+void list_insert(list *l, int index, void *value);
 int list_size(list *l);
 void *list_pop(list *l);
 void list_destroy(list *l);

bin/word.exe

@@ -0,0 +1,17 @@
+#ifndef __SCOPE_H__
+#define __SCOPE_H__
+
+#include <stdlib.h>
+#include "w_type.h"
+#include "w_dict.h"
+
+typedef struct _scope {
+    struct _scope *parent;
+    W_Dict *vars;
+} Scope;
+
+Scope *init_scope();
+W_Var *get_var(Scope *scope, char *name);
+void destroy_scope(Scope *scope);
+
+#endif