Fix merge conflict

Author: oswidan97

README.md

@@ -4,6 +4,76 @@ Built using Flex & Bison to take in any java source code and emits its equivalen
 
 <p align='center'><img src='./images/cover.png'/></p>
 
+## Translation of Productions
+Each production is associated with a **semantic actions**. This semantic actions will be generated when the production is matched by the parser.
+
+
+## Backpatching
+When generating code for boolean expressions and flow-of-control statements is that of matching a jump instruction with the target of the jump. For example, the translation of the boolean expression B in **if ( B ) S**, the target of the jump when **B** is false will not be declared until **S** is examined. In a
+one-pass translation, the problem is solved by passing labels as inherited attributes to where the relevant jump instructions were generated. But a separate pass is then needed to bind labels to addresses.
+
+***Backpatching*** counters the problem of two-passes translation by having lists of jumps are passed as synthesized attributes. Specifically, when a jump
+is generated, the target of the jump is temporarily left unspecified. Each such jump is put on a list of jumps whose labels are to be filled in when the proper
+label can be determined.
+
+
+## Assumptions
+### Java Used Grammar
+The input programs we are dealing with follow the below rules. These aren't a full java grammar but a subset of it.
+
+```
+method_body: 
+            %empty
+            |statement_list
+            ;
+
+statement_list: 
+                statement
+                |statement_list statement
+                ;
+
+statement:  
+        declaration 
+        |if 
+        |while 
+        |assignment
+        ;
+
+declaration: primitive_type IDENTIFIER ';';
+
+primitive_type: 
+                INT 
+                |FLOAT
+                ;
+
+if: 
+    IF '(' boolean_expression ')'
+    '{' statement_list '}' 
+    ELSE '{' statement_list '}'
+    ;
+
+while: 
+        WHILE '(' boolean_expression ')'
+        '{' statement_list '}'
+        ;
+
+assignment: IDENTIFIER '=' expression ';';
+
+expression:
+            INT_NUM
+            |FLOAT_NUM
+            |IDENTIFIER
+            |expression ARITH_OP expression
+            |'(' expression ')'
+            ;
+
+boolean_expression: 
+                    TRUE 
+                    |FALSE
+                    |expression BOOL_OP expression
+                    |expression REL_OP expression
+```
+
 ## Running & Testing
 
 To run the program, use the script `run.sh` as follows:

java_parser.y

@@ -146,7 +146,11 @@ while:
           backpatch(*($4.trueList), $7.nextInstructionIndex);
           $$.nextList = new unordered_set<int>();
           *($$.nextList) = *($4.falseList);
+<<<<<<< HEAD
           appendToCode("goto " + to_string($2.nextInstructionIndex));
+=======
+          appendToCode("goto Label_" + to_string($2.nextInstructionIndex));
+>>>>>>> fec483a1a35de6398462b673852227877513f7b8
         }
         ;
 

semantic_actions_utils.h

@@ -54,44 +54,46 @@ namespace semantic_actions_util {
     }
 
     void appendToCode(string code) {
-        outputCode.push_back(code);
+        outputCode.push_back("Label_" + std::to_string(nextInstructionIndex) + ":\n" + code);
         nextInstructionIndex++;
     }
 
     void backpatch(unordered_set<int> list, int instruction_index) {
         for (auto index : list) {
             outputCode[index] = outputCode[index].substr(0, outputCode[index].size()-1);
-            outputCode[index] += to_string(instruction_index);
+            outputCode[index] += "Label_" + to_string(instruction_index);
         }
     }
 
     void defineVariable(string name, int varType) {
         declareVariable(name, varType);
         if (varType == INT_TYPE) {
-            appendToCode("iconst_0\nistore_" + to_string(currentVariableIndex -1));
+            appendToCode("iconst_0");
+            appendToCode("istore_" + to_string(currentVariableIndex -1));
         } else if (varType == FLOAT_TYPE) {
-            appendToCode("fconst_0\nfstore_" + to_string(currentVariableIndex -1));
+            appendToCode("fconst_0");
+            appendToCode("fstore_" + to_string(currentVariableIndex -1));
         }
 
     }
 
     void generateHeader() {
         //TO-DO get file name
         //appendToCode(".source " + outfileName);
-        appendToCode(".class public java_class\n.super java/lang/Object\n");
-        appendToCode(".method public <init>()V");
-        appendToCode("aload_0");
-        appendToCode("invokenonvirtual java/lang/Object/<init>()V");
-        appendToCode("return");
-        appendToCode(".end method\n");
-        appendToCode(".method public static main([Ljava/lang/String;)V");
-        appendToCode(".limit locals 100\n.limit stack 100");
-        appendToCode(".line 1");
+        outputCode.push_back(".class public java_class\n.super java/lang/Object\n");
+        outputCode.push_back(".method public <init>()V");
+        outputCode.push_back("aload_0");
+        outputCode.push_back("invokenonvirtual java/lang/Object/<init>()V");
+        outputCode.push_back("return");
+        outputCode.push_back(".end method\n");
+        outputCode.push_back(".method public static main([Ljava/lang/String;)V");
+        outputCode.push_back(".limit locals 100\n.limit stack 100");
+        outputCode.push_back(".line 1");
     }
 
     void generateFooter() {
-        appendToCode("return");
-        appendToCode(".end method");
+        outputCode.push_back("return");
+        outputCode.push_back(".end method");
     }
 
     unordered_set<int> makeList(int instruction_index) {