some more fixes as I work on mergesort

Author: robertDurst

examples/intListHandler.fish

@@ -4,19 +4,19 @@ Uat {
 }
 
 Ufn{
-    (fun printFoo_(int i)(void){
+    (fun display_(int i)(void){
         Tree(
             (| i != own.size | { 
                 printInt(getAtIndexInt(own.list, i))
                 ++i
-                own...printFoo_(i)
+                own...display_(i)
             })
         )
     })
 
-    (fun printFoo(void)(void){
+    (fun display(void)(void){
         printStr("List Contents:")
-        own...printFoo_(0)
+        own...display_(0)
     })
 
     # rather inefficient because we malloc every time
@@ -26,6 +26,11 @@ Ufn{
        ++own.size
     })
 
+    (fun peek_front(void)(int){
+      return getAtIndexInt(own.list, 0)
+    })
+
+
     (fun removeByIndex(int i)(void){
         Tree (
             ( | own.size == 0 | { printStr("Sorry, list is empty!") })

examples/mergesort.fish

@@ -0,0 +1,50 @@
+import intListHandler : "../examples/intListHandler.fish"
+
+(fun merge(intListHandler a, intListHandler b, intListHandler c) (intListHandler) {
+    Tree (
+        ( | a.size == 0 | {
+            c.list = appendListInt(c.list, b.list, c.size, b.size)
+            c.size = b.size + c.size
+            return c
+        })
+
+        ( | b.size == 0 | {
+            c.list = appendListInt(c.list, a.list, c.size, a.size)
+            c.size = a.size + c.size
+            return c
+        })
+
+        ( | a...peek_front(void) < b...peek_front(void) | {
+            dec int i = a...peek_front(void)
+            c...push(i)
+            a...removeByIndex(0)
+        })
+
+        ( | a...peek_front(void) >= b...peek_front(void) | {
+            dec int i = b...peek_front(void)
+            c...push(i)
+            b...removeByIndex(0)
+        })
+    )
+
+    return merge(a,b,c)
+})
+
+start {
+    dec intListHandler a = new intListHandler { list: [1, 3, 5], size: 3}
+    dec intListHandler b = new intListHandler { list: [2, 4, 7], size: 3}
+    dec intListHandler c = new intListHandler { list: [], size: 0}
+
+    dec intListHandler d = new intListHandler { list: [7, 11, 12], size: 3}
+    dec intListHandler e = new intListHandler { list: [2, 4, 13, 14, 15], size: 5}
+    dec intListHandler f = new intListHandler { list: [], size: 0}
+
+    dec intListHandler g = new intListHandler { list: [], size: 0}
+
+    c = merge(a,b,c)
+    f = merge(d,e,f)
+    g = merge(c,f,g)
+    
+
+    g...display(void)
+}

examples/treenode.fish

@@ -43,7 +43,7 @@ Ufn{
        )
    })
 
-    (fun inorderTraversal(void)(void) {
+   (fun inorderTraversal(void)(void) {
         Tree (
             # left 
             ( | own...hasLeft(void) | { 

src/sailfish/sailfishc.cpp

@@ -273,11 +273,11 @@ sailfishc::checkFunctionCall(const std::string& name,
                              ? symboltable->getSymbolType(fcInputs[i])
                              : fcInputs[i];
 
-            if (inputs[i].at(0) == '[')
-                inputs[i] = extractListType(inputs[i]);
+            if (left.at(0) == '[')
+                left = extractListType(left);
 
-            if (fcInputs[i].at(0) == '[')
-                fcInputs[i] = extractListType(fcInputs[i]);
+            if (right.at(0) == '[')
+                right = extractListType(right);
 
             if (left != right)
                 semanticerrorhandler->handle(std::make_unique<Error>(Error(
@@ -817,6 +817,7 @@ sailfishc::parseFunctionInOut(const std::string& name)
         else
             outputBuffer = "struct " + extractUDTName(filename) + "* this";
     }
+
     outputBuffer = output + "\n" + name + "(" + outputBuffer + ")\n";
 
     targetBuffer += outputBuffer;
@@ -873,6 +874,8 @@ sailfishc::parseBlock()
                 type = std::get<0>(a);
                 if (symboltable->hasVariable(type))
                     type = symboltable->getSymbolType(type);
+                if (type == "U" && udttable->hasUDT(std::get<0>(a)))
+                    type = std::get<0>(a);
                 hasSeenReturn = true;
             }
         }

src/sailfish/sailfishc.h

@@ -128,7 +128,6 @@ class sailfishc
                const G& g)
     {
         advanceAndCheckToken(tk); // consume token
-        output << " " + symbol + " ";
         targetBuffer += " " + symbol + " ";
         auto type = parseE0();