I added some packpatching

src/grammar.h

@@ -31,4 +31,6 @@ int offset;
 int currentsp;
 CGNode *cgList;
 
-extern Stack* stack;
+extern Stack* s;
+Stack* TrueList;
+Stack* FalseList;

src/grammar.y

@@ -122,7 +122,7 @@ prototype_or_definition_list:
 
 prototype:
         L_PAREN EXTERNAL R_PAREN FUNCTION ID COLON ID
-    
+
     ;
 
 
@@ -149,21 +149,21 @@ definition:
             cur = getParent(cur);
         }
 
-    |   TYPE ID COLON C_INTEGER ARROW id_or_types 
+    |   TYPE ID COLON C_INTEGER ARROW id_or_types
         {
-            printdebug("Currently see a array definition of name %s,storing type %s, of dimensions %d", $2, getName((TableNode*)$6), $4); 
+            printdebug("Currently see a array definition of name %s,storing type %s, of dimensions %d", $2, getName((TableNode*)$6), $4);
             CreateEntry(cur,TYPE_ARRAY_TYPE, arrayprim, $2, CreateArrayInfo($4, (TableNode*)$6));
             printdebug("%sID: %s, dimensions: %d, typeOfArray: %s", COLOR_GREEN, $2, $4, getName((TableNode*)$6));
         }
-    
+
     |   function_declaration
-    
+
     |   TYPE ID COLON id_or_types ARROW id_or_types
         {
             printdebug("Currently see a function type definition of name %s,parameter type %s, of return type %s", $2, getName((TableNode*)$4), getName((TableNode*)$6));
             CreateEntry(cur,TYPE_FUNCTION_TYPE,funtypeprime,$2,CreateFunctionTypeInfo((TableNode*)$4 ,(TableNode*)$6));
-        }  
+        }
-    
+
     | ID {
         emit_function_start(table_lookup(cur,$1));
         //printf("ID: %s\n", $1);
@@ -174,11 +174,11 @@ definition:
             printdebug("Undefined node declared.");
         }else if(getAdInfoType(node) != TYPE_FUNCTION_DECLARATION){
             throw_error(ERROR_SYNTAX, "Not a valid function declaration.");
-        }  
+        }
         else {
             printdebug("setting as keyword to true");
             setStartLine(node, @1.first_line);
-            setAsKeyword(node, true); 
+            setAsKeyword(node, true);
         }
         cur = CreateScope(cur, 0, 0);
         printdebug("Created a new scope");
@@ -194,10 +194,10 @@ definition:
             || type_of_param_type == TYPE_FUNCTION_DECLARATION
             || type_of_param_type == TYPE_ARRAY
             || type_of_param_type == TYPE_PRIMITIVE
-            || type_of_param_type == TYPE_ALL_ELSE 
+            || type_of_param_type == TYPE_ALL_ELSE
             || type_of_param_type == TYPE_SYSTEM_DEFINED
             || type_of_param_type == TYPE_RECORD
-            || type_of_param_type == TYPE_STRING){ // note that strings are actually arrays so this is unused 
+            || type_of_param_type == TYPE_STRING){ // note that strings are actually arrays so this is unused
             throw_error(ERROR_TYPE, "Invalid type (%s) of parameter in function definition.", getAdInfo(parameter));
             type_of_param_type = TYPE_UNDEFINED; // setting tag as undefined in these cases
             }
@@ -222,10 +222,10 @@ definition:
                     || type_of_param_type == TYPE_FUNCTION_TYPE
                     || type_of_param_type == TYPE_ARRAY_TYPE
                     || type_of_param_type == TYPE_PRIMITIVE_TYPE
-                    || type_of_param_type == TYPE_ALL_ELSE 
+                    || type_of_param_type == TYPE_ALL_ELSE
                     || type_of_param_type == TYPE_SYSTEM_DEFINED
                     || type_of_param_type == TYPE_RECORD_TYPE
