cw/main.c

@@ -200,7 +200,6 @@ void add_var_to_env(NODE *tree, ENV *env_ptr) {
   BIND* existing;
   NODE* var_name = tree->left->left;
   TOKEN* name_token = (TOKEN*) var_name;
-  if (debug) printf("assigning %s:\n", name_token->lexeme);
   BIND* node = recursive_interpret(tree->right, env_ptr);
   if ((existing = find_name_in_env(name_token, env_ptr)) == NULL) {
     if (env_ptr->bindings == NULL) {
@@ -263,14 +262,6 @@ BIND* recursive_interpret(NODE *tree, ENV *env_ptr) {
         if(debug)print_tree(var_bind->tree);
       }
       return var_bind;
-      /* if (var_bind->tree->type == CONSTANT) { */
-      /*   return var_bind->tree; */
-      /* } else { */
-      /*   print_tree(var_bind->tree); */
-      /*   printf("I GOT A %d from %s\n", var_bind->tree->type, var_bind->name->lexeme); */
-      /*   printf("Maybe got a function?\n"); */
-      /*   return NULL; */
-      /* } */
     }
   }
   if (tree->type=='D') {
@@ -290,6 +281,10 @@ BIND* recursive_interpret(NODE *tree, ENV *env_ptr) {
       printf("Could not find binding for function with name %s\n", func_name->lexeme);
       exit(1);
     }
+    if (func->tree->type != 'D') {
+      printf("Tried to call non-function %s as a function\n", func_name->lexeme);
+      exit(1);
+    }
     ENV* new_func_env = create_new_function_env(func->env);
     if (debug) printf("Calling function %s\n", func_name->lexeme);
     if (tree->right != NULL) {
@@ -439,8 +434,8 @@ void interpret_tree(NODE *tree) {
   }
   // print ref_main to make sure we really got it
   printf("Located %s, ready to run!\n", ref_main->name->lexeme);
-  recursive_interpret(ref_main->tree->right, ref_main->env);
-  /* printf("%d\n", ((TOKEN*)recursive_interpret(ref_main->tree->right, ref_main->env))->value); */
+  ENV* main_env = create_new_function_env(ref_main->env);
+  recursive_interpret(ref_main->tree->right, main_env);
   printf("%d\n", ((TOKEN*)ret_val->tree)->value);
 }
 

cw/simple.c

@@ -1,15 +1,8 @@
-int whammy(int a) {
-  return a + 5;
-}
-
-function twice(function f) {
-  int g(int x) { return f(f(x)); }
-  return g;
-}
-
 int main() {
-  x = twice(whammy);
+  int b = 4;
+
+  int a = b();
 
-  return x(2);
+  return x;
 }
 

cw/tests/scope.c

@@ -0,0 +1,12 @@
+/* ##answer: Could not find variable b */
+int whammy(int a) {
+  return a + b;
+}
+
+int main() {
+  int b = 4;
+  x = whammy(5);
+
+  return x;
+}
+

cw/tests/test.sh

@@ -4,10 +4,12 @@ if [ "$uname" = "Darwin" ]; then
   date="gdate"
   readlink="greadlink"
   wc="gwc"
+  sed="gsed"
 else
   date="date"
   readlink="readlink"
   wc="wc"
+  sed="sed"
 fi
 start=$($date +%s.%N)
 absdir=$($readlink -f $(dirname $0))
@@ -23,10 +25,11 @@ num=$((num-2))
 fmt=`echo "%-$num""s"`
 for i in $(ls $absdir | grep .\*.c | sort); do
   answer=`$absdir/../mycc < $absdir/$i | tail -n 1`
-  exp_ans=`grep --color=none "##answer" $absdir/$i | sed 's/[^0-9]\+\([0-9]\+\).\+/\1/g'`
+  # exp_ans=`grep --color=none "##answer" $absdir/$i | $sed 's/[^0-9]\+\([0-9]\+\).\+/\1/g'`
+  exp_ans=`grep --color=none "##answer" $absdir/$i | $sed 's/\/\* ##answer:\s\+\([^\*]\+\)\b\s*\*\//\1/g'`
   printf $fmt "${i%.*}"
   echo -n " ... "
-  if [ "$answer" -eq "$exp_ans" ]; then
+  if [ "$answer" == "$exp_ans" ]; then
     echo -e "$pass"
     passes=$((passes+1))
   else

tac/C.tab.h

@@ -1,13 +1,14 @@
-/* A Bison parser, made by GNU Bison 3.0.4.  */
+/* A Bison parser, made by GNU Bison 2.3.  */
 
-/* Bison interface for Yacc-like parsers in C
+/* Skeleton interface for Bison's Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
 
-   This program is free software: you can redistribute it and/or modify
+   This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,9 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -30,54 +33,65 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-#ifndef YY_YY_C_TAB_H_INCLUDED
-# define YY_YY_C_TAB_H_INCLUDED
-/* Debug traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
-#if YYDEBUG
-extern int yydebug;
-#endif
-
-/* Token type.  */
+/* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-  enum yytokentype
-  {
-    IDENTIFIER = 258,
-    CONSTANT = 259,
-    STRING_LITERAL = 260,
-    LE_OP = 261,
-    GE_OP = 262,
-    EQ_OP = 263,
-    NE_OP = 264,
-    EXTERN = 265,
-    AUTO = 266,
-    INT = 267,
-    VOID = 268,
-    FUNCTION = 269,
-    APPLY = 270,
-    LEAF = 271,
-    IF = 272,
-    ELSE = 273,
-    WHILE = 274,
-    CONTINUE = 275,
-    BREAK = 276,
-    RETURN = 277
-  };
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     IDENTIFIER = 258,
+     CONSTANT = 259,
+     STRING_LITERAL = 260,
+     LE_OP = 261,
+     GE_OP = 262,
+     EQ_OP = 263,
+     NE_OP = 264,
+     EXTERN = 265,
+     AUTO = 266,
+     INT = 267,
+     VOID = 268,
+     FUNCTION = 269,
+     APPLY = 270,
+     LEAF = 271,
+     IF = 272,
+     ELSE = 273,
+     WHILE = 274,
+     CONTINUE = 275,
+     BREAK = 276,
+     RETURN = 277
+   };
 #endif
+/* Tokens.  */
+#define IDENTIFIER 258
+#define CONSTANT 259
+#define STRING_LITERAL 260
+#define LE_OP 261
+#define GE_OP 262
+#define EQ_OP 263
+#define NE_OP 264
+#define EXTERN 265
+#define AUTO 266
+#define INT 267
+#define VOID 268
+#define FUNCTION 269
+#define APPLY 270
+#define LEAF 271
+#define IF 272
+#define ELSE 273
+#define WHILE 274
+#define CONTINUE 275
+#define BREAK 276
+#define RETURN 277
+
+
+
 
-/* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
-
 extern YYSTYPE yylval;
 
-int yyparse (void);
-
-#endif /* !YY_YY_C_TAB_H_INCLUDED  */

tac/lex.yy.c

@@ -7,8 +7,8 @@
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 6
-#define YY_FLEX_SUBMINOR_VERSION 1
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 35
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -46,6 +46,7 @@ typedef int16_t flex_int16_t;
 typedef uint16_t flex_uint16_t;
 typedef int32_t flex_int32_t;
 typedef uint32_t flex_uint32_t;
+typedef uint64_t flex_uint64_t;
 #else
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
@@ -53,6 +54,7 @@ typedef int flex_int32_t;
 typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
 
 /* Limits of integral types. */
 #ifndef INT8_MIN
@@ -83,17 +85,27 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
-#endif /* ! C99 */
-
 #endif /* ! FLEXINT_H */
 
-/* TODO: this is always defined, so inline it */
-#define yyconst const
+#ifdef __cplusplus
+
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else	/* ! __cplusplus */
+
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
+
+#define YY_USE_CONST
+
+#endif	/* defined (__STDC__) */
+#endif	/* ! __cplusplus */
 
-#if defined(__GNUC__) && __GNUC__ >= 3
-#define yynoreturn __attribute__((__noreturn__))
+#ifdef YY_USE_CONST
+#define yyconst const
 #else
-#define yynoreturn
+#define yyconst
 #endif
 
 /* Returned upon end-of-file. */
@@ -129,15 +141,7 @@ typedef unsigned int flex_uint32_t;
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k.
- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
- * Ditto for the __ia64__ case accordingly.
- */
-#define YY_BUF_SIZE 32768
-#else
 #define YY_BUF_SIZE 16384
-#endif /* __ia64__ */
 #endif
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -154,7 +158,7 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
 typedef size_t yy_size_t;
 #endif
 
-extern int yyleng;
+extern yy_size_t yyleng;
 
 extern FILE *yyin, *yyout;
 
@@ -163,7 +167,6 @@ extern FILE *yyin, *yyout;
 #define EOB_ACT_LAST_MATCH 2
 
     #define YY_LESS_LINENO(n)
-    #define YY_LINENO_REWIND_TO(ptr)
     
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
@@ -193,12 +196,12 @@ struct yy_buffer_state
 	/* Size of input buffer in bytes, not including room for EOB
 	 * characters.
 	 */
-	int yy_buf_size;
+	yy_size_t yy_buf_size;
 
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
 	 */
-	int yy_n_chars;
+	yy_size_t yy_n_chars;
 
 	/* Whether we "own" the buffer - i.e., we know we created it,
 	 * and can realloc() it to grow it, and should free() it to
@@ -221,7 +224,7 @@ struct yy_buffer_state
 
     int yy_bs_lineno; /**< The line count. */
     int yy_bs_column; /**< The column count. */
-
+    
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
@@ -249,7 +252,7 @@ struct yy_buffer_state
 /* Stack of input buffers. */
 static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
 static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
@@ -268,11 +271,11 @@ static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */
 
 /* yy_hold_char holds the character lost when yytext is formed. */
 static char yy_hold_char;
-static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-int yyleng;
+static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
+yy_size_t yyleng;
 
 /* Points to current character in buffer. */
-static char *yy_c_buf_p = NULL;
+static char *yy_c_buf_p = (char *) 0;
 static int yy_init = 0;		/* whether we need to initialize */
 static int yy_start = 0;	/* start state number */
 
@@ -297,7 +300,7 @@ static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
 
 YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
 YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len  );
+YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len  );
 
 void *yyalloc (yy_size_t  );
 void *yyrealloc (void *,yy_size_t  );
