From 4d3ed205fc2b86180f81fea388e488f5fa96cef9 Mon Sep 17 00:00:00 2001
From: Teddy <ted.sybil@gmail.com>
Date: Mon, 12 Aug 2013 19:37:57 +0800
Subject: basic gc

---
 main.cpp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'main.cpp')

diff --git a/main.cpp b/main.cpp
index 78515a6..a193b68 100644
--- a/main.cpp
+++ b/main.cpp
@@ -3,13 +3,15 @@
 #include "parser.h"
 #include "eval.h"
 #include "exc.h"
+#include "gc.h"
 
 #include <cstdio>
 #include <cstdlib>
 
-Tokenizor *tk = new Tokenizor();
-ASTGenerator *ast = new ASTGenerator();
-Evaluator *eval = new Evaluator();
+GarbageCollector gc;
+Tokenizor tk;
+ASTGenerator ast;
+Evaluator eval;
 
 void load_file(const char *fname) {
     FILE *f = fopen(fname, "r");
@@ -18,14 +20,14 @@ void load_file(const char *fname) {
         printf("Can not open file: %s\n", fname);
         exit(0);
     }
-    tk->set_stream(f);
+    tk.set_stream(f);
     while (1)
     {
         try
         {
-            Pair *tree = ast->absorb(tk);
+            Pair *tree = ast.absorb(&tk);
             if (!tree) break;
-            eval->run_expr(tree);
+            eval.run_expr(tree);
         }
         catch (GeneralError &e)
         {
@@ -79,15 +81,15 @@ int main(int argc, char **argv) {
     }
 
     int rcnt = 0;
-    tk->set_stream(stdin);  // interactive mode
+    tk.set_stream(stdin);  // interactive mode
     while (1)
     {
         fprintf(stderr, "Sonsi> ");
         try
         {
-            Pair *tree = ast->absorb(tk);
+            Pair *tree = ast.absorb(&tk);
             if (!tree) break;
-            string output = eval->run_expr(tree)->ext_repr();
+            string output = eval.run_expr(tree)->ext_repr();
             fprintf(stderr, "Ret> $%d = %s\n", rcnt++, output.c_str());
         }
         catch (GeneralError &e)
-- 
cgit v1.2.3


From 55d1072441582936d119ed04fd8c532c2760b9d4 Mon Sep 17 00:00:00 2001
From: Teddy <ted.sybil@gmail.com>
Date: Mon, 12 Aug 2013 20:37:38 +0800
Subject: ...

---
 main.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'main.cpp')

diff --git a/main.cpp b/main.cpp
index a193b68..7549daa 100644
--- a/main.cpp
+++ b/main.cpp
@@ -48,8 +48,15 @@ void print_help(const char *cmd) {
     exit(0);
 }
 
+EmptyList *empty_list = new EmptyList();
+UnspecObj *unspec_obj = new UnspecObj();
+
 int main(int argc, char **argv) {
 
+    freopen("in.scm", "r", stdin);
+    gc.attach(empty_list);
+    gc.attach(unspec_obj);
+
     for (int i = 1; i < argc; i++)
     {
         if (*argv[i] == '-')    // parsing options
@@ -96,5 +103,6 @@ int main(int argc, char **argv) {
         {
             fprintf(stderr, "An error occured: %s\n", e.get_msg().c_str());
         }
+        gc.force();
     }
 }
-- 
cgit v1.2.3


From 79a2ecc929b30ae40f9324c258d8ded99ecde259 Mon Sep 17 00:00:00 2001
From: Teddy <ted.sybil@gmail.com>
Date: Tue, 13 Aug 2013 00:31:11 +0800
Subject: gc can now work

---
 main.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'main.cpp')

diff --git a/main.cpp b/main.cpp
index 7549daa..15a877e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -27,12 +27,14 @@ void load_file(const char *fname) {
         {
             Pair *tree = ast.absorb(&tk);
             if (!tree) break;
-            eval.run_expr(tree);
+            EvalObj *ret = eval.run_expr(tree);
+            gc.expose(ret);
         }
         catch (GeneralError &e)
         {
             fprintf(stderr, "An error occured: %s\n", e.get_msg().c_str());
         }
+        gc.force();
     }
 }
 
@@ -53,7 +55,7 @@ UnspecObj *unspec_obj = new UnspecObj();
 
 int main(int argc, char **argv) {
 
-    freopen("in.scm", "r", stdin);
+    //freopen("in.scm", "r", stdin);
     gc.attach(empty_list);
     gc.attach(unspec_obj);
 
@@ -96,7 +98,9 @@ int main(int argc, char **argv) {
         {
             Pair *tree = ast.absorb(&tk);
             if (!tree) break;
-            string output = eval.run_expr(tree)->ext_repr();
+            EvalObj *ret = eval.run_expr(tree);
+            string output = ret->ext_repr();
+            gc.expose(ret);
             fprintf(stderr, "Ret> $%d = %s\n", rcnt++, output.c_str());
         }
         catch (GeneralError &e)
-- 
cgit v1.2.3