-                    || type_of_param_type == TYPE_STRING){ // note that strings are actually arrays so this is unused 
+                    || type_of_param_type == TYPE_STRING){ // note that strings are actually arrays so this is unused
                     throw_error(ERROR_TYPE, "Invalid type (%s) of parameter in function definition.", getAdInfo(entry));
                     type_of_param_type = TYPE_UNDEFINED; // setting tag as undefined in these cases
                 }else{
@@ -246,7 +246,7 @@ definition:
                     if(type_of_param_type == TYPE_PRIMITIVE){
                         printdebug("primitive type of parameter inside record");
                     CreateEntry(cur, TYPE_PRIMITIVE, getTypeEntry(entry),NULL, getAdInfo(entry));
-                    }          
+                    }
                             /*printdebug("creating entry of type %s for function", getType(entry));
                             CreateEntry(cur, getTypeEntry(entry), "undefined", NULL);*/
                 }
@@ -270,13 +270,13 @@ definition:
             }
         //printf("Ending ID: %s\n", $1);
         //printf("Ending Type: %s\n", getType(table_lookup(getAncestor(cur), $1)));
-        }
+} idlist R_PAREN ASSIGN sblock
 
     ;
 
 function_declaration:
         FUNCTION ID COLON ID
-        {   
+        {
             if(getAdInfoType(table_lookup(cur, $4))==TYPE_FUNCTION_TYPE){
             //printf("%s\n",$2);
             //printf("%s\n",getName(table_lookup(cur, $4)));
@@ -290,7 +290,7 @@ function_declaration:
         }
 
     |   EXTERNAL FUNCTION ID COLON ID
-        {   
+        {
             if(getAdInfoType(look_up(cur, $5))==TYPE_FUNCTION_TYPE){
             CreateEntry(cur,TYPE_FUNCTION_DECLARATION, look_up(cur, $5), $3, CreateFunctionDeclarationInfo(-1, false));
         }
@@ -338,7 +338,7 @@ idlist:
         {
             $$ = $4 + 1;
         }
-    
+
     |   ID
         {   printdebug("idlist rule 2 ID: %s", $1);
             TableNode *entry = getFirstEntry(cur);
@@ -360,7 +360,7 @@ idlist:
             printdebug("Type of entry is %s", getType(entry));
             printdebug("tag is %d", getAdInfoType(entry));
         }
-    
+
     ;
 
 
@@ -383,7 +383,7 @@ sblock:
         }
         R_BRACE
         {$$ = $3;}
-        
+
     |   L_BRACE
         {
             if (getLine(cur) != 0) {
@@ -404,79 +404,79 @@ sblock:
             printdebug("Moving up a scope after seeing sblock with dblock");
             cur = getParent(cur);
             //$<tn>$ = $5;
-            
+
-        } 
+        }
         R_BRACE
         {$$ = $5;}
-    
+
     ;
 
 
 
 dblock:
 
-        L_BRACKET 
+        L_BRACKET
         {
             if (getLine(cur) == 0) {
-                setLineNumber(cur, @1.first_line); 
+                setLineNumber(cur, @1.first_line);
                 setColumnNumber(cur,@1.first_line);
                 printdebug("Did not create a new scope when saw dblock, set line number to %d instead", @1.first_line);
             } else{
                 //cur = CreateScope(cur,@1.first_line,@1.first_column); // <----- What is this?
                 printdebug("Created a new scope when seeing a dblock");
             }
-        } 
+        }
         declaration_list R_BRACKET
 
-    
+
     ;
 
 
 
 declaration_list:
-        declaration SEMI_COLON declaration_list
+      declaration SEMI_COLON declaration_list
-    |   declaration
+    | declaration
     | error SEMI_COLON { yyerrok; } declaration_list //only perform error recovery once we see semi-colon
-    
+
     ;
 
 
 
 declaration:
-        id_or_types COLON ID 
+        id_or_types COLON ID
         {
             printdebug("ID/TYPE: %s,  ID: %s", getName((TableNode*)$1), $3) ;
             int d = getAdInfoType((TableNode*)$1);
             if(d == TYPE_UNDEFINED) {
                 throw_error(ERROR_TYPE, "Undefined type passed in declaration list");
                 printdebug("Undefined type passed in declaration list");
-                CreateEntry(cur,d,(TableNode*)$1,$3,getAdInfo((TableNode*)$1)); 
+                CreateEntry(cur,d,(TableNode*)$1,$3,getAdInfo((TableNode*)$1));
             }
             else if(d == TYPE_FUNCTION_TYPE) {
                 printdebug("invalid (function) type passed in declaration list in dblock", @2.first_line, @2.first_column);
                 d = TYPE_FUNCTION_DECLARATION;
-                CreateEntry(cur,d,(TableNode*)$1,$3,getAdInfo((TableNode*)$1)); 
+                CreateEntry(cur,d,(TableNode*)$1,$3,getAdInfo((TableNode*)$1));
             }
             else if(d == TYPE_ARRAY_TYPE){
                 printdebug("array variable at line %d and column %d", @2.first_line, @2.first_column);
                 d = TYPE_ARRAY;
-                CreateEntry(cur,d,(TableNode*)$1,$3,getAdInfo((TableNode*)$1)); 
+                CreateEntry(cur,d,(TableNode*)$1,$3,getAdInfo((TableNode*)$1));
             }
             else if(d == TYPE_RECORD_TYPE){
                 printdebug("record variable at line %d and column %d", @2.first_line, @2.first_column);
                 d = TYPE_RECORD;
-                CreateEntry(cur,d,(TableNode*)$1,$3,getAdInfo((TableNode*)$1)); 
+                CreateEntry(cur,d,(TableNode*)$1,$3,getAdInfo((TableNode*)$1));
             }
             else if(d == TYPE_PRIMITIVE_TYPE){
                 printdebug("primitive variable at line %d and column %d", @2.first_line, @2.first_column);
                 d = TYPE_PRIMITIVE;
-                CreateEntry(cur,d,(TableNode*)$1,$3,getAdInfo((TableNode*)$1)); 
+                CreateEntry(cur,d,(TableNode*)$1,$3,getAdInfo((TableNode*)$1));
             }else {
                 throw_error(ERROR_TYPE, "%s is being defined with an undefined type", $3);
-                CreateEntry(cur,d,(TableNode*)$1,$3,getAdInfo((TableNode*)$1)); 
+                CreateEntry(cur,d,(TableNode*)$1,$3,getAdInfo((TableNode*)$1));
             }
         }
-    
+
     ;
 
 
@@ -487,13 +487,13 @@ id_or_types:
             printdebug("string of id is %s in ID pattern of id_or_type rule.", $1);
             $$ = table_lookup(getAncestor(cur), $1);
         }
-    
+
     |   types
         {
             printdebug("string of type is %s in types pattern of id_or_type rule.",getName((TableNode*)$1));
             $$ = (TableNode*)$1;
         }
-    
+
     ;
 
 
@@ -521,7 +521,7 @@ compound_statement statement_list {
 }
         |   compound_statement {
             $$ = $1;
-        } 
+        }
         |   simple_statement SEMI_COLON statement_list{
             if ($1 == undefined && $3 != undefined) {
                 $$ = $3;
@@ -552,24 +552,37 @@ compound_statement statement_list {
 
 
 compound_statement:
-WHILE L_PAREN expression R_PAREN sblock {
+        WHILE L_PAREN
-    $$ = $5;
+{
+        if (!TrueList) {TrueList = S_Init();}
+        if (!FalseList) {FalseList = S_Init();}
+        S_Push(TrueList, S_Init());
+        S_Push(FalseList, S_Init());
+} expression R_PAREN {
+        emit_label(label_gen());
+        backpatch(S_Pop(TrueList), getLabel(current));
+} sblock {
+    $$ = $7;
+        emit_label(label_gen());
+        backpatch(S_Pop(FalseList), getLabel(current));
 }
-    |   IF L_PAREN expression R_PAREN THEN sblock ELSE sblock {
+    |   IF L_PAREN expression R_PAREN THEN {emit_label(label_gen());} sblock ELSE {emit_label(label_gen());} sblock {
-            if ($6 == undefined && $8 != undefined) {
+/*
-                $$ = $8;
+*/
-            } else if ($6 != undefined && $8 == undefined) {
+            if ($7 == undefined && $10 != undefined) {
-                $$ = $6;
+                $$ = $10;
-            } else if ($6 == $8) {
+            } else if ($7 != undefined && $10 == undefined) {
-                $$ = $6;
+                $$ = $7;
-            }else if((getAdInfoType((TableNode*)$6) == TYPE_ARRAY_TYPE) && ((TableNode*)$8)==addr){
+            } else if ($7 == $10) {
-                $$ = $6;
+                $$ = $7;
-            }else if((getAdInfoType((TableNode*)$6) == TYPE_RECORD_TYPE) && ((TableNode*)$8)==addr){
+            }else if((getAdInfoType((TableNode*)$7) == TYPE_ARRAY_TYPE) && ((TableNode*)$10)==addr){
-                $$ = $6;
+                $$ = $7;
-            }else if(((TableNode*)$6)==addr && (getAdInfoType((TableNode*)$8) == TYPE_ARRAY_TYPE)){
+            }else if((getAdInfoType((TableNode*)$7) == TYPE_RECORD_TYPE) && ((TableNode*)$10)==addr){
-                $$ = $8;
+                $$ = $7;
-            }else if(((TableNode*)$6)==addr && (getAdInfoType((TableNode*)$8) == TYPE_RECORD_TYPE)){
+            }else if(((TableNode*)$7)==addr && (getAdInfoType((TableNode*)$10) == TYPE_ARRAY_TYPE)){
-                $$ = $8;
+                $$ = $10;
+            }else if(((TableNode*)$7)==addr && (getAdInfoType((TableNode*)$10) == TYPE_RECORD_TYPE)){
+                $$ = $10;
             } else {
                 printdebug("3 differing return types within same function at line %d, column %d", @1.first_line, @1.first_column);
                 //printf("%s\n", getName((TableNode*)$6));
@@ -577,7 +590,7 @@ WHILE L_PAREN expression R_PAREN sblock {
                 $$ = undefined;
             }
         }
-    
+
     |   sblock {
             $$ = $1;
         }
@@ -587,14 +600,14 @@ WHILE L_PAREN expression R_PAREN sblock {
 
 
 simple_statement:
-        assignable ASSIGN expression 
+        assignable ASSIGN expression
-         {  printdebug("simple statement");   
+         {  printdebug("simple statement");
             TableNode* node;
             if((getAdInfoType((getTypeEntry((TableNode*)$1))) == TYPE_FUNCTION_TYPE)||
                 (getAdInfoType((getTypeEntry((TableNode*)$1))) == TYPE_ARRAY_TYPE)||
                 (getAdInfoType((getTypeEntry((TableNode*)$1))) == TYPE_RECORD_TYPE)||
                 (getAdInfoType((getTypeEntry((TableNode*)$1))) == TYPE_PRIMITIVE_TYPE)){
-            
+
                 node = ((TableNode*)$1);
             } else {
                 //printf("%d\n",getAdInfoType((getTypeEntry((TableNode*)$1))));
@@ -616,8 +629,8 @@ simple_statement:
                 emit_assignment($1, tn_or_const(NODE, $3));
                 printdebug("%s[☺] Passed type check; %s = %s", COLOR_GREEN, getType(node), getType((TableNode*)$3));
             }
-            
+
-            
+
             else {
                 throw_error(ERROR_TYPE, "Assignable Assign Expression - Object %s of type %s != Object %s of type %s", getName(node), getType(node), getName((TableNode*)$3), getType((TableNode*)$3));
             }
@@ -631,7 +644,7 @@ simple_statement:
             emit_return(tn_or_const(NODE,(TableNode*)$2));}
     |simple_statement error {yyerrok; printdebug("error in simple statement");}
 
-    
+
     ;
 
 
@@ -639,7 +652,7 @@ simple_statement:
 rec_op:
         DOT
 
-    
+
     ;
 
 
@@ -650,7 +663,7 @@ ablock:
             printdebug("ablock is %d", $$);
         }
 
-    
+
     ;
 
 
@@ -659,6 +672,7 @@ argument_list:
         //NEED TO EMIT PARAMETERS HERE. MAYBE USE STACK STRUCTURE
         expression{
             TableNode* arg = CreateEntry(cur, getAdInfoType((TableNode*)$1), getTypeEntry((TableNode*)$1), arg_var_gen(), NULL);
+            // this emits params for function and arrays TODO: fix
             emit_parameter(tn_or_const(NODE,arg));
             //S_Push(stack,current);
             //emit_detach();
@@ -679,7 +693,7 @@ argument_list:
         }
 
 
-    
+
     ;
 
 
@@ -822,14 +836,15 @@ expression:
                 throw_error(ERROR_TYPE, "Object %s of type %s and Object %s of type %s must both be Boolean", getName((TableNode*)$1), getType((TableNode*)$1), getName((TableNode*)$3), getType((TableNode*)$3));
             }
         }
-                    
+
-    |   expression LESS_THAN expression 
+    |   expression LESS_THAN expression
 		{
+                emit_conditional_jump(E_LESS_THAN, 0, tn_or_const(NODE,$1), tn_or_const(NODE,$3));
+                S_Push(S_Peek(TrueList), current);
             printdebug("less than expression");
             if(getTypeEntry((TableNode*)$1) == getTypeEntry((TableNode*)$3) && getTypeEntry((TableNode*)$1)==integ) {
                 char* temp = temp_var_gen();
                 TableNode* node = CreateEntry(cur,TYPE_PRIMITIVE, boo, temp, NULL);
-                emit_binary_op(E_LESS_THAN,node,tn_or_const(NODE,$1),tn_or_const(NODE,$3));
                 $$ = node;
             } else {
                 $$=undefined;
@@ -843,9 +858,9 @@ expression:
             if(getTypeEntry((TableNode*)$1) == getTypeEntry((TableNode*)$3) && getTypeEntry((TableNode*)$1) != undefined) {
                 char* temp = temp_var_gen();
                 TableNode* node = CreateEntry(cur,TYPE_PRIMITIVE, boo, temp, NULL);
-                emit_binary_op(E_EQUAL_TO,node,tn_or_const(NODE,$1),tn_or_const(NODE,$3));
+                emit_conditional_jump(E_EQUAL_TO, 0, tn_or_const(NODE,$1), tn_or_const(NODE,$3));
                 $$ = node;
-                
+
             } else {
                 $$ = undefined;
                 throw_error(ERROR_TYPE, "Object %s of type %s and Object %s of type %s must both be the same type", getName((TableNode*)$1), getType((TableNode*)$1), getName((TableNode*)$3), getType((TableNode*)$3));
@@ -856,7 +871,7 @@ expression:
         {
             $$ = $1;
         }
-    
+
     |   L_PAREN expression R_PAREN
         {
             printdebug("paren expression. current type is %s",getType((TableNode*)$2));
@@ -864,7 +879,7 @@ expression:
         }
 
     |   RESERVE assignable
-        {   
+        {
             int d = getAdInfoType((TableNode*)$2);
             if(d == TYPE_ARRAY ||d == TYPE_RECORD) {
                 char* temp = temp_var_gen();
@@ -889,7 +904,7 @@ expression:
                 $$=undefined;
             }
         }
-    
+
     ;
 
 //UPDATED $$ for tablenodes to this point
@@ -898,17 +913,17 @@ expression:
 // add array case
 // include type check for ablock in arrays - ablock is always the int of the elements in array/rec
 assignable:
-        ID 
+        ID
         {
             TableNode* pass = look_up(cur,$1);
             if(pass == undefined){
                 throw_error(ERROR_TYPE, "Undefined variable %s", $1);
             }
-            $$ = pass; 
+            $$ = pass;
             printdebug("[ASSIGNABLE - RULE 1] assignable = type: %s | ID = %s", getType(pass), getName(pass));
         }
 
-    |   assignable 
+    |   assignable
         {
             printdebug("%sBeginning rule 2 of assignable.", COLOR_CYAN);
             //Creating a dummy scope where we create entries for all the arguments of a function call
@@ -916,13 +931,13 @@ assignable:
             cur = CreateScope(cur, -1,-1);
         }
         //we have to consider emmissions in ablocks
-        ablock 
+        ablock
         {
             //int type = getAdInfoType(look_up(getParent(cur), getName((TableNode*)$1)));
             int type = getAdInfoType(getTypeEntry((TableNode*)$1));
             printdebug("%stype is %d", COLOR_PURPLE, type);
             printdebug("%s", getName((TableNode*)$1));
-              
+
             if (type == TYPE_FUNCTION_TYPE) {
                 printdebug("%sEntering function call", COLOR_LIGHTGREEN);
                 //getting the parameter. The type of assignable is a function type so we need to access the paramater of the type
@@ -1046,8 +1061,8 @@ assignable:
         }
 
     |   assignable rec_op ID
-        {   
+        {
-            
+
             if(getAdInfoType((TableNode*)$1) != TYPE_RECORD){
                 throw_error(ERROR_TYPE, "Invalid type passed to record access");
                 $$ = undefined;
@@ -1075,16 +1090,16 @@ assignable:
 
                 TableNode* node = CreateEntry(cur,t, type, temp, NULL);
                 //NOTE ADD ASSIGNMENT EMIT HERE (MIGHT NEED TO PUSH TO STACK)
-                //emit_field_access(char* node, char* record, $3)  
+                //emit_field_access(char* node, char* record, $3)
                 $$=node;
             }else{
                 throw_error(ERROR_TYPE, "Invalid field access %s", $3);
                 $$=undefined;
-            } 
+            }
             printdebug("[ASSIGNABLE - RULE 3] record = name: %s | field = %s", getName((TableNode*)($1)), getName((TableNode*)$3));
         }
 
-    
+
     ;
 
 
@@ -1106,7 +1121,7 @@ constant:
             printdebug("number of C_INTEGER in constant is %d", $1);
             $$ = node;
         }
-    
+
     |   C_NULL
         {
             char* temp = temp_var_gen();
@@ -1115,7 +1130,7 @@ constant:
             printdebug("string of C_NULL in constant is NULL");
             $$ = node;
         }
-    
+
     |   C_CHARACTER
         {
             char* temp = temp_var_gen();
@@ -1124,7 +1139,7 @@ constant:
             printdebug("string of C_CHARACTER in constant is %s",$1);
             $$ = node;
         }
-    
+
     |   C_TRUE
         {
             char* temp = temp_var_gen();
@@ -1134,7 +1149,7 @@ constant:
             printdebug("string of C_TRUE in constant is true");
             $$ = node;
         }
-    
+
     |   C_FALSE
         {
             char* temp = temp_var_gen();
@@ -1149,25 +1164,25 @@ constant:
 
 
 
-types:	
+types:
         T_INTEGER
         {
             $$ = $1;
             printdebug("string of T_INTEGER in types is %s",getName((TableNode*)$1));
         }
-    
+
     |   T_ADDRESS
         {
             $$ = $1;
             printdebug("string of T_ADDRESS in types is %s",getName((TableNode*)$1));
         }
-    
+
     |   T_CHARACTER
         {
             $$ = $1;
             printdebug("string of T_CHARACTER in types is %s",getName((TableNode*)$1));
         }
-    
+
     |   T_BOOLEAN
         {
             $$ = $1;
@@ -1254,7 +1269,7 @@ void throw_error(ErrorType error_type, const char *format, ...) {
 void yyerror(const char *err) {
     int line = yylloc.first_line;
     int column = yylloc.first_column;
-    
+
     // Grammar Fallback Case
     if (strcmp(err, "syntax error") == 0) {
         if (asc_flag != NULL) {

src/intermediate_code.c

@@ -69,6 +69,13 @@ void emit_detach(){
         current->next = NULL;
 }
 
+void backpatch(Stack *s, int l){
+        while (!S_IsEmpty(s)){
+                Instruction * i = S_Pop(s);
+                set_label(i, l);
+        }
+}
+
 TNodeOrConst * getOperand1(Instruction * i){
         return i->operand1;
 }
@@ -480,21 +487,21 @@ void emit_as_file(FILE * out_file, Instruction * i){
                case E_LESS_THAN:
                         // this feels wrong I need to TODO: this
                         fprintf(out_file,
-                                "%4.d:  %s = %s < %s\n",
+                                "%4.d:  if ( %s < %s ) GOTO %d\n",
                                 i->index,
-                                getName(i->result),
                                 get_string(i->operand1),
-                                get_string(i->operand2)
+                                get_string(i->operand2),
+                                i->label
                                 );
                         break;
                 case E_EQUAL_TO:
                         // this feels wrong I need to TODO: this
                         fprintf(out_file,
-                                "%4.d:  %s = %s == %s\n",
+                                "%4.d:  if ( %s = %s ) GOTO %d\n",
                                 i->index,
-                                getName(i->result),
                                 get_string(i->operand1),
-                                get_string(i->operand2)
+                                get_string(i->operand2),
+                                i->label
                                 );
                         break;
                 case E_CALL:

src/intermediate_code.h

@@ -108,13 +108,13 @@ typedef struct TFList {
         TFList       * next;
 } TFList;
 
-TFList * make_list(Instruction * i);
+// TFList * make_list(Instruction * i);
   // - makelist(i) function to create instruction lists
-void merge(TFList * l1, TFList * l2);
+// void merge(TFList * l1, TFList * l2);
   // - merge(p1,p2) function to concatenate lists
-void backpatch(TFList * l, int label);
+// void backpatch(TFList * l, int label);
   // - backpatch(p,i) function to fill in jump targets
-void bp_temp(int n);
+// void bp_temp(int n);
 
 
 extern Instruction   * begin;
@@ -159,3 +159,4 @@ int get_index(Instruction * i);
 void set_label(Instruction * i, int label);
 bool isConst(TNodeOrConst * tnc);
 int label_gen();
+void backpatch(Stack *s, int l);

src/runner.c

@@ -102,7 +102,10 @@ void print_tok(int tok) {
 int run(FILE *alpha) {
     int token;
     top = cur = init(CreateScope(NULL, 1, 1));
-    Stack *s = S_Init();
+    Stack *stack = S_Init();
+    Stack *TrueList = S_Init();
+    Stack *FalseList = S_Init();
+
 
     // If file is not found
     if (alpha == NULL) {
@@ -335,4 +338,4 @@ char *file_read_line(FILE *fp) {
 
     str[len] = '\0';
     return str;
-}
+}

tests/carl/NoErrors/selectionSort.alpha

@@ -45,9 +45,9 @@ selectionSort(data) := {
         data(i) := temp;
         i := i + 1;
     }
-    return true; 
+    return true;
 }
- 
+
 
 (* Function definition
    entry is the first function called