merge remote

tests/src/utility_test.cpp

@@ -34,6 +34,18 @@ void printLines(const std::vector<std::string>& lines)
 {
     for (const auto& v : lines)
         std::cout << v << "\n";
+    std::cout << std::endl;
+}
+
+int testFunc(int a, int b)
+{
+    if (a == b)
+    {
+        a = 2 * b;
+        b = 3 * a;
+    }
+    
+    return a;
 }
 
 void testEnumerate(const std::vector<std::string>& test)
@@ -111,9 +123,9 @@ void blt::test::utility::run()
     tableQ2i1.addColumn("IN");
     tableQ2i1.addColumn("OUT");
     tableQ2i1.addRow({"Entry (0)", " -- ", "{<factor, ?>, <factorial, ?>}"});
-    tableQ2i1.addRow({"(1)", "{<factor, ?>, <factorial, ?>}", "{<factor, 2>, <factorial, ?>}"});
+    tableQ2i1.addRow({"(1)", "{<factor, ?>, <factorial, ?>}", "{<factor, 1>, <factorial, ?>}"});
-    tableQ2i1.addRow({"(2)", "{<factor, 2>, <factorial, ?>}", "{<factor, 2>, <factorial, 1>}"});
+    tableQ2i1.addRow({"(2)", "{<factor, 1>, <factorial, ?>}", "{<factor, 2>, <factorial, 2>}"});
-    tableQ2i1.addRow({"(3)", "{<factor, 2>, <factorial, 1>}", "{}"});
+    tableQ2i1.addRow({"(3)", "{<factor, 1>, <factorial, 2>}", "{}"});
     tableQ2i1.addRow({"(4)", "{}", "{}"});
     tableQ2i1.addRow({"(5)", "{}", "{}"});
     tableQ2i1.addRow({"Exit (6)", "{}", " -- "});
@@ -125,12 +137,12 @@ void blt::test::utility::run()
     tableQ2i2.addColumn("IN");
     tableQ2i2.addColumn("OUT");
     tableQ2i2.addRow({"Entry (0)", " -- ", "{<factor, ?>, <factorial, ?>}"});
-    tableQ2i2.addRow({"(1)", "{<factor, ?>, <factorial, ?>}", "{<factor, 2>, <factorial, ?>}"});
+    tableQ2i2.addRow({"(1)", "{<factor, ?>, <factorial, ?>}", "{<factor, 1>, <factorial, ?>}"});
-    tableQ2i2.addRow({"(2)", "{<factor, 2>, <factorial, ?>}", "{<factor, 2>, <factorial, 1>}"});
+    tableQ2i2.addRow({"(2)", "{<factor, 1>, <factorial, ?>}", "{<factor, 2>, <factorial, 2>}"});
-    tableQ2i2.addRow({"(3)", "{<factor, 2>, <factorial, 1>}", "{<factor, 2>, <factorial, 1>}"});
+    tableQ2i2.addRow({"(3)", "{<factor, 1>, <factorial, 2>}", "{<factor, 1>, <factorial, 2>}"});
-    tableQ2i2.addRow({"(4)", "{<factor, 2>, <factorial, 1>}", "{<factor, 2>, <factorial, 2>}"});
+    tableQ2i2.addRow({"(4)", "{<factor, 1>, <factorial, 2>}", "{<factor, 1>, <factorial, 4>}"});
-    tableQ2i2.addRow({"(5)", "{<factor, 2>, <factorial, 2>}", "{<factor, 1>, <factorial, 2>}"});
+    tableQ2i2.addRow({"(5)", "{<factor, 1>, <factorial, 4>}", "{<factor, 5>, <factorial, 4>}"});
-    tableQ2i2.addRow({"Exit (6)", "{<factor, 1>, <factorial, 2>}", " -- "});
+    tableQ2i2.addRow({"Exit (6)", "{<factor, 5>, <factorial, 4>}", " -- "});
     
     printLines(tableQ2i2.createTable(true, true));
     
@@ -139,15 +151,29 @@ void blt::test::utility::run()
     tableQ2i3.addColumn("IN");
     tableQ2i3.addColumn("OUT");
     tableQ2i3.addRow({"Entry (0)", " -- ", "{<factor, ?>, <factorial, ?>}"});
-    tableQ2i3.addRow({"(1)", "{<factor, ?>, <factorial, ?>}", "{<factor, 2>, <factorial, ?>}"});
+    tableQ2i3.addRow({"(1)", "{<factor, ?>, <factorial, ?>}", "{<factor, 1>, <factorial, ?>}"});
-    tableQ2i3.addRow({"(2)", "{<factor, 2>, <factorial, ?>}", "{<factor, 2>, <factorial, 1>}"});
+    tableQ2i3.addRow({"(2)", "{<factor, 1>, <factorial, ?>}", "{<factor, 2>, <factorial, 2>}"});
-    tableQ2i3.addRow({"(3)", "{<factor, 1>, <factorial, 2>}", "{<factor, 1>, <factorial, 2>}"});
+    tableQ2i3.addRow({"(3)", "{<factor, 5>, <factorial, 4>}", "{<factor, 5>, <factorial, 4>}"});
-    tableQ2i3.addRow({"(4)", "{<factor, 2>, <factorial, 1>}", "{<factor, 2>, <factorial, 2>}"});
+    tableQ2i3.addRow({"(4)", "{<factor, 5>, <factorial, 4>}", "{<factor, 5>, <factorial, 4>}"});
-    tableQ2i3.addRow({"(5)", "{<factor, 2>, <factorial, 2>}", "{<factor, 1>, <factorial, 2>}"});
+    tableQ2i3.addRow({"(5)", "{<factor, 5>, <factorial, 4>}", "{<factor, 5>, <factorial, 4>}"});
-    tableQ2i3.addRow({"Exit (6)", "{<factor, 1>, <factorial, 2>}", " -- "});
+    tableQ2i3.addRow({"Exit (6)", "{<factor, 5>, <factorial, 4>}", " -- "});
     
     printLines(tableQ2i3.createTable(true, true));
     
