@@ -115,10 +115,10 @@ public static void main(String[] args)
 					CodeGenerator gen = new CodeGenerator(IRList, labels, fileName);
 					gen.generateMIPS();
 
-					//System.out.println("\n Testing Graph");
-					//AssemFlowGraph asmFG = new AssemFlowGraph(IRList,labels);					
-					//asmFG.buildCFG();
-					//asmFG.printGraph();
+					System.out.println("\n Testing Graph");
+					AssemFlowGraph asmFG = new AssemFlowGraph(IRList,labels);					
+					asmFG.buildCFG();
+					asmFG.printGraph();
 
 					//Link runtime.asm file
 					Linker linker = new Linker("linker/runtime.asm", fileName);
 
@@ -31,10 +31,6 @@ public Node buildCFG(){
                     //if is not the last node
                     if(i != graph.size()-2){
                         Node aux = graph.get(i+1);
-			System.out.println(i);
-			if(aux==null){
-				System.out.println("null"); 
-			}
                         n.addNext(aux);
                     }
                 }
@@ -48,7 +44,7 @@ public Node buildCFG(){
                         }
                         else{
                             int numLabel = labelNode.get(strAux.get(j));
-                            n.addNext(graph.get(numLabel));
+			    n.addNext(graph.get(numLabel));
                         }
 
                     }
@@ -72,6 +68,10 @@ public void buildNodes(){
                             //save label and its number
                             labelNode.put(l.getName(), i);
                         }
+			//the label can be in one line but actually represents the next one
+			else{
+				labelNode.put(l.getName(),i+1);
+			}
                     }
 
                 }
@@ -89,7 +89,7 @@ public void buildNodes(){
                 }
                 graph.add(n);
             }
-	    System.out.println("Graph without flow:");
+	    System.out.println("\nGraph without flow:");
             printGraph();
 	    System.out.println();
         }
@@ -98,17 +98,19 @@ public void printGraph(){
             for (int i = 0; i < graph.size(); i++) {
 
 		Node n = graph.get(i);
-                System.out.print(i+"  ");
-		System.out.println(n.getInstr().toString());
-                /*List<Node> listN = n.nextNode();
-                if(listN!=null){
-                    System.out.println("Nexts:");
+		System.out.print(n.getNum()+ " ");
+                System.out.println(n.getInstr().toString());
+                List<Node> listN = n.nextNode();
+                if(listN.size()!=0){
+		    
+	            System.out.println("Nexts:");
                     for (int j = 0; j < listN.size(); j++) {
-                        System.out.println(listN.get(i).getInstr().toString());
+			System.out.print(listN.get(j).getNum()+ " ");
+                        System.out.println(listN.get(j).getInstr().toString());
 
                     }
                 }
-                */
+                
 
             }
Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,6 @@ public Node buildCFG(){`
`31`	`31`	`//if is not the last node`
`32`	`32`	`if(i != graph.size()-2){`
`33`	`33`	`Node aux = graph.get(i+1);`
`34`		`- System.out.println(i);`
`35`		`- if(aux==null){`
`36`		`- System.out.println("null");`
`37`		`- }`
`38`	`34`	`n.addNext(aux);`
`39`	`35`	`}`
`40`	`36`	`}`
`@@ -48,7 +44,7 @@ public Node buildCFG(){`
`48`	`44`	`}`
`49`	`45`	`else{`
`50`	`46`	`int numLabel = labelNode.get(strAux.get(j));`
`51`		`- n.addNext(graph.get(numLabel));`
	`47`	`+ n.addNext(graph.get(numLabel));`
`52`	`48`	`}`
`53`	`49`
`54`	`50`	`}`
`@@ -72,6 +68,10 @@ public void buildNodes(){`
`72`	`68`	`//save label and its number`
`73`	`69`	`labelNode.put(l.getName(), i);`
`74`	`70`	`}`
	`71`	`+ //the label can be in one line but actually represents the next one`
	`72`	`+ else{`
	`73`	`+ labelNode.put(l.getName(),i+1);`
	`74`	`+ }`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`}`
`@@ -89,7 +89,7 @@ public void buildNodes(){`
`89`	`89`	`}`
`90`	`90`	`graph.add(n);`
`91`	`91`	`}`
`92`		`- System.out.println("Graph without flow:");`
	`92`	`+ System.out.println("\nGraph without flow:");`
`93`	`93`	`printGraph();`
`94`	`94`	`System.out.println();`
`95`	`95`	`}`
`@@ -98,17 +98,19 @@ public void printGraph(){`
`98`	`98`	`for (int i = 0; i < graph.size(); i++) {`
`99`	`99`
`100`	`100`	`Node n = graph.get(i);`
`101`		`- System.out.print(i+" ");`
`102`		`- System.out.println(n.getInstr().toString());`
`103`		`- /*List<Node> listN = n.nextNode();`
`104`		`- if(listN!=null){`
`105`		`- System.out.println("Nexts:");`
	`101`	`+ System.out.print(n.getNum()+ " ");`
	`102`	`+ System.out.println(n.getInstr().toString());`
	`103`	`+ List<Node> listN = n.nextNode();`
	`104`	`+ if(listN.size()!=0){`
	`105`	`+`
	`106`	`+ System.out.println("Nexts:");`
`106`	`107`	`for (int j = 0; j < listN.size(); j++) {`
`107`		`- System.out.println(listN.get(i).getInstr().toString());`
	`108`	`+ System.out.print(listN.get(j).getNum()+ " ");`
	`109`	`+ System.out.println(listN.get(j).getInstr().toString());`
`108`	`110`
`109`	`111`	`}`
`110`	`112`	`}`
`111`		`- */`
	`113`	`+`
`112`	`114`
`113`	`115`	`}`
`114`	`116`