@@ -331,7 +334,7 @@ void yyfree (void *  );
 
 typedef unsigned char YY_CHAR;
 
-FILE *yyin = NULL, *yyout = NULL;
+FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
 
 typedef int yy_state_type;
 
@@ -340,22 +343,19 @@ extern int yylineno;
 int yylineno = 1;
 
 extern char *yytext;
-#ifdef yytext_ptr
-#undef yytext_ptr
-#endif
 #define yytext_ptr yytext
 
 static yy_state_type yy_get_previous_state (void );
 static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
 static int yy_get_next_buffer (void );
-static void yynoreturn yy_fatal_error (yyconst char* msg  );
+static void yy_fatal_error (yyconst char msg[]  );
 
 /* Done after the current pattern has been matched and before the
  * corresponding action - sets up yytext.
  */
 #define YY_DO_BEFORE_ACTION \
 	(yytext_ptr) = yy_bp; \
-	yyleng = (int) (yy_cp - yy_bp); \
+	yyleng = (yy_size_t) (yy_cp - yy_bp); \
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
@@ -384,7 +384,7 @@ static yyconst flex_int16_t yy_accept[98] =
 
     } ;
 
-static yyconst YY_CHAR yy_ec[256] =
+static yyconst flex_int32_t yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         2,    2,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -416,7 +416,7 @@ static yyconst YY_CHAR yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst YY_CHAR yy_meta[46] =
+static yyconst flex_int32_t yy_meta[46] =
     {   0,
         1,    1,    1,    1,    1,    1,    2,    1,    1,    1,
         1,    1,    1,    1,    3,    1,    1,    1,    1,    1,
@@ -425,7 +425,7 @@ static yyconst YY_CHAR yy_meta[46] =
         3,    3,    3,    1,    1
     } ;
 
