hopefully fixed merge

This commit is contained in:
Annie
2025-05-06 15:53:24 -04:00
parent c8491b62e4
commit bab71df517
8 changed files with 135 additions and 86 deletions

View File

@ -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]

View File

@ -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;
}