From 360c49aa05988aa30de83912df26d70d58e4f045 Mon Sep 17 00:00:00 2001
From: mmitou <mitou.interface@gmail.com>
Date: Mon, 29 Nov 2010 07:39:39 -0800
Subject: [PATCH] add evaluate_file

---
 README         |   2 +-
 lispobj.c      | 120 ++++++++++++++++++++++---------------------------
 lispobj.h      |   2 +-
 test_lispobj.c |   9 +---
 4 files changed, 58 insertions(+), 75 deletions(-)

diff --git a/README b/README
index 8b21099..6b432b3 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 以下の事だけできます。
 
 syntax:
-define lambda begin
+define defmacro lambda begin cond
 
 primitive procedure:
 + car cdr
diff --git a/lispobj.c b/lispobj.c
index 5964fff..5254aa7 100644
--- a/lispobj.c
+++ b/lispobj.c
@@ -7,7 +7,7 @@
 
 typedef enum type_id 
 {
-   SYMBOL, CELL, INTEGER, CHARACTER, BOOLEAN, 
+   SYMBOL, CELL, INTEGER, CHARACTER, BOOLEAN, STRING,
    SYNTAX, MACRO, PRIM_PROC, LAMBDA,  NUM_OF_TYPES
 } type_id;
 
@@ -281,80 +281,24 @@ int list_length(list *l)
 /*@null@*/
 string *new_string(char *s)
 {
-   char *i = s;
-   character *c = NULL;
-   character *d = NULL;
-   string *result = NULL;
-
-   if(*i != '\0')
-   {
-      result = new_character(*i);
-      c = result;
-      i++;
-      while(*i != '\0')
-      {
-         d = new_character(*i);
-         set_cdr(c, d);
-         c = d;
-         ++i;
-      }
-   }
-   
-   return result;
+   string *ns = (string*)malloc(sizeof(string));
+   ns->tid = STRING;
+   set_car(ns, s);
+   set_cdr(ns, NULL);
+   return ns;
 }
 
 bool is_string(lispobj *s)
 {
-   bool result = false;
-   if(s == NULL)
-   {
-      result = true;
-   }
-   else if(is_character(s))
-   {
-      result = is_string(cdr(s));
-   }
-   else
-   {
-      result = false;
-   }
-   return result;
+   return s->tid == STRING;
 }
 
 bool equal_string(string *l, string *r)
 {
-   bool result = false;
-   if(l == NULL && r == NULL)
-   {
-      result = true;
-   }
-   else if( l != NULL && r != NULL)
-   {
-      if(equal_character(l, r))
-      {
-         result = equal_string(cdr(l), cdr(r));
-      }
-   }
-   return result;
+   return strcmp(car(l), car(r)) == 0;
 }
 
-/*@null@*/
-char *string_to_chars(string *l)
-{
-   int len = list_length(l);
-   char *result = (char*)malloc(sizeof(char)*len + 1);
-   char *i = result;
-   character *c = l;
 
-   while(c != NULL)
-   {
-      *i = *(char*)(c->value[0]);
-      ++i;
-      c = c->value[1];
-   }
-   *i = '\0';
-   return result;
-}
 
 bool generic_equal(lispobj *l, lispobj *r)
 {
@@ -1488,8 +1432,7 @@ bool equal_boolean(boolean *lhs, boolean *rhs)
    }
 }
 
-#ifdef __MAIN__
-int main()
+bool repl()
 {
    char buf[256];
    environment *env = new_env();
@@ -1509,6 +1452,51 @@ int main()
       }
       printf("\n");
    }
+   return true;
+}
+
+lispobj* evaluate_file(char *filepath, environment *env)
+{
+   FILE *fp = fopen(filepath, "r");
+   char buf[BUFSIZ] = {0};
+   list *tokens = cons("(", cons("begin", NULL));
+   list *objs;
+
+   if(fp == NULL)
+   {
+      fprintf(stderr, "fopen error");
+      abort();
+   }
+
+   while(fgets(buf, BUFSIZ, fp))
+   {
+      append(tokens,tokenize(buf));
+   }
+
+   append(tokens, tokenize(")"));
+   tokens = expand_readmacro(tokens);
+   objs = read_tokens(tokens);
+   objs = eval(objs, env);
+   print_result(objs);
+   printf("\n");
+
+   fclose(fp);
+
+   return objs;
+}
+
+
+#ifdef __MAIN__
+int main(int argc, char **argv)
+{
+   if(argc == 2)
+   {
+      evaluate_file(argv[1], new_env());
+   }
+   else
+   {
+      repl();
+   }
    return 0;
 }
 #endif
diff --git a/lispobj.h b/lispobj.h
index 5245eee..a582a8b 100644
--- a/lispobj.h
+++ b/lispobj.h
@@ -59,7 +59,7 @@ typedef list string;
 string *new_string(char *s);
 bool is_string(lispobj *s);
 bool equal_string(string *l, string *r);
-char *string_to_chars(string *l);
+
 
 /* generic func */
 bool generic_equal(lispobj *l, lispobj *r);
diff --git a/test_lispobj.c b/test_lispobj.c
index c164020..3367943 100644
--- a/test_lispobj.c
+++ b/test_lispobj.c
@@ -245,9 +245,8 @@ int test_quote()
 int test_string()
 {
    string *s = new_string("hello!");
-   char *c = string_to_chars(cdr(s));
-
-   printf("%s\n", c);
+   assert(is_string(s));
+   assert(strcmp(car(s), "hello!") == 0);
    return 1;
 }
 
@@ -570,18 +569,14 @@ int main()
    test_cell();
    test_list();
    test_environment();
-
    test_eval();
-
    test_plus_integer();
    test_begin();
-
    test_string();
    test_tokenize();
    test_newlispobj();
    test_expandreadmacro();
    test_read_tokens();
-
    test_macro();
    test_equal();
    test_cond();