-static yyconst flex_uint16_t yy_base[101] =
+static yyconst flex_int16_t yy_base[101] =
     {   0,
         0,    0,  130,  131,  131,  131,  110,   41,  131,  104,
       131,  131,  131,  131,  131,  131,  117,   32,  131,  131,
@@ -455,7 +455,7 @@ static yyconst flex_int16_t yy_def[101] =
 
     } ;
 
-static yyconst flex_uint16_t yy_nxt[177] =
+static yyconst flex_int16_t yy_nxt[177] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
        14,   15,   16,   17,   18,   19,   20,   21,   22,   23,
@@ -567,19 +567,19 @@ void yyset_extra (YY_EXTRA_TYPE user_defined  );
 
 FILE *yyget_in (void );
 
-void yyset_in  (FILE * _in_str  );
+void yyset_in  (FILE * in_str  );
 
 FILE *yyget_out (void );
 
-void yyset_out  (FILE * _out_str  );
+void yyset_out  (FILE * out_str  );
 
-			int yyget_leng (void );
+yy_size_t yyget_leng (void );
 
 char *yyget_text (void );
 
 int yyget_lineno (void );
 
-void yyset_lineno (int _line_number  );
+void yyset_lineno (int line_number  );
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -593,12 +593,8 @@ extern int yywrap (void );
 #endif
 #endif
 
-#ifndef YY_NO_UNPUT
-    
     static void yyunput (int c,char *buf_ptr  );
     
-#endif
-
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char *,yyconst char *,int );
 #endif
@@ -619,12 +615,7 @@ static int input (void );
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k */
-#define YY_READ_BUF_SIZE 16384
-#else
 #define YY_READ_BUF_SIZE 8192
