Merge pull request #58 from Pip-Install-Party/officiablake-develop

fix output for file 5

Author: officialblake

Output.txt

@@ -1 +1,12 @@
-1, 2, Fizz, 4, Buzz, Fizz, 7, 8, Fizz, Buzz, 11, Fizz, 13, 14, Fizzbuzz, 16, 17, Fizz, 19, Buzz, Fizz, 22, 23, Fizz, Buzz, 26, Fizz, 28, 29, Fizzbuzz, 31, 32, Fizz, 34, Buzz, Fizz, 37, 38, Fizz, Buzz, 41, Fizz, 43, 44, Fizzbuzz, 46, 47, Fizz, 49, Buzz, Fizz, 52, 53, Fizz, Buzz, 56, Fizz, 58, 59, Fizzbuzz, 61, 62, Fizz, 64, Buzz, Fizz, 67, 68, Fizz, Buzz, 71, Fizz, 73, 74, Fizzbuzz, 76, 77, Fizz, 79, Buzz, Fizz, 82, 83, Fizz, Buzz, 86, Fizz, 88, 89, Fizzbuzz, 91, 92, Fizz, 94, Buzz, Fizz, 97, 98, Fizz, Buzz
+                                                      
+                                                      
+                                                      
+procedure main (void)
+{
+  int                   counter; 
+
+  counter =       100;
+                     
+  printf ("counter = %d\n", counter);
+}
+

Tree/tree.cpp

@@ -423,34 +423,13 @@ bool Tree::isIndex(std::string headType) {
 }
 
 Node* Tree::saveTree(std::ostringstream& buffer){
+
     Node* root = nullptr;
     Node* prevNode = nullptr;
     std::string tempString;
     std::string content = buffer.str(); // Convert the buffer to a string
-    
-    if (content.empty()) {
-        return nullptr; // Handle empty buffer case
-    }
-
-    const std::string targets[] = {" ---->", "|"}; // Substrings to replace
-    for (const auto& target : targets) {
-        std::size_t pos;
-        while ((pos = content.find(target)) != std::string::npos) {
-            content.replace(pos, target.length(), "~"); // Replace with a single space
-        }
-    }
 
-    // std::cout << "Reading characters: \n";
-    // Print to check validity
-    // for (char ch : content) {
-    //    std::cout << ch;
-    // }
-
-    // if full interpreter is selected in main, do not output to file    
-    bool name = interpreterSelected;
-    //std::cout << "value passed to tree is " << interpreterSelected << std::endl;
-    
-    if (interpreterSelected == false) {
+     if (interpreterSelected == false) {
 
         //std::cout << "FULL INTERPRETER NOT SELECTED" << std::endl;
         // temporary output file for the AST to help with Interpreter
@@ -466,8 +445,17 @@ Node* Tree::saveTree(std::ostringstream& buffer){
             std::cerr << "Error opening file!" << std::endl; // Handle error if the file can't be opened
         }
     }
-    else {
-        //std::cout << "FULL INTERPRETER SELECTED" << std::endl;
+    
+    if (content.empty()) {
+        return nullptr; // Handle empty buffer case
+    }
+
+    const std::string targets[] = {" ---->", "|"}; // Substrings to replace
+    for (const auto& target : targets) {
+        std::size_t pos;
+        while ((pos = content.find(target)) != std::string::npos) {
+            content.replace(pos, target.length(), "~"); // Replace with a single space
+        }
     }
 
     // Iterate through each character of the buffer

Tree/tree.h

@@ -41,13 +41,14 @@ class Tree {
         Tree(Token* head, Table* table, bool isInterpreter) { 
 
             interpreterSelected = isInterpreter;
-            //std::cout << interpreterSelected << std::endl;
 
             symbolTable = table; 
             std::ostringstream ASTOutput;
             buildTree(head, nullptr, ASTOutput);
-            root = saveTree(ASTOutput);
-            printTree(saveTree(ASTOutput)); 
+            if ( interpreterSelected ) {
+                root = saveTree(ASTOutput);
+            }
+            //printTree(saveTree(ASTOutput)); 
         }
         Node* getHead() { return root; }
         ~Tree();