merge master

[cc1516.git] / examples / tempTest.spl

diff --git a/examples/tempTest.spl b/examples/tempTest.spl
index 3658ca3..e8be43b 100644 (file)
--- a/examples/tempTest.spl
+++ b/examples/tempTest.spl
@@ -1,21 +1,3 @@
-//Let Int a = 4;//
-
-//mapP1(xs) {
-//    if(isEmpty(xs)) {
-//        return [];
-//    } else {
-//        return (xs.hd + 1) : mapP1(xs.tl);
-//    }
-//}
-//main() {
-//    [Int] x = [];
-//    [Int] y = [];
-//    Int z = a();
-//    x = mapP1(x);
-//    y = mapP1(x);
-//    return a() + 5;
-//}
-
 plus(x,y){
     return x+y;
 }
@@ -42,4 +24,5 @@ main() {
     var x = foldr(plus, 0, 1:2:[]);
     print(x);
     return;
+>>>>>>> master
 }
\ No newline at end of file