-#endif /* __ia64__ */
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -632,7 +623,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0)
+#define ECHO fwrite( yytext, yyleng, 1, yyout )
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -643,7 +634,7 @@ static int input (void );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		size_t n; \
+		yy_size_t n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -656,7 +647,7 @@ static int input (void );
 	else \
 		{ \
 		errno=0; \
-		while ( (result = (int) fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
 			{ \
 			if( errno != EINTR) \
 				{ \
@@ -711,7 +702,7 @@ extern int yylex (void);
 
 /* Code executed at the end of each rule. */
 #ifndef YY_BREAK
-#define YY_BREAK /*LINTED*/break;
+#define YY_BREAK break;
 #endif
 
 #define YY_RULE_SETUP \
@@ -721,10 +712,14 @@ extern int yylex (void);
  */
 YY_DECL
 {
-	yy_state_type yy_current_state;
-	char *yy_cp, *yy_bp;
-	int yy_act;
+	register yy_state_type yy_current_state;
+	register char *yy_cp, *yy_bp;
+	register int yy_act;
     
+#line 28 "C.flex"
+
+#line 722 "lex.yy.c"
+
 	if ( !(yy_init) )
 		{
 		(yy_init) = 1;
@@ -751,12 +746,7 @@ YY_DECL
 		yy_load_buffer_state( );
 		}
 
-	{
-#line 28 "C.flex"
-
-#line 758 "lex.yy.c"
-
-	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
+	while ( 1 )		/* loops until end-of-file is reached */
 		{
 		yy_cp = (yy_c_buf_p);
 
@@ -772,7 +762,7 @@ YY_DECL
 yy_match:
 		do
 			{
-			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
+			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
 			if ( yy_accept[yy_current_state] )
 				{
 				(yy_last_accepting_state) = yy_current_state;
@@ -784,7 +774,7 @@ yy_match:
 				if ( yy_current_state >= 98 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
-			yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
+			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
 			}
 		while ( yy_base[yy_current_state] != 131 );
@@ -1011,7 +1001,7 @@ YY_RULE_SETUP
 #line 76 "C.flex"
 ECHO;
 	YY_BREAK
-#line 1015 "lex.yy.c"
+#line 1005 "lex.yy.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1142,7 +1132,6 @@ case YY_STATE_EOF(INITIAL):
 			"fatal flex scanner internal error--no action found" );
 	} /* end of action switch */
 		} /* end of scanning one token */
-	} /* end of user's declarations */
 } /* end of yylex */
 
 /* yy_get_next_buffer - try to read in a new buffer
@@ -1154,9 +1143,9 @@ case YY_STATE_EOF(INITIAL):
  */
 static int yy_get_next_buffer (void)
 {
-    	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	char *source = (yytext_ptr);
-	int number_to_move, i;
+    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	register char *source = (yytext_ptr);
+	register int number_to_move, i;
 	int ret_val;
 
 	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
@@ -1185,7 +1174,7 @@ static int yy_get_next_buffer (void)
 	/* Try to read more data. */
 
 	/* First move last chars to start of buffer. */
-	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1);
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
 
 	for ( i = 0; i < number_to_move; ++i )
 		*(dest++) = *(source++);
@@ -1198,21 +1187,21 @@ static int yy_get_next_buffer (void)
 
 	else
 		{
-			int num_to_read =
+			yy_size_t num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
 			{ /* Not enough room in the buffer - grow it. */
 
 			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
 
 			int yy_c_buf_p_offset =
 				(int) ((yy_c_buf_p) - b->yy_ch_buf);
 
 			if ( b->yy_is_our_buffer )
 				{
-				int new_size = b->yy_buf_size * 2;
+				yy_size_t new_size = b->yy_buf_size * 2;
 
 				if ( new_size <= 0 )
 					b->yy_buf_size += b->yy_buf_size / 8;
@@ -1225,7 +1214,7 @@ static int yy_get_next_buffer (void)
 				}
 			else
 				/* Can't grow it, we don't own it. */
-				b->yy_ch_buf = NULL;
+				b->yy_ch_buf = 0;
 
 			if ( ! b->yy_ch_buf )
 				YY_FATAL_ERROR(
@@ -1267,9 +1256,9 @@ static int yy_get_next_buffer (void)
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
-	if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
 		/* Extend the array by 50%, plus the number we really need. */
-		int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
 		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
 		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
 			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
@@ -1288,14 +1277,14 @@ static int yy_get_next_buffer (void)
 
     static yy_state_type yy_get_previous_state (void)
 {
-	yy_state_type yy_current_state;
-	char *yy_cp;
+	register yy_state_type yy_current_state;
+	register char *yy_cp;
     
 	yy_current_state = (yy_start);
 
 	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
 		{
-		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
 		if ( yy_accept[yy_current_state] )
 			{
 			(yy_last_accepting_state) = yy_current_state;
@@ -1307,7 +1296,7 @@ static int yy_get_next_buffer (void)
 			if ( yy_current_state >= 98 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
-		yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
+		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 		}
 
 	return yy_current_state;
@@ -1320,10 +1309,10 @@ static int yy_get_next_buffer (void)
  */
     static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
 {
-	int yy_is_jam;
-    	char *yy_cp = (yy_c_buf_p);
+	register int yy_is_jam;
+    	register char *yy_cp = (yy_c_buf_p);
 
-	YY_CHAR yy_c = 1;
+	register YY_CHAR yy_c = 1;
 	if ( yy_accept[yy_current_state] )
 		{
 		(yy_last_accepting_state) = yy_current_state;
@@ -1335,17 +1324,15 @@ static int yy_get_next_buffer (void)
 		if ( yy_current_state >= 98 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
-	yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
+	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 	yy_is_jam = (yy_current_state == 97);
 
-		return yy_is_jam ? 0 : yy_current_state;
+	return yy_is_jam ? 0 : yy_current_state;
 }
 
-#ifndef YY_NO_UNPUT
-
-    static void yyunput (int c, char * yy_bp )
+    static void yyunput (int c, register char * yy_bp )
 {
-	char *yy_cp;
+	register char *yy_cp;
     
     yy_cp = (yy_c_buf_p);
 
@@ -1355,10 +1342,10 @@ static int yy_get_next_buffer (void)
 	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
-		int number_to_move = (yy_n_chars) + 2;
-		char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+		register yy_size_t number_to_move = (yy_n_chars) + 2;
+		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
 					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
-		char *source =
+		register char *source =
 				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
 
 		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
@@ -1367,7 +1354,7 @@ static int yy_get_next_buffer (void)
 		yy_cp += (int) (dest - source);
 		yy_bp += (int) (dest - source);
 		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
-			(yy_n_chars) = (int) YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
 
 		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 			YY_FATAL_ERROR( "flex scanner push-back overflow" );
@@ -1380,8 +1367,6 @@ static int yy_get_next_buffer (void)
 	(yy_c_buf_p) = yy_cp;
 }
 
-#endif
-
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
     static int yyinput (void)
@@ -1406,7 +1391,7 @@ static int yy_get_next_buffer (void)
 
 		else
 			{ /* need more input */
-			int offset = (yy_c_buf_p) - (yytext_ptr);
+			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
 			++(yy_c_buf_p);
 
 			switch ( yy_get_next_buffer(  ) )
@@ -1531,7 +1516,7 @@ static void yy_load_buffer_state  (void)
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
-	b->yy_buf_size = (yy_size_t)size;
+	b->yy_buf_size = size;
 
 	/* yy_ch_buf has to be 2 characters longer than the size given because
 	 * we need to put in 2 end-of-buffer characters.
@@ -1566,6 +1551,10 @@ static void yy_load_buffer_state  (void)
 	yyfree((void *) b  );
 }
 
+#ifndef __cplusplus
+extern int isatty (int );
+#endif /* __cplusplus */
+    
 /* Initializes or reinitializes a buffer.
  * This function is sometimes called more than once on the same buffer,
  * such as during a yyrestart() or at EOF.
@@ -1678,7 +1667,7 @@ void yypop_buffer_state (void)
  */
 static void yyensure_buffer_stack (void)
 {
-	int num_to_alloc;
+	yy_size_t num_to_alloc;
     
 	if (!(yy_buffer_stack)) {
 
@@ -1686,15 +1675,15 @@ static void yyensure_buffer_stack (void)
 		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
 		 * immediate realloc on the next call.
          */
-      num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */
+		num_to_alloc = 1;
 		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
 								(num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
 		if ( ! (yy_buffer_stack) )
 			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-
+								  
 		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-
+				
 		(yy_buffer_stack_max) = num_to_alloc;
 		(yy_buffer_stack_top) = 0;
 		return;
@@ -1703,7 +1692,7 @@ static void yyensure_buffer_stack (void)
 	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
 
 		/* Increase the buffer to prepare for a possible push. */
-		yy_size_t grow_size = 8 /* arbitrary grow size */;
+		int grow_size = 8 /* arbitrary grow size */;
 
 		num_to_alloc = (yy_buffer_stack_max) + grow_size;
 		(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
@@ -1723,7 +1712,7 @@ static void yyensure_buffer_stack (void)
  * @param base the character buffer
  * @param size the size in bytes of the character buffer
  * 
- * @return the newly allocated buffer state object.
+ * @return the newly allocated buffer state object. 
  */
 YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
 {
@@ -1733,7 +1722,7 @@ YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
 	     base[size-1] != YY_END_OF_BUFFER_CHAR )
 		/* They forgot to leave room for the EOB's. */
-		return NULL;
+		return 0;
 
 	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
@@ -1742,7 +1731,7 @@ YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
 	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
 	b->yy_buf_pos = b->yy_ch_buf = base;
 	b->yy_is_our_buffer = 0;
-	b->yy_input_file = NULL;
+	b->yy_input_file = 0;
 	b->yy_n_chars = b->yy_buf_size;
 	b->yy_is_interactive = 0;
 	b->yy_at_bol = 1;
@@ -1765,25 +1754,24 @@ YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
 YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
 {
     
-	return yy_scan_bytes(yystr,(int) strlen(yystr) );
+	return yy_scan_bytes(yystr,strlen(yystr) );
 }
 
 /** Setup the input buffer state to scan the given bytes. The next call to yylex() will
  * scan from a @e copy of @a bytes.
- * @param yybytes the byte buffer to scan
- * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
  * 
  * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
+YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
 {
 	YY_BUFFER_STATE b;
 	char *buf;
-	yy_size_t n;
-	int i;
+	yy_size_t n, i;
     
 	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = (yy_size_t) (_yybytes_len + 2);
+	n = _yybytes_len + 2;
 	buf = (char *) yyalloc(n  );
 	if ( ! buf )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
@@ -1809,9 +1797,9 @@ YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
 #define YY_EXIT_FAILURE 2
 #endif
 
-static void yynoreturn yy_fatal_error (yyconst char* msg )
+static void yy_fatal_error (yyconst char* msg )
 {
-			(void) fprintf( stderr, "%s\n", msg );
+    	(void) fprintf( stderr, "%s\n", msg );
 	exit( YY_EXIT_FAILURE );
 }
 
@@ -1839,7 +1827,7 @@ static void yynoreturn yy_fatal_error (yyconst char* msg )
  */
 int yyget_lineno  (void)
 {
-    
+        
     return yylineno;
 }
 
@@ -1862,7 +1850,7 @@ FILE *yyget_out  (void)
 /** Get the length of the current token.
  * 
  */
-int yyget_leng  (void)
+yy_size_t yyget_leng  (void)
 {
         return yyleng;
 }
@@ -1877,29 +1865,29 @@ char *yyget_text  (void)
 }
 
 /** Set the current line number.
- * @param _line_number line number
+ * @param line_number
  * 
  */
-void yyset_lineno (int  _line_number )
+void yyset_lineno (int  line_number )
 {
     
-    yylineno = _line_number;
+    yylineno = line_number;
 }
 
 /** Set the input stream. This does not discard the current
  * input buffer.
- * @param _in_str A readable stream.
+ * @param in_str A readable stream.
  * 
  * @see yy_switch_to_buffer
  */
-void yyset_in (FILE *  _in_str )
+void yyset_in (FILE *  in_str )
 {
-        yyin = _in_str ;
+        yyin = in_str ;
 }
 
-void yyset_out (FILE *  _out_str )
+void yyset_out (FILE *  out_str )
 {
-        yyout = _out_str ;
+        yyout = out_str ;
 }
 
 int yyget_debug  (void)
@@ -1907,9 +1895,9 @@ int yyget_debug  (void)
         return yy_flex_debug;
 }
 
-void yyset_debug (int  _bdebug )
+void yyset_debug (int  bdebug )
 {
-        yy_flex_debug = _bdebug ;
+        yy_flex_debug = bdebug ;
 }
 
 static int yy_init_globals (void)
@@ -1918,10 +1906,10 @@ static int yy_init_globals (void)
      * This function is called from yylex_destroy(), so don't allocate here.
      */
 
-    (yy_buffer_stack) = NULL;
+    (yy_buffer_stack) = 0;
     (yy_buffer_stack_top) = 0;
     (yy_buffer_stack_max) = 0;
-    (yy_c_buf_p) = NULL;
+    (yy_c_buf_p) = (char *) 0;
     (yy_init) = 0;
     (yy_start) = 0;
 
@@ -1930,8 +1918,8 @@ static int yy_init_globals (void)
     yyin = stdin;
     yyout = stdout;
 #else
-    yyin = NULL;
-    yyout = NULL;
+    yyin = (FILE *) 0;
+    yyout = (FILE *) 0;
 #endif
 
     /* For future reference: Set errno on error, since we are called by
@@ -1969,8 +1957,7 @@ int yylex_destroy  (void)
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
 {
-		
-	int i;
+	register int i;
 	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
 }
@@ -1979,7 +1966,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
 #ifdef YY_NEED_STRLEN
 static int yy_flex_strlen (yyconst char * s )
 {
-	int n;
+	register int n;
 	for ( n = 0; s[n]; ++n )
 		;
 
@@ -1989,12 +1976,11 @@ static int yy_flex_strlen (yyconst char * s )
 
 void *yyalloc (yy_size_t  size )
 {
-			return malloc(size);
+	return (void *) malloc( size );
 }
 
 void *yyrealloc  (void * ptr, yy_size_t  size )
 {
-		
 	/* The cast to (char *) in the following accommodates both
 	 * implementations that use char* generic pointers, and those
 	 * that use void* generic pointers.  It works with the latter
@@ -2002,12 +1988,12 @@ void *yyrealloc  (void * ptr, yy_size_t  size )
 	 * any pointer type to void*, and deal with argument conversions
 	 * as though doing an assignment.
 	 */
-	return realloc(ptr, size);
+	return (void *) realloc( (char *) ptr, size );
 }
 
 void yyfree (void * ptr )
 {
-			free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
+	free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
 }
 
 #define YYTABLES_NAME "yytables"

tac/main.c

@@ -7,31 +7,19 @@
 #include "types.h"
 #include "list.h"
 
-int asprintf(char **strp, const char *fmt, ...);
 extern TOKEN* lookup_token(char*);
 
-/*
- * Existing problems/todo:
- * return from control block, need a "return address" to jump to -- call levels
- * --multiple assignments `int x,y,z = 1`--
- * new block scope for if statements?
- * arguments for functions
- * difference between tilde and semicolon
- * while loops
- * control flow `continue` and `break` linked to return address sort of? call levels
- */
-
 TOKEN* gen_tmp(void) {
-  char* tmp;
-  static char letter = 'a';
+  char tmp[10];
   static char num = 0;
-  if (num == 100) {
-    num = 0;
-    if (++letter == 'r') letter++;
-  }
-  if (letter == '{') exit(1);
-  asprintf(&tmp, "\\%c%d", letter, num);
-  num++;
+  snprintf(tmp, 10, "$t%d", num++);
+  return lookup_token(tmp);
+}
+
+TOKEN* gen_label(void) {
+  char tmp[10];
+  static char label = 0;
+  snprintf(tmp, 10, "L%d", label++);
   return lookup_token(tmp);
 }
 
@@ -107,13 +95,7 @@ void print_tree0(NODE *tree, int level)
     else {
       for(i=0; i<level; i++) putchar(' ');
       printf("%s\n", named(tree->type));
-
-/*       if (tree->type=='~') { */
-/*         for(i=0; i<level+2; i++) putchar(' '); */
-/*         printf("%p\n", tree->left); */
-/*       } */
-/*       else */
-        print_tree0(tree->left, level+2);
+      print_tree0(tree->left, level+2);
       print_tree0(tree->right, level+2);
     }
 }
@@ -123,47 +105,6 @@ void print_tree(NODE *tree)
     print_tree0(tree, 0);
 }
 
-// void add_function_to_env(NODE *tree, ENV *env_ptr) {
-//   BIND* existing;
-//   NODE* func_name = tree->left->right->left->left;
-//   TOKEN* name_token = (TOKEN*) func_name;
-//   if ((existing = find_name_in_env(name_token->lexeme, env_ptr)) == NULL) {
-//     printf("Added function name %s to environment with value: \n", name_token->lexeme);
-//     print_tree(tree);
-//     if (env_ptr->bindings == NULL) {
-//       env_ptr->bindings = create_list(create_binding(name_token->lexeme, tree, env_ptr), NULL);
-//     } else {
-//       append_list(env_ptr->bindings, create_binding(name_token->lexeme, tree, env_ptr));
-//     }
-//   } else {
-//     printf("Updating function name %s with value: \n", name_token->lexeme);
-//     print_tree(tree);
-//     existing->tree = tree;
-//     existing->env = env_ptr;
-//   }
-// }
-
-
-// void add_var_to_env(NODE *tree, ENV *env_ptr) {
-//   BIND* existing;
-//   NODE* var_name = tree->left->left;
-//   TOKEN* name_token = (TOKEN*) var_name;
-//   TOKEN* tok = new_token(INT);
-//   tok->value = recursive_interpret(tree->right, env_ptr);
-//   asprintf(&tok->lexeme, "%d", tok->value);
-//   if ((existing = find_name_in_env(name_token->lexeme, env_ptr)) == NULL) {
-//     printf("Added variable name %s to environment with value: %s\n", name_token->lexeme, tok->lexeme);
-//     if (env_ptr->bindings == NULL) {
-//       env_ptr->bindings = create_list(create_binding(name_token->lexeme, (NODE*) tok, NULL), NULL);
-//     } else {
-//       append_list(env_ptr->bindings, create_binding(name_token->lexeme, (NODE*) tok, NULL));
-//     }
-//   } else {
-//     printf("Updating variable name %s with value: %s\n", name_token->lexeme, tok->lexeme);
-//     existing->tree = (NODE *) tok;
-//   } 
-// }
-
 void new_tac(TACS* tacs, TOKEN* dst, TOKEN* src, TOKEN* tgt, int op) {
   if (tacs->list == NULL) {
     TAC_T* tac;
@@ -184,16 +125,99 @@ void print_tac(TLIST* tac_list) {
   while (ptr != NULL) {
     int op = ptr->elem->op;
     if (op == '=') printf("%s := %s\n", stok(ptr->elem->dst), stok(ptr->elem->src));
-    if (op == '+') printf("%s := %s + %s\n", stok(ptr->elem->dst), stok(ptr->elem->src), stok(ptr->elem->tgt));
-    if (op == '-') printf("%s := %s - %s\n", stok(ptr->elem->dst), stok(ptr->elem->src), stok(ptr->elem->tgt));
-    if (op == '/') printf("%s := %s / %s\n", stok(ptr->elem->dst), stok(ptr->elem->src), stok(ptr->elem->tgt));
-    if (op == '*') printf("%s := %s * %s\n", stok(ptr->elem->dst), stok(ptr->elem->src), stok(ptr->elem->tgt));
-    if (op == '%') printf("%s := %s %% %s\n", stok(ptr->elem->dst), stok(ptr->elem->src), stok(ptr->elem->tgt));
+    if (op=='+' || op=='-' || op=='*' || op=='/' || op =='%') printf("%s := %s %c %s\n", stok(ptr->elem->dst), stok(ptr->elem->src), op, stok(ptr->elem->tgt));
     if (op == RETURN) printf("ret %s\n", stok(ptr->elem->src));
+    if (op == 'D') printf("\nfunc %s\n", stok(ptr->elem->dst));
+    if (op == '>' || op == '<') printf("if %s %c %s then %s\n", stok(ptr->elem->src), op, stok(ptr->elem->tgt), stok(ptr->elem->dst));
+    if (op == GE_OP) printf("if %s >= %s then %s\n", stok(ptr->elem->src), stok(ptr->elem->tgt), stok(ptr->elem->dst));
+    if (op == LE_OP) printf("if %s <= %s then %s\n", stok(ptr->elem->src), stok(ptr->elem->tgt), stok(ptr->elem->dst));
+    if (op == EQ_OP) printf("if %s == %s then %s\n", stok(ptr->elem->src), stok(ptr->elem->tgt), stok(ptr->elem->dst));
+    if (op == NE_OP) printf("if %s != %s then %s\n", stok(ptr->elem->src), stok(ptr->elem->tgt), stok(ptr->elem->dst));
+    if (op == IDENTIFIER) printf("%s\n", stok(ptr->elem->dst));
+    if (op == VOID) printf("goto %s\n", stok(ptr->elem->dst));
+    if (op == AUTO) printf("param %s\n", stok(ptr->elem->dst));
+    if (op == APPLY) printf("call %s, %s\n", stok(ptr->elem->dst), stok(ptr->elem->tgt));
+    if (op == 278) printf("arg %s\n", stok(ptr->elem->dst));
+    if (op == 279) printf("end %s\n", stok(ptr->elem->dst));
     ptr = ptr->next;
   }
 }
 
+int invert_op(int op) {
+  if (op == LE_OP) {
+    return '>';
+  } else if (op == GE_OP) {
+    return '<';
+  } else if (op == '>') {
+    return LE_OP;
+  } else if (op == '<') {
+    return GE_OP;
+  } else if (op == EQ_OP) {
+    return NE_OP;
+  } else if (op == NE_OP) {
+    return EQ_OP;
+  } else {
+    printf("Unknown operator: %c", op);
+    exit(1);
+  }
+}
+
+int count_args(NODE *tree) { 
+  NODE *tmp = tree;
+  int a = 1;
+  while (tmp != NULL) {
+    if (tmp->type != ',') {
+      break;
+    }
+    tmp = tmp->left;
+    a++;
+  }
+  return a;
+}
+
+void populate_arg_list(NODE *tree, TOKEN** arr, int arr_len) {
+  if (tree->type == '~') {
+    for (int i = 0; i < arr_len; i++) {
+      if (arr[i] == NULL) {
+        TOKEN* name = (TOKEN*)tree->right->left;
+        arr[i] = name;
+        break;
+      }
+    }
+  } else {
+    populate_arg_list(tree->left, arr, arr_len);
+    populate_arg_list(tree->right, arr, arr_len);
+  }
+}
+
+TOKEN** get_argument_list(NODE *tree) {
+  int num_args = count_args(tree->left->right->right);
+  TOKEN** arr = (TOKEN**) malloc(sizeof(TOKEN*) * num_args);
+  populate_arg_list(tree->left->right->right, arr, num_args);
+  return arr;
+}
+
+void populate_val_list(NODE* tree, NODE** arr, int num_args) {
+  if (tree->type == ',') {
+    populate_val_list(tree->left, arr, num_args);
+    populate_val_list(tree->right, arr, num_args);
+  } else {
+    for (int i = 0; i < num_args; i++) {
+      if (arr[i] == NULL) {
+        arr[i] = tree;
+        break;
+      }
+    }
+  }
+}
+
+NODE** get_val_list(NODE *tree) {
+  int num_args = count_args(tree);
+  NODE** arr = (NODE**) malloc(sizeof(NODE*) * num_args);
+  populate_val_list(tree, arr, num_args);
+  return arr;
+}
+
 TOKEN* build_tac(NODE *tree, TACS* tac) {
   if (tree == NULL) return NULL;
   int type = tree->type;
@@ -209,13 +233,57 @@ TOKEN* build_tac(NODE *tree, TACS* tac) {
     TOKEN* tgt = build_tac(tree->right, tac);
     new_tac(tac, dst, src, tgt, tree->type);
     return dst;
+  } else if (type == IF) {
+    int op = invert_op(tree->left->type);
+    TOKEN* lhs = build_tac(tree->left->left, tac);
+    TOKEN* rhs = build_tac(tree->left->right, tac);
+    TOKEN* label = gen_label();
+    new_tac(tac, label, lhs, rhs, op);
+    if (tree->right->type == ELSE) {
+      TOKEN* cont = gen_label();
+      build_tac(tree->right->left, tac);
+      new_tac(tac, cont, NULL, NULL, VOID);
+      new_tac(tac, label, NULL, NULL, IDENTIFIER);
+      build_tac(tree->right->right, tac);
+      new_tac(tac, cont, NULL, NULL, IDENTIFIER);
+    } else {
+      build_tac(tree->right, tac);
+      new_tac(tac, label, NULL, NULL, IDENTIFIER);
+    }
   } else if (type == RETURN) {
     TOKEN* src = build_tac(tree->left, tac);
     new_tac(tac, NULL, src, NULL, RETURN);
+  } else if (type == 'D') {
+    new_tac(tac, (TOKEN*) tree->left->right->left->left, NULL, NULL, 'D');
+    if (tree->left->right->right != NULL) {
+      TOKEN** arg_list = get_argument_list(tree);
+      int arg_count = count_args(tree->left->right->right);
+      for (int i = 0; i < arg_count; i++) {
+        new_tac(tac, arg_list[i], NULL, NULL, AUTO);
+      }
+    }
+    build_tac(tree->right, tac);
+    new_tac(tac, (TOKEN*) tree->left->right->left->left, NULL, NULL, 279);
+  } else if (type == APPLY) {
+    TOKEN* ret_val = gen_tmp();
+    if (tree->right != NULL) {
+      int num_args;
+      NODE **val_list;
+      num_args = count_args(tree->right);
+      val_list = get_val_list(tree->right);
+      for (int i = 0; i < num_args; i++) {
+        TOKEN* arg_token = build_tac(val_list[i], tac);
+        new_tac(tac, arg_token, NULL, NULL, 278);
+      }
+    }
+    new_tac(tac, (TOKEN*) tree->left->left, NULL, ret_val, APPLY);
+    return ret_val;
   } else {
     build_tac(tree->left, tac);
     build_tac(tree->right, tac);
+    return NULL;
   }
+  return NULL;
 }
 
 
@@ -285,7 +353,6 @@ int alloc_register(TOKEN* val) {
 
 void compile_tac(TLIST* tacs) {
   printf("=====\n");
-  printf("main:\n");
   init_reg();
   while(tacs != NULL) {
     TAC_T* t = tacs->elem;
@@ -293,6 +360,9 @@ void compile_tac(TLIST* tacs) {
       int src_idx = alloc_register(t->src);
       printf("or $%d, $0, $%d\n", store_var(t->dst), src_idx);
     }
+    if (t->op == 'D') {
+      printf("%s:\n", t->dst->lexeme);
+    }
     if (t->op == '+') {
       int tgt_idx = alloc_register(t->tgt);
       int src_idx = alloc_register(t->src);
@@ -323,7 +393,7 @@ void compile_tac(TLIST* tacs) {
     }
     if (t->op == RETURN) {
       int src_idx = alloc_register(t->src);
-      printf("or $k0, $0, $%d\n", src_idx);
+      printf("or $v1, $0, $%d\n", src_idx);
     }
     tacs = tacs->next;
   }
@@ -331,22 +401,7 @@ void compile_tac(TLIST* tacs) {
   printf("syscall\n");
 }
 
-// ENV* cons_global_env(NODE *tree) {
-//   ENV* global = create_new_function_env(NULL);
-//   recursive_interpret(tree, global);
-//   return global;
-// }
-
 void interpret_tree(NODE *tree) {
-  // ENV* global_env = cons_global_env(tree);
-  // BIND* ref_main = find_name_in_env("main", global_env);
-  // if (ref_main == NULL) {
-  //   printf("Could not find main, cannot run!\n");
-  //   exit(1);
-  // }
-  // print ref_main to make sure we really got it
-  // printf("Located %s, ready to run!\n", ref_main->name);
-  // printf("%d\n", recursive_interpret(ref_main->tree->right, ref_main->env));
   TACS* gen_tac = (TACS*) malloc(sizeof(TACS));
   build_tac(tree, gen_tac);
   print_tac(gen_tac->list);
@@ -354,7 +409,9 @@ void interpret_tree(NODE *tree) {
 }
 
 extern int yydebug;
-/* extern NODE* yyparse(void); */
+#ifdef __APPLE__
+extern NODE* yyparse(void);
+#endif
 extern NODE* ans;
 extern void init_symbtable(void);
 
@@ -369,7 +426,5 @@ int main(int argc, char** argv)
     printf("parse finished\n");
     print_tree(tree);
     interpret_tree(tree);
-    // int i;
-    // for (i = 0; i < 2600; i++) printf("%s\n", gen_tmp());
     return 0;
 }

tac/simple.c

@@ -1,6 +1,18 @@
+int inner_fact(int n, int a) {
+  if (n == 0) return a;
+  return inner_fact(n-1, a*n);
+}
+
+int fact(int n) {
+  return inner_fact(n, 1);
+}
+
 int main() {
-  int z = 5;
-  int y = 5 + 2;
-  int x = 5 + y * z;
+  int x = blah(2);
+  if (x > 0) {
+    x = 10;
+  } else {
+    x = 5;
+  }
   return x;
 }