some random cleanups plus fix linker errors

Author: dan-eicher

yocto-lexer.re

@@ -108,10 +108,10 @@ yy0:
  "(" { return TOK_LPAREN; }
  ")" { return TOK_RPAREN; }
  "." { return TOK_DOT; }
- "'" { return TOK_QUOTE;  }
- "`" { return TOK_QQUOTE;  }
- "," { return TOK_UNQUOTE; }
- ",@" { return TOK_UNQUOTESP; }
+ "'" { return TOK_SQUOTE; }
+ "`" { return TOK_BACKQUOTE; }
+ "," { return TOK_COMMA;  }
+ ",@" { return TOK_COMMA_AT;  }
  "#(" { return TOK_VECTOR; }
 
  "=>" { *value = mk_symbol("=>"); return TOK_SYMBOL; }

yocto-parser.y

@@ -32,7 +32,7 @@ extern cell *UNQUOTE;
 extern cell *UNQUOTESP;
 }
 
-start ::= datums(e). { *result = e; }
+expr  ::= datums(e). { *result = e; }
 
 datums(lhs) ::= datum(e). { lhs = cons(e, NIL); }
 datums(lhs) ::= datums(a) datum(b). { lhs = list_append(a, cons(b, NIL)); }
@@ -54,10 +54,10 @@ list(lhs) ::= LPAREN datums(e) RPAREN. { lhs = e; }
 list(lhs) ::= LPAREN datums(a) DOT datum(b) RPAREN. { lhs = list_append(a, b); }
 list(lhs) ::= abbrev_prefix(a) datum(b). { lhs = cons(a, cons(b, NIL)); }
 
-abbrev_prefix(lhs) ::= QUOTE.  { lhs = QUOTE; }
-abbrev_prefix(lhs) ::= QQUOTE.  { lhs = QQUOTE; }
-abbrev_prefix(lhs) ::= UNQUOTE. { lhs = UNQUOTE; }
-abbrev_prefix(lhs) ::= UNQUOTESP. { lhs = UNQUOTESP; }
+abbrev_prefix(lhs) ::= SQUOTE. { lhs = QUOTE; }
+abbrev_prefix(lhs) ::= BACKQUOTE. { lhs = QQUOTE; }
+abbrev_prefix(lhs) ::= COMMA.  { lhs = UNQUOTE; }
+abbrev_prefix(lhs) ::= COMMA_AT.  { lhs = UNQUOTESP; }
 
 vector(lhs) ::= VECTOR RPAREN. { lhs = mk_vector(0, NIL); }
 vector(lhs) ::= VECTOR datums(e) RPAREN. { lhs = mk_vector(list_length(e), e); }

yocto.c

@@ -171,6 +171,15 @@ void Parse(void*, int, cell*, cell**);
 void *ParseAlloc(void *(*mallocProc)(size_t));
 void ParseFree(void *, void (*freeProc)(void*));
 
+char is_interactive;
+
+char *line; /* input buffer */
+
+FILE *infp; /* input file */
+FILE *outfp; /* output file */
+
+char strbuf[LINESIZE];
+
 /* ========== garbage collector ========== */
 
 /*--
@@ -2996,8 +3005,6 @@ void fatal_error(const char *msg)
 
 static void init_vars_global()
 {
- cell *x;
-
  /* init input/output file */
  infp = stdin;
  outfp = stdout;
@@ -3019,8 +3026,7 @@ static void init_vars_global()
  global_env = cons(NIL, NIL);
 
  /* init else */
- x = mk_symbol("else");
- car(global_env) = cons(cons(x, T), car(global_env));
+ car(global_env) = cons(cons(mk_symbol("else"), T), car(global_env));
 
  parser = ParseAlloc(malloc);
 }

yocto.h

@@ -30,8 +30,6 @@
 #define LINESIZE 4096
 #endif
 
-char strbuf[LINESIZE];
-
 /* cell structure */
 typedef struct cell {
  unsigned short _flag;
@@ -69,26 +67,14 @@ int list_length(cell*);
 void error(const char *);
 void fatal_error(const char *);
 
-char *line; /* input buffer */
+extern char strbuf[LINESIZE];;
+
+extern char *line; /* input buffer */
 
-FILE *infp; /* input file */
-FILE *outfp; /* output file */
+extern FILE *infp; /* input file */
+extern FILE *outfp; /* output file */
 
-char is_interactive;
-/*
-typedef enum {
- TOK_EOF,
- TOK_LPAREN,
- TOK_RPAREN,
- TOK_DOT,
- TOK_ATOM,
- TOK_QUOTE,
- TOK_BQUOTE,
- TOK_COMMA,
- TOK_ATMARK,
- TOK_VECTOR,
-} token;
-*/
+extern char is_interactive;
 
 int lex(cell**);
 void clearinput();