hopefully fixed merge

tests/given/test/functionValue.alpha

@@ -30,7 +30,7 @@ function d: iic2b
 
 d(x,y,z) := {
     [string: s]
- return 0;
+     return true;
 }
 
 function entry: string2int
@@ -38,6 +38,7 @@ function entry: string2int
 a(x) := {
     [string : s]
     s := x;
+    
     return 0;
 }
 
@@ -50,7 +51,7 @@ b(x) := {
 c(x) := {
     [string: s]
     s := "Hi!";
-    return x(s);
+    return a(s);
 }
 
 
@@ -61,6 +62,7 @@ entry(arg) := {
   [integer: result; string2int: f; integer: temp]
   temp := a("Hello");
   f := b(temp);
+  result := f("ahhh");
   result := c(f);
   if (d(1,2,'c'))
   then {

tests/sprint4/test/sp4_cg_add.alpha

@@ -1,5 +1,5 @@
 (* TEST: [-asc -tc -cg -ir] *)
-
+ 
 type string: 1 -> character
 type BooleanXBoolean: [Boolean: x; Boolean: y]
 type characterXcharacter: [character: x; character: y]
@@ -35,7 +35,7 @@ external function inI: integer2integer
 external function inC: integer2character
 
 function entry: string2integer
-	
+
 entry (arg) := {
 	[integer:x; integer:y; integer: result]
 

tests/sprint4/test/sp4_cg_calls.alpha

@@ -36,7 +36,6 @@ external function inC: integer2character
 
 function entry: string2integer
 
-
 type rec: [integer: x; integer: y; integer: z; integer: a; integer: b; integer: c; integer: d]
 type T2: rec -> integer
 type T: integer -> integer
@@ -54,8 +53,9 @@ bar (a, b, c,d,e,f,g) := {
 }
 
 entry (arg) := {
-    [integer:x; integer:y; integer: result]
-
+    [integer:x; integer:y; integer: result; character: a]
+    a := 'a';
+    x := printCharacter(a);
     result := bar(1,2,3,4,5,6,7);
     return 1;
 }