diff --git a/examples/test_22b2_constraint_declared_via_superclass.ail.json b/examples/test_22b2_constraint_declared_via_superclass.ail.json index 4331304..6e4e3f3 100644 --- a/examples/test_22b2_constraint_declared_via_superclass.ail.json +++ b/examples/test_22b2_constraint_declared_via_superclass.ail.json @@ -4,9 +4,9 @@ "imports": [], "defs": [ { - "kind": "class", "name": "Eq", "param": "a", + "kind": "class", "name": "TEq", "param": "a", "methods": [{ - "name": "eq", + "name": "teq", "type": { "k": "fn", "params": [{ "k": "var", "name": "a" }, { "k": "var", "name": "a" }], @@ -15,10 +15,10 @@ }] }, { - "kind": "class", "name": "Ord", "param": "a", - "superclass": { "class": "Eq", "type": "a" }, + "kind": "class", "name": "TOrd", "param": "a", + "superclass": { "class": "TEq", "type": "a" }, "methods": [{ - "name": "lt", + "name": "tlt", "type": { "k": "fn", "params": [{ "k": "var", "name": "a" }, { "k": "var", "name": "a" }], @@ -33,7 +33,7 @@ "k": "forall", "vars": ["a"], "constraints": [ - { "class": "Ord", "type": { "k": "var", "name": "a" } } + { "class": "TOrd", "type": { "k": "var", "name": "a" } } ], "body": { "k": "fn", @@ -45,7 +45,7 @@ "params": ["x", "y"], "body": { "t": "app", - "fn": { "t": "var", "name": "eq" }, + "fn": { "t": "var", "name": "teq" }, "args": [{ "t": "var", "name": "x" }, { "t": "var", "name": "y" }] } } diff --git a/examples/test_22b2_constraint_declared_via_superclass.prose.txt b/examples/test_22b2_constraint_declared_via_superclass.prose.txt index 15c5233..d47280b 100644 --- a/examples/test_22b2_constraint_declared_via_superclass.prose.txt +++ b/examples/test_22b2_constraint_declared_via_superclass.prose.txt @@ -1,14 +1,14 @@ // module test_22b2_constraint_declared_via_superclass -class Eq a { - fn eq(x: a, x1: a) -> Bool +class TEq a { + fn teq(x: a, x1: a) -> Bool } -class Ord a extends Eq { - fn lt(x: a, x1: a) -> Bool +class TOrd a extends TEq { + fn tlt(x: a, x1: a) -> Bool } -forall where Ord a +forall where TOrd a fn uses_eq_via_ord(x: a, y: a) -> Bool { - eq(x, y) + teq(x, y) } diff --git a/examples/test_22b2_missing_constraint_subclass.ail.json b/examples/test_22b2_missing_constraint_subclass.ail.json index 0dc38a0..a276a07 100644 --- a/examples/test_22b2_missing_constraint_subclass.ail.json +++ b/examples/test_22b2_missing_constraint_subclass.ail.json @@ -4,9 +4,9 @@ "imports": [], "defs": [ { - "kind": "class", "name": "Eq", "param": "a", + "kind": "class", "name": "TEq", "param": "a", "methods": [{ - "name": "eq", + "name": "teq", "type": { "k": "fn", "params": [{ "k": "var", "name": "a" }, { "k": "var", "name": "a" }], @@ -15,10 +15,10 @@ }] }, { - "kind": "class", "name": "Ord", "param": "a", - "superclass": { "class": "Eq", "type": "a" }, + "kind": "class", "name": "TOrd", "param": "a", + "superclass": { "class": "TEq", "type": "a" }, "methods": [{ - "name": "lt", + "name": "tlt", "type": { "k": "fn", "params": [{ "k": "var", "name": "a" }, { "k": "var", "name": "a" }], @@ -33,7 +33,7 @@ "k": "forall", "vars": ["a"], "constraints": [ - { "class": "Eq", "type": { "k": "var", "name": "a" } } + { "class": "TEq", "type": { "k": "var", "name": "a" } } ], "body": { "k": "fn", @@ -45,7 +45,7 @@ "params": ["x", "y"], "body": { "t": "app", - "fn": { "t": "var", "name": "lt" }, + "fn": { "t": "var", "name": "tlt" }, "args": [{ "t": "var", "name": "x" }, { "t": "var", "name": "y" }] } }