parser returns multiple expressions in a call

include/picrin.h

@@ -90,8 +90,8 @@ pic_value pic_str_new_cstr(pic_state *, const char *);
 struct pic_vector *pic_vec_new(pic_state *, size_t);
 struct pic_vector *pic_vec_new_from_list(pic_state *, pic_value);
 
-bool pic_parse_file(pic_state *, FILE *file, pic_value *);
-bool pic_parse_cstr(pic_state *, const char *, pic_value *);
+int pic_parse_file(pic_state *, FILE *file, pic_value *);
+int pic_parse_cstr(pic_state *, const char *, pic_value *);
 
 pic_value pic_apply(pic_state *pic, struct pic_proc *, pic_value);
 pic_value pic_apply_argv(pic_state *pic, struct pic_proc *, size_t, ...);

src/init.c

@@ -2,6 +2,7 @@
 #include <stdlib.h>
 
 #include "picrin.h"
+#include "picrin/pair.h"
 
 void pic_init_pair(pic_state *);
 void pic_init_port(pic_state *);
@@ -17,8 +18,8 @@ pic_load_stdlib(pic_state *pic)
 {
   static const char *fn = "piclib/built-in.scm";
   FILE *file;
-  bool r;
-  pic_value v;
+  int n, i;
+  pic_value v, vs;
   struct pic_proc *proc;
 
   file = fopen(fn, "r");
@@ -27,24 +28,28 @@ pic_load_stdlib(pic_state *pic)
     abort();
   }
 
-  r = pic_parse_file(pic, file, &v);
-  if (! r) {
+  n = pic_parse_file(pic, file, &vs);
+  if (n <= 0) {
     fputs("fatal error: built-in.scm broken", stderr);
     abort();
   }
 
-  proc = pic_codegen(pic, v);
-  if (proc == NULL) {
-    fputs(pic->errmsg, stderr);
-    fputs("fatal error: built-in.scm compilation failure", stderr);
-    abort();
-  }
+  for (i = 0; i < n; ++i, vs = pic_cdr(pic, vs)) {
+    v = pic_car(pic, vs);
 
-  v = pic_apply(pic, proc, pic_nil_value());
-  if (pic_undef_p(v)) {
-    fputs(pic->errmsg, stderr);
-    fputs("fatal error: built-in.scm evaluation failure", stderr);
-    abort();
+    proc = pic_codegen(pic, v);
+    if (proc == NULL) {
+      fputs(pic->errmsg, stderr);
+      fputs("fatal error: built-in.scm compilation failure", stderr);
+      abort();
+    }
+
+    v = pic_apply(pic, proc, pic_nil_value());
+    if (pic_undef_p(v)) {
+      fputs(pic->errmsg, stderr);
+      fputs("fatal error: built-in.scm evaluation failure", stderr);
+      abort();
+    }
   }
 
 #if DEBUG

src/parse.y

@@ -52,14 +52,7 @@ void yylex_destroy();
 program
 	: program_data
 	{
-	  /* if single? */
-	  if (pic_eq_p(p->pic, pic_cdr(p->pic, $1), pic_nil_value())) {
-	    p->value = pic_car(p->pic, $1);
-	  }
-	  /* if multiple? */
-	  else {
-	    p->value = pic_cons(p->pic, pic_symbol_value(p->pic->sBEGIN), $1);
-	  }
+	  p->value = $1;
 	}
 	| incomplete_program_data
 	{
@@ -218,7 +211,7 @@ yylex(YYSTYPE *yylvalp, struct parser_control *p)
   return yylex_(yylvalp, p->yyscanner);
 }
 
-bool
+int
 pic_parse_file(pic_state *pic, FILE *file, pic_value *v)
 {
   struct parser_control p;
@@ -234,15 +227,17 @@ pic_parse_file(pic_state *pic, FILE *file, pic_value *v)
 
   if (p.yynerrs > 0) {
     p.value = pic_undef_value();
+    return -1;
+  }
+  if (p.incomp) {
+    return 0;
   }
 
-  if (! p.incomp) {
-    *v = p.value;
-  }
-  return ! p.incomp;
+  *v = p.value;
+  return pic_length(pic, p.value);
 }
 
-bool
+int
 pic_parse_cstr(pic_state *pic, const char *str, pic_value *v)
 {
   struct parser_control p;
@@ -257,11 +252,12 @@ pic_parse_cstr(pic_state *pic, const char *str, pic_value *v)
   yylex_destroy(p.yyscanner);
 
   if (p.yynerrs > 0) {
-    p.value = pic_undef_value();
+    return -1;
+  }
+  if (p.incomp) {
+    return 0;
   }
 
-  if (! p.incomp) {
-    *v = p.value;
-  }
-  return ! p.incomp;
+  *v = p.value;
+  return pic_length(pic, p.value);
 }

tools/main.c

@@ -2,6 +2,7 @@
 #include <unistd.h>
 
 #include "picrin.h"
+#include "picrin/pair.h"
 
 #if PIC_ENABLE_READLINE
 # include <string.h>
@@ -58,10 +59,9 @@ repl(pic_state *pic)
 {
   char code[CODE_MAX_LENGTH] = "", line[LINE_MAX_LENGTH];
   char *read_line, *prompt;
-  pic_value v;
+  pic_value v, vs;
   struct pic_proc *proc;
-  int ai;
-  bool r;
+  int ai, n, i;
 
 #if ! PIC_ENABLE_READLINE
   char last_char;
@@ -102,39 +102,45 @@ repl(pic_state *pic)
     strcat(code, line);
 
     /* read */
-    r = pic_parse_cstr(pic, code, &v);
-    if (! r) {			/* wait for more input */
+    n = pic_parse_cstr(pic, code, &vs);
+    if (n == 0) {		/* wait for more input */
       goto next;
     }
     code[0] = '\0';
-    if (pic_undef_p(v)) {	/* parse error */
+    if (n == -1) {		/* parse error */
       goto next;
     }
 
+    for (i = 0; i < n; ++i) {
+      v = pic_car(pic, vs);
+
 #if DEBUG
     printf("[read: ");
     pic_debug(pic, v);
     printf("]\n");
 #endif
 
-    /* eval */
-    proc = pic_codegen(pic, v);
-    if (proc == NULL) {
-      printf("compilation error: %s\n", pic->errmsg);
-      pic->errmsg = NULL;
-      goto next;
-    }
-    v = pic_apply(pic, proc, pic_nil_value());
-    if (pic_undef_p(v)) {
-      printf("runtime error: %s\n", pic->errmsg);
-      pic->errmsg = NULL;
-      goto next;
-    }
+      /* eval */
+      proc = pic_codegen(pic, v);
+      if (proc == NULL) {
+	printf("compilation error: %s\n", pic->errmsg);
+	pic->errmsg = NULL;
+	goto next;
+      }
+      v = pic_apply(pic, proc, pic_nil_value());
+      if (pic_undef_p(v)) {
+	printf("runtime error: %s\n", pic->errmsg);
+	pic->errmsg = NULL;
+	goto next;
+      }
 
-    /* print */
-    printf("=> ");
-    pic_debug(pic, v);
-    printf("\n");
+      /* print */
+      printf("=> ");
+      pic_debug(pic, v);
+      printf("\n");
+
+      vs = pic_cdr(pic, vs);
+    }
 
   next:
     pic_gc_arena_restore(pic, ai);