+    blt::string::TableFormatter tableQ2i4("Iteration 3");
+    tableQ2i4.addColumn("Statement");
+    tableQ2i4.addColumn("IN");
+    tableQ2i4.addColumn("OUT");
+    tableQ2i4.addRow({"Entry (0)", " -- ", "{<factor, ?>, <factorial, ?>}"});
+    tableQ2i4.addRow({"(1)", "{<factor, ?>, <factorial, ?>}", "{<factor, 1>, <factorial, ?>}"});
+    tableQ2i4.addRow({"(2)", "{<factor, 1>, <factorial, ?>}", "{<factor, 2>, <factorial, 2>}"});
+    tableQ2i4.addRow({"(3)", "{<factor, 5>, <factorial, 4>}", "{<factor, 5>, <factorial, 4>}"});
+    tableQ2i4.addRow({"(4)", "{<factor, 5>, <factorial, 4>}", "{<factor, 5>, <factorial, 4>}"});
+    tableQ2i4.addRow({"(5)", "{<factor, 5>, <factorial, 4>}", "{<factor, 5>, <factorial, 4>}"});
+    tableQ2i4.addRow({"Exit (6)", "{<factor, 5>, <factorial, 4>}", " -- "});
+    
+    printLines(tableQ2i4.createTable(true, true));
+    
     blt::string::TableFormatter tableQ4i0("Q4 Iteration 0");
     tableQ4i0.addColumn("Statement");
     tableQ4i0.addColumn("IN");
@@ -163,5 +189,41 @@ void blt::test::utility::run()
     tableQ4i0.addRow({"(9)", "{a + b, a * b, a - b, b + 1}", "{a + b, a * b, a - b, b + 1}"});
     tableQ4i0.addRow({"Exit (10)", "{a + b, a * b, a - b, b + 1}", " -- "});
     
+    printLines(tableQ4i0.createTable(true, true));
+    
+    blt::string::TableFormatter tableQ4i1("Q4 Iteration 1");
+    tableQ4i1.addColumn("Statement");
+    tableQ4i1.addColumn("IN");
+    tableQ4i1.addColumn("OUT");
+    tableQ4i1.addRow({"Entry (1)", " -- ", " {} "});
+    tableQ4i1.addRow({"(2)", "{}", "{}"});
+    tableQ4i1.addRow({"(3)", "{}", "{}"});
+    tableQ4i1.addRow({"(4)", "{}", "{a + b}"});
+    tableQ4i1.addRow({"(5)", "{a + b}", "{a + b, a * b}"});
+    tableQ4i1.addRow({"(6)", "{a + b, a * b}", "{a + b, a * b, a - b}"});
+    tableQ4i1.addRow({"(7)", "{a + b, a * b, a - b}", "{}"});
+    tableQ4i1.addRow({"(8)", "{}", "{a + b}"});
+    tableQ4i1.addRow({"(9)", "{a + b}", "{a + b, a * b}"});
+    tableQ4i1.addRow({"Exit (10)", "{a + b, a * b, a - b}", " -- "});
+    
+    printLines(tableQ4i1.createTable(true, true));
+    
+    blt::string::TableFormatter tableQ4i2("Q4 Iteration 2");
+    tableQ4i2.addColumn("Statement");
+    tableQ4i2.addColumn("IN");
+    tableQ4i2.addColumn("OUT");
+    tableQ4i2.addRow({"Entry (1)", " -- ", " {} "});
+    tableQ4i2.addRow({"(2)", "{}", "{}"});
+    tableQ4i2.addRow({"(3)", "{}", "{}"});
+    tableQ4i2.addRow({"(4)", "{}", "{a + b}"});
+    tableQ4i2.addRow({"(5)", "{a + b}", "{a + b, a * b}"});
+    tableQ4i2.addRow({"(6)", "{a + b, a * b}", "{a + b, a * b, a - b}"});
+    tableQ4i2.addRow({"(7)", "{a + b, a * b, a - b}", "{}"});
+    tableQ4i2.addRow({"(8)", "{}", "{a + b}"});
+    tableQ4i2.addRow({"(9)", "{a + b}", "{a + b, a * b}"});
+    tableQ4i2.addRow({"Exit (10)", "{a + b, a * b, a - b}", " -- "});
+    
+    printLines(tableQ4i2.createTable(true, true));
+
     fuckered();
 }