AST Improvements

Sources/rxcc/rxcc.swift

@@ -234,7 +234,7 @@ func getTestFiles() -> [TestFile] {
     var testFiles: [TestFile] = [TestFile]()
 
     let fileManager = FileManager.default
-    let path = "c/tests/stage_2"
+    let path = "c/tests/stage_1"
 
     do {
         let validItems = try fileManager.contentsOfDirectory(atPath: path + "/valid")
@@ -301,7 +301,7 @@ func parse(lexed: [Substring]) -> String {
         print("Success")
         print(abstractSyntaxTree.text())
         print("Assembly:")
-        let assembly: String = generateOutput(tree: abstractSyntaxTree)
+        let assembly: String = generateOutput(abstractSyntaxTree)
         print(assembly)
         return assembly
     }
@@ -310,7 +310,7 @@ func parse(lexed: [Substring]) -> String {
     return ""
 }
 
-func generateOutput(tree: SyntaxTreeNode) -> String {
+/*func generateOutput(tree: SyntaxTreeNode) -> String {
     var text: String = ""
     switch tree.variant {
     case .Integer:
@@ -329,6 +329,43 @@ func generateOutput(tree: SyntaxTreeNode) -> String {
         text += generateOutput(tree: child)
     }
 
+    return text
+}*/
+
+func generateOutput(_ node: SyntaxTreeNode) -> String {
+    var text: String = ""
+    switch node.variant {
+    case .Root:
+        for child in node.children {
+            text += generateOutput(child)
+        }
+        break
+        
+    case .Integer:
+        text += " .globl \(node.value)\n\(node.value):\n"
+        for child in node.children {
+            text += generateOutput(child)
+        }
+        break
+
+    case .ReturnInteger:
+        var returnValue: String = ""
+        if node.children.count != 1 {
+            print("\(node.variant) cannot have more than one child node")
+            return "[ERROR]"
+        }
+        returnValue += generateOutput(node.children[0])
+        text += " movl    $\(returnValue), %eax\n ret\n"
+        break
+
+    case .LiteralInteger:
+        text += node.value
+        break
+
+    default:
+        break
+    }
+
     return text
 }
 

bin/bitwise.s

@@ -1,4 +0,0 @@
- .globl main
-main:
- movl    $, %eax
- ret

bin/bitwise_zero.s

@@ -1,4 +0,0 @@
- .globl main
-main:
- movl    $, %eax
- ret

bin/missing_const.s

@@ -1,4 +0,0 @@
- .globl main
-main:
- movl    $, %eax
- ret

bin/missing_semicolon.s

@@ -1,4 +0,0 @@
- .globl main
-main:
- movl    $, %eax
- ret

bin/multi_digit.s

@@ -1,4 +0,0 @@
- .globl main
-main:
- movl    $100, %eax
- ret

bin/neg.s

@@ -1,4 +0,0 @@
- .globl main
-main:
- movl    $, %eax
- ret

bin/nested_missing_const.s

@@ -1,4 +0,0 @@
- .globl main
-main:
- movl    $, %eax
- ret

bin/nested_ops.s

@@ -1,4 +0,0 @@
- .globl main
-main:
- movl    $, %eax
- ret

bin/nested_ops_2.s

@@ -1,4 +0,0 @@
- .globl main
-main:
- movl    $, %eax
- ret

bin/newlines.s

@@ -1,4 +0,0 @@
- .globl main
-main:
- movl    $0, %eax
- ret

bin/no_brace.s

@@ -1,4 +0,0 @@
- .globl main
-main:
- movl    $0, %eax
- ret

bin/no_newlines.s

@@ -1,4 +0,0 @@
- .globl main
-main:
- movl    $0, %eax
- ret

bin/no_semicolon.s

@@ -1,4 +0,0 @@
- .globl main
-main:
- movl    $0, %eax
- ret

bin/not_five.s

@@ -1,4 +0,0 @@
- .globl main
-main:
- movl    $, %eax
- ret

bin/not_zero.s

@@ -1,4 +0,0 @@
- .globl main
-main:
- movl    $, %eax
- ret

bin/return_0.s

@@ -1,4 +0,0 @@
- .globl main
-main:
- movl    $0, %eax
- ret

bin/return_2.s

@@ -1,4 +0,0 @@
- .globl main
-main:
- movl    $2, %eax
- ret

bin/spaces.s

@@ -1,4 +0,0 @@
- .globl main
-main:
- movl    $0, %eax
- ret

bin/wrong_order.s

@@ -1,4 +0,0 @@
- .globl main
-main:
- movl    $4, %eax
- ret