diff --git a/1_k/1_lambda/lesson_1/tests/closed-variable-capture.lambda.out b/1_k/1_lambda/lesson_1/tests/closed-variable-capture.lambda.out index 989ddb0d..a621bf3d 100644 --- a/1_k/1_lambda/lesson_1/tests/closed-variable-capture.lambda.out +++ b/1_k/1_lambda/lesson_1/tests/closed-variable-capture.lambda.out @@ -1,3 +1,3 @@ - ( lambda z . ( z z ) ) lambda x . lambda y . ( x y ) ~> . + ( lambda z . ( z z ) ) lambda x . lambda y . ( x y ) ~> .K diff --git a/1_k/1_lambda/lesson_1/tests/free-variable-capture.lambda.out b/1_k/1_lambda/lesson_1/tests/free-variable-capture.lambda.out index 453eeb2a..e50d2392 100644 --- a/1_k/1_lambda/lesson_1/tests/free-variable-capture.lambda.out +++ b/1_k/1_lambda/lesson_1/tests/free-variable-capture.lambda.out @@ -1,3 +1,3 @@ - a ( ( lambda x . lambda y . x ) y z ) ~> . + a ( ( lambda x . lambda y . x ) y z ) ~> .K diff --git a/1_k/1_lambda/lesson_1/tests/identity.lambda.out b/1_k/1_lambda/lesson_1/tests/identity.lambda.out index 46c620ac..9476ee41 100644 --- a/1_k/1_lambda/lesson_1/tests/identity.lambda.out +++ b/1_k/1_lambda/lesson_1/tests/identity.lambda.out @@ -1,3 +1,3 @@ - lambda x . x ~> . + lambda x . x ~> .K diff --git a/1_k/1_lambda/lesson_1/tests/omega.lambda.out b/1_k/1_lambda/lesson_1/tests/omega.lambda.out index 9c9ebb87..35fae571 100644 --- a/1_k/1_lambda/lesson_1/tests/omega.lambda.out +++ b/1_k/1_lambda/lesson_1/tests/omega.lambda.out @@ -1,3 +1,3 @@ - ( lambda x . ( x x ) ) lambda x . ( x x ) ~> . + ( lambda x . ( x x ) ) lambda x . ( x x ) ~> .K diff --git a/1_k/1_lambda/lesson_2.5/tests/closed-variable-capture.lambda.out b/1_k/1_lambda/lesson_2.5/tests/closed-variable-capture.lambda.out index 45c65694..36ec35a9 100644 --- a/1_k/1_lambda/lesson_2.5/tests/closed-variable-capture.lambda.out +++ b/1_k/1_lambda/lesson_2.5/tests/closed-variable-capture.lambda.out @@ -1,3 +1,3 @@ - lambda y . lambda y0 . ( y y0 ) ~> . + lambda y . lambda y0 . ( y y0 ) ~> .K diff --git a/1_k/1_lambda/lesson_2.5/tests/free-variable-capture.lambda.out b/1_k/1_lambda/lesson_2.5/tests/free-variable-capture.lambda.out index ea4c74bd..556ded24 100644 --- a/1_k/1_lambda/lesson_2.5/tests/free-variable-capture.lambda.out +++ b/1_k/1_lambda/lesson_2.5/tests/free-variable-capture.lambda.out @@ -1,3 +1,3 @@ - a y ~> . + a y ~> .K diff --git a/1_k/1_lambda/lesson_2.5/tests/identity.lambda.out b/1_k/1_lambda/lesson_2.5/tests/identity.lambda.out index 46c620ac..9476ee41 100644 --- a/1_k/1_lambda/lesson_2.5/tests/identity.lambda.out +++ b/1_k/1_lambda/lesson_2.5/tests/identity.lambda.out @@ -1,3 +1,3 @@ - lambda x . x ~> . + lambda x . x ~> .K diff --git a/1_k/1_lambda/lesson_2/tests/closed-variable-capture.lambda.out b/1_k/1_lambda/lesson_2/tests/closed-variable-capture.lambda.out index c79d05f4..4134bc85 100644 --- a/1_k/1_lambda/lesson_2/tests/closed-variable-capture.lambda.out +++ b/1_k/1_lambda/lesson_2/tests/closed-variable-capture.lambda.out @@ -1,3 +1,3 @@ - lambda y . ( ( lambda x . lambda y . ( x y ) ) y ) ~> . + lambda y . ( ( lambda x . lambda y . ( x y ) ) y ) ~> .K diff --git a/1_k/1_lambda/lesson_2/tests/free-variable-capture.lambda.out b/1_k/1_lambda/lesson_2/tests/free-variable-capture.lambda.out index 453eeb2a..e50d2392 100644 --- a/1_k/1_lambda/lesson_2/tests/free-variable-capture.lambda.out +++ b/1_k/1_lambda/lesson_2/tests/free-variable-capture.lambda.out @@ -1,3 +1,3 @@ - a ( ( lambda x . lambda y . x ) y z ) ~> . + a ( ( lambda x . lambda y . x ) y z ) ~> .K diff --git a/1_k/1_lambda/lesson_2/tests/identity.lambda.out b/1_k/1_lambda/lesson_2/tests/identity.lambda.out index 46c620ac..9476ee41 100644 --- a/1_k/1_lambda/lesson_2/tests/identity.lambda.out +++ b/1_k/1_lambda/lesson_2/tests/identity.lambda.out @@ -1,3 +1,3 @@ - lambda x . x ~> . + lambda x . x ~> .K diff --git a/1_k/1_lambda/lesson_3/tests/closed-variable-capture.lambda.out b/1_k/1_lambda/lesson_3/tests/closed-variable-capture.lambda.out index c79d05f4..4134bc85 100644 --- a/1_k/1_lambda/lesson_3/tests/closed-variable-capture.lambda.out +++ b/1_k/1_lambda/lesson_3/tests/closed-variable-capture.lambda.out @@ -1,3 +1,3 @@ - lambda y . ( ( lambda x . lambda y . ( x y ) ) y ) ~> . + lambda y . ( ( lambda x . lambda y . ( x y ) ) y ) ~> .K diff --git a/1_k/1_lambda/lesson_3/tests/free-variable-capture.lambda.out b/1_k/1_lambda/lesson_3/tests/free-variable-capture.lambda.out index ea4c74bd..556ded24 100644 --- a/1_k/1_lambda/lesson_3/tests/free-variable-capture.lambda.out +++ b/1_k/1_lambda/lesson_3/tests/free-variable-capture.lambda.out @@ -1,3 +1,3 @@ - a y ~> . + a y ~> .K diff --git a/1_k/1_lambda/lesson_3/tests/identity.lambda.out b/1_k/1_lambda/lesson_3/tests/identity.lambda.out index 46c620ac..9476ee41 100644 --- a/1_k/1_lambda/lesson_3/tests/identity.lambda.out +++ b/1_k/1_lambda/lesson_3/tests/identity.lambda.out @@ -1,3 +1,3 @@ - lambda x . x ~> . + lambda x . x ~> .K diff --git a/1_k/1_lambda/lesson_4/tests/closed-variable-capture.lambda.out b/1_k/1_lambda/lesson_4/tests/closed-variable-capture.lambda.out index c79d05f4..4134bc85 100644 --- a/1_k/1_lambda/lesson_4/tests/closed-variable-capture.lambda.out +++ b/1_k/1_lambda/lesson_4/tests/closed-variable-capture.lambda.out @@ -1,3 +1,3 @@ - lambda y . ( ( lambda x . lambda y . ( x y ) ) y ) ~> . + lambda y . ( ( lambda x . lambda y . ( x y ) ) y ) ~> .K diff --git a/1_k/1_lambda/lesson_4/tests/free-variable-capture.lambda.out b/1_k/1_lambda/lesson_4/tests/free-variable-capture.lambda.out index ea4c74bd..556ded24 100644 --- a/1_k/1_lambda/lesson_4/tests/free-variable-capture.lambda.out +++ b/1_k/1_lambda/lesson_4/tests/free-variable-capture.lambda.out @@ -1,3 +1,3 @@ - a y ~> . + a y ~> .K diff --git a/1_k/1_lambda/lesson_4/tests/identity.lambda.out b/1_k/1_lambda/lesson_4/tests/identity.lambda.out index 46c620ac..9476ee41 100644 --- a/1_k/1_lambda/lesson_4/tests/identity.lambda.out +++ b/1_k/1_lambda/lesson_4/tests/identity.lambda.out @@ -1,3 +1,3 @@ - lambda x . x ~> . + lambda x . x ~> .K diff --git a/1_k/1_lambda/lesson_5/tests/arithmetic.lambda.out b/1_k/1_lambda/lesson_5/tests/arithmetic.lambda.out index 12360172..97f10093 100644 --- a/1_k/1_lambda/lesson_5/tests/arithmetic.lambda.out +++ b/1_k/1_lambda/lesson_5/tests/arithmetic.lambda.out @@ -1,3 +1,3 @@ - true ~> . + true ~> .K diff --git a/1_k/1_lambda/lesson_5/tests/closed-variable-capture.lambda.out b/1_k/1_lambda/lesson_5/tests/closed-variable-capture.lambda.out index c79d05f4..4134bc85 100644 --- a/1_k/1_lambda/lesson_5/tests/closed-variable-capture.lambda.out +++ b/1_k/1_lambda/lesson_5/tests/closed-variable-capture.lambda.out @@ -1,3 +1,3 @@ - lambda y . ( ( lambda x . lambda y . ( x y ) ) y ) ~> . + lambda y . ( ( lambda x . lambda y . ( x y ) ) y ) ~> .K diff --git a/1_k/1_lambda/lesson_5/tests/free-variable-capture.lambda.out b/1_k/1_lambda/lesson_5/tests/free-variable-capture.lambda.out index ea4c74bd..556ded24 100644 --- a/1_k/1_lambda/lesson_5/tests/free-variable-capture.lambda.out +++ b/1_k/1_lambda/lesson_5/tests/free-variable-capture.lambda.out @@ -1,3 +1,3 @@ - a y ~> . + a y ~> .K diff --git a/1_k/1_lambda/lesson_5/tests/identity.lambda.out b/1_k/1_lambda/lesson_5/tests/identity.lambda.out index 46c620ac..9476ee41 100644 --- a/1_k/1_lambda/lesson_5/tests/identity.lambda.out +++ b/1_k/1_lambda/lesson_5/tests/identity.lambda.out @@ -1,3 +1,3 @@ - lambda x . x ~> . + lambda x . x ~> .K diff --git a/1_k/1_lambda/lesson_6/tests/arithmetic.lambda.out b/1_k/1_lambda/lesson_6/tests/arithmetic.lambda.out index 12360172..97f10093 100644 --- a/1_k/1_lambda/lesson_6/tests/arithmetic.lambda.out +++ b/1_k/1_lambda/lesson_6/tests/arithmetic.lambda.out @@ -1,3 +1,3 @@ - true ~> . + true ~> .K diff --git a/1_k/1_lambda/lesson_6/tests/closed-variable-capture.lambda.out b/1_k/1_lambda/lesson_6/tests/closed-variable-capture.lambda.out index c79d05f4..4134bc85 100644 --- a/1_k/1_lambda/lesson_6/tests/closed-variable-capture.lambda.out +++ b/1_k/1_lambda/lesson_6/tests/closed-variable-capture.lambda.out @@ -1,3 +1,3 @@ - lambda y . ( ( lambda x . lambda y . ( x y ) ) y ) ~> . + lambda y . ( ( lambda x . lambda y . ( x y ) ) y ) ~> .K diff --git a/1_k/1_lambda/lesson_6/tests/free-variable-capture.lambda.out b/1_k/1_lambda/lesson_6/tests/free-variable-capture.lambda.out index ea4c74bd..556ded24 100644 --- a/1_k/1_lambda/lesson_6/tests/free-variable-capture.lambda.out +++ b/1_k/1_lambda/lesson_6/tests/free-variable-capture.lambda.out @@ -1,3 +1,3 @@ - a y ~> . + a y ~> .K diff --git a/1_k/1_lambda/lesson_6/tests/identity.lambda.out b/1_k/1_lambda/lesson_6/tests/identity.lambda.out index 46c620ac..9476ee41 100644 --- a/1_k/1_lambda/lesson_6/tests/identity.lambda.out +++ b/1_k/1_lambda/lesson_6/tests/identity.lambda.out @@ -1,3 +1,3 @@ - lambda x . x ~> . + lambda x . x ~> .K diff --git a/1_k/1_lambda/lesson_6/tests/if.lambda.out b/1_k/1_lambda/lesson_6/tests/if.lambda.out index faedaaaf..1b239a34 100644 --- a/1_k/1_lambda/lesson_6/tests/if.lambda.out +++ b/1_k/1_lambda/lesson_6/tests/if.lambda.out @@ -1,3 +1,3 @@ - 10 ~> . + 10 ~> .K diff --git a/1_k/1_lambda/lesson_7/tests/arithmetic.lambda.out b/1_k/1_lambda/lesson_7/tests/arithmetic.lambda.out index 12360172..97f10093 100644 --- a/1_k/1_lambda/lesson_7/tests/arithmetic.lambda.out +++ b/1_k/1_lambda/lesson_7/tests/arithmetic.lambda.out @@ -1,3 +1,3 @@ - true ~> . + true ~> .K diff --git a/1_k/1_lambda/lesson_7/tests/closed-variable-capture.lambda.out b/1_k/1_lambda/lesson_7/tests/closed-variable-capture.lambda.out index c79d05f4..4134bc85 100644 --- a/1_k/1_lambda/lesson_7/tests/closed-variable-capture.lambda.out +++ b/1_k/1_lambda/lesson_7/tests/closed-variable-capture.lambda.out @@ -1,3 +1,3 @@ - lambda y . ( ( lambda x . lambda y . ( x y ) ) y ) ~> . + lambda y . ( ( lambda x . lambda y . ( x y ) ) y ) ~> .K diff --git a/1_k/1_lambda/lesson_7/tests/factorial-let-fix.lambda.out b/1_k/1_lambda/lesson_7/tests/factorial-let-fix.lambda.out index 31643d70..c36a0d86 100644 --- a/1_k/1_lambda/lesson_7/tests/factorial-let-fix.lambda.out +++ b/1_k/1_lambda/lesson_7/tests/factorial-let-fix.lambda.out @@ -1,3 +1,3 @@ - 3628800 ~> . + 3628800 ~> .K diff --git a/1_k/1_lambda/lesson_7/tests/factorial-let.lambda.out b/1_k/1_lambda/lesson_7/tests/factorial-let.lambda.out index 31643d70..c36a0d86 100644 --- a/1_k/1_lambda/lesson_7/tests/factorial-let.lambda.out +++ b/1_k/1_lambda/lesson_7/tests/factorial-let.lambda.out @@ -1,3 +1,3 @@ - 3628800 ~> . + 3628800 ~> .K diff --git a/1_k/1_lambda/lesson_7/tests/factorial-letrec.lambda.out b/1_k/1_lambda/lesson_7/tests/factorial-letrec.lambda.out index 31643d70..c36a0d86 100644 --- a/1_k/1_lambda/lesson_7/tests/factorial-letrec.lambda.out +++ b/1_k/1_lambda/lesson_7/tests/factorial-letrec.lambda.out @@ -1,3 +1,3 @@ - 3628800 ~> . + 3628800 ~> .K diff --git a/1_k/1_lambda/lesson_7/tests/free-variable-capture.lambda.out b/1_k/1_lambda/lesson_7/tests/free-variable-capture.lambda.out index ea4c74bd..556ded24 100644 --- a/1_k/1_lambda/lesson_7/tests/free-variable-capture.lambda.out +++ b/1_k/1_lambda/lesson_7/tests/free-variable-capture.lambda.out @@ -1,3 +1,3 @@ - a y ~> . + a y ~> .K diff --git a/1_k/1_lambda/lesson_7/tests/identity.lambda.out b/1_k/1_lambda/lesson_7/tests/identity.lambda.out index 46c620ac..9476ee41 100644 --- a/1_k/1_lambda/lesson_7/tests/identity.lambda.out +++ b/1_k/1_lambda/lesson_7/tests/identity.lambda.out @@ -1,3 +1,3 @@ - lambda x . x ~> . + lambda x . x ~> .K diff --git a/1_k/1_lambda/lesson_7/tests/if.lambda.out b/1_k/1_lambda/lesson_7/tests/if.lambda.out index faedaaaf..1b239a34 100644 --- a/1_k/1_lambda/lesson_7/tests/if.lambda.out +++ b/1_k/1_lambda/lesson_7/tests/if.lambda.out @@ -1,3 +1,3 @@ - 10 ~> . + 10 ~> .K diff --git a/1_k/1_lambda/lesson_7/tests/lets.lambda.out b/1_k/1_lambda/lesson_7/tests/lets.lambda.out index 12360172..97f10093 100644 --- a/1_k/1_lambda/lesson_7/tests/lets.lambda.out +++ b/1_k/1_lambda/lesson_7/tests/lets.lambda.out @@ -1,3 +1,3 @@ - true ~> . + true ~> .K diff --git a/1_k/1_lambda/lesson_8/tests/arithmetic.lambda.out b/1_k/1_lambda/lesson_8/tests/arithmetic.lambda.out index 12360172..97f10093 100644 --- a/1_k/1_lambda/lesson_8/tests/arithmetic.lambda.out +++ b/1_k/1_lambda/lesson_8/tests/arithmetic.lambda.out @@ -1,3 +1,3 @@ - true ~> . + true ~> .K diff --git a/1_k/1_lambda/lesson_8/tests/closed-variable-capture.lambda.out b/1_k/1_lambda/lesson_8/tests/closed-variable-capture.lambda.out index c79d05f4..4134bc85 100644 --- a/1_k/1_lambda/lesson_8/tests/closed-variable-capture.lambda.out +++ b/1_k/1_lambda/lesson_8/tests/closed-variable-capture.lambda.out @@ -1,3 +1,3 @@ - lambda y . ( ( lambda x . lambda y . ( x y ) ) y ) ~> . + lambda y . ( ( lambda x . lambda y . ( x y ) ) y ) ~> .K diff --git a/1_k/1_lambda/lesson_8/tests/factorial-let-fix.lambda.out b/1_k/1_lambda/lesson_8/tests/factorial-let-fix.lambda.out index 31643d70..c36a0d86 100644 --- a/1_k/1_lambda/lesson_8/tests/factorial-let-fix.lambda.out +++ b/1_k/1_lambda/lesson_8/tests/factorial-let-fix.lambda.out @@ -1,3 +1,3 @@ - 3628800 ~> . + 3628800 ~> .K diff --git a/1_k/1_lambda/lesson_8/tests/factorial-let.lambda.out b/1_k/1_lambda/lesson_8/tests/factorial-let.lambda.out index 31643d70..c36a0d86 100644 --- a/1_k/1_lambda/lesson_8/tests/factorial-let.lambda.out +++ b/1_k/1_lambda/lesson_8/tests/factorial-let.lambda.out @@ -1,3 +1,3 @@ - 3628800 ~> . + 3628800 ~> .K diff --git a/1_k/1_lambda/lesson_8/tests/factorial-letrec.lambda.out b/1_k/1_lambda/lesson_8/tests/factorial-letrec.lambda.out index 31643d70..c36a0d86 100644 --- a/1_k/1_lambda/lesson_8/tests/factorial-letrec.lambda.out +++ b/1_k/1_lambda/lesson_8/tests/factorial-letrec.lambda.out @@ -1,3 +1,3 @@ - 3628800 ~> . + 3628800 ~> .K diff --git a/1_k/1_lambda/lesson_8/tests/fibbo.lambda.out b/1_k/1_lambda/lesson_8/tests/fibbo.lambda.out index 7b3823ba..dac83548 100644 --- a/1_k/1_lambda/lesson_8/tests/fibbo.lambda.out +++ b/1_k/1_lambda/lesson_8/tests/fibbo.lambda.out @@ -1,3 +1,3 @@ - 13 ~> . + 13 ~> .K diff --git a/1_k/1_lambda/lesson_8/tests/free-variable-capture.lambda.out b/1_k/1_lambda/lesson_8/tests/free-variable-capture.lambda.out index ea4c74bd..556ded24 100644 --- a/1_k/1_lambda/lesson_8/tests/free-variable-capture.lambda.out +++ b/1_k/1_lambda/lesson_8/tests/free-variable-capture.lambda.out @@ -1,3 +1,3 @@ - a y ~> . + a y ~> .K diff --git a/1_k/1_lambda/lesson_8/tests/identity.lambda.out b/1_k/1_lambda/lesson_8/tests/identity.lambda.out index 46c620ac..9476ee41 100644 --- a/1_k/1_lambda/lesson_8/tests/identity.lambda.out +++ b/1_k/1_lambda/lesson_8/tests/identity.lambda.out @@ -1,3 +1,3 @@ - lambda x . x ~> . + lambda x . x ~> .K diff --git a/1_k/1_lambda/lesson_8/tests/if.lambda.out b/1_k/1_lambda/lesson_8/tests/if.lambda.out index faedaaaf..1b239a34 100644 --- a/1_k/1_lambda/lesson_8/tests/if.lambda.out +++ b/1_k/1_lambda/lesson_8/tests/if.lambda.out @@ -1,3 +1,3 @@ - 10 ~> . + 10 ~> .K diff --git a/1_k/1_lambda/lesson_8/tests/lets.lambda.out b/1_k/1_lambda/lesson_8/tests/lets.lambda.out index 12360172..97f10093 100644 --- a/1_k/1_lambda/lesson_8/tests/lets.lambda.out +++ b/1_k/1_lambda/lesson_8/tests/lets.lambda.out @@ -1,3 +1,3 @@ - true ~> . + true ~> .K diff --git a/1_k/1_lambda/lesson_9/tests/arithmetic.lambda.out b/1_k/1_lambda/lesson_9/tests/arithmetic.lambda.out index 12360172..97f10093 100644 --- a/1_k/1_lambda/lesson_9/tests/arithmetic.lambda.out +++ b/1_k/1_lambda/lesson_9/tests/arithmetic.lambda.out @@ -1,3 +1,3 @@ - true ~> . + true ~> .K diff --git a/1_k/1_lambda/lesson_9/tests/closed-variable-capture.lambda.out b/1_k/1_lambda/lesson_9/tests/closed-variable-capture.lambda.out index c79d05f4..4134bc85 100644 --- a/1_k/1_lambda/lesson_9/tests/closed-variable-capture.lambda.out +++ b/1_k/1_lambda/lesson_9/tests/closed-variable-capture.lambda.out @@ -1,3 +1,3 @@ - lambda y . ( ( lambda x . lambda y . ( x y ) ) y ) ~> . + lambda y . ( ( lambda x . lambda y . ( x y ) ) y ) ~> .K diff --git a/1_k/1_lambda/lesson_9/tests/factorial-let-fix.lambda.out b/1_k/1_lambda/lesson_9/tests/factorial-let-fix.lambda.out index 31643d70..c36a0d86 100644 --- a/1_k/1_lambda/lesson_9/tests/factorial-let-fix.lambda.out +++ b/1_k/1_lambda/lesson_9/tests/factorial-let-fix.lambda.out @@ -1,3 +1,3 @@ - 3628800 ~> . + 3628800 ~> .K diff --git a/1_k/1_lambda/lesson_9/tests/factorial-let.lambda.out b/1_k/1_lambda/lesson_9/tests/factorial-let.lambda.out index 31643d70..c36a0d86 100644 --- a/1_k/1_lambda/lesson_9/tests/factorial-let.lambda.out +++ b/1_k/1_lambda/lesson_9/tests/factorial-let.lambda.out @@ -1,3 +1,3 @@ - 3628800 ~> . + 3628800 ~> .K diff --git a/1_k/1_lambda/lesson_9/tests/factorial-letrec.lambda.out b/1_k/1_lambda/lesson_9/tests/factorial-letrec.lambda.out index 31643d70..c36a0d86 100644 --- a/1_k/1_lambda/lesson_9/tests/factorial-letrec.lambda.out +++ b/1_k/1_lambda/lesson_9/tests/factorial-letrec.lambda.out @@ -1,3 +1,3 @@ - 3628800 ~> . + 3628800 ~> .K diff --git a/1_k/1_lambda/lesson_9/tests/fibbo-church.lambda.out b/1_k/1_lambda/lesson_9/tests/fibbo-church.lambda.out index 7b3823ba..dac83548 100644 --- a/1_k/1_lambda/lesson_9/tests/fibbo-church.lambda.out +++ b/1_k/1_lambda/lesson_9/tests/fibbo-church.lambda.out @@ -1,3 +1,3 @@ - 13 ~> . + 13 ~> .K diff --git a/1_k/1_lambda/lesson_9/tests/fibbo.lambda.out b/1_k/1_lambda/lesson_9/tests/fibbo.lambda.out index 7b3823ba..dac83548 100644 --- a/1_k/1_lambda/lesson_9/tests/fibbo.lambda.out +++ b/1_k/1_lambda/lesson_9/tests/fibbo.lambda.out @@ -1,3 +1,3 @@ - 13 ~> . + 13 ~> .K diff --git a/1_k/1_lambda/lesson_9/tests/free-variable-capture.lambda.out b/1_k/1_lambda/lesson_9/tests/free-variable-capture.lambda.out index ea4c74bd..556ded24 100644 --- a/1_k/1_lambda/lesson_9/tests/free-variable-capture.lambda.out +++ b/1_k/1_lambda/lesson_9/tests/free-variable-capture.lambda.out @@ -1,3 +1,3 @@ - a y ~> . + a y ~> .K diff --git a/1_k/1_lambda/lesson_9/tests/identity.lambda.out b/1_k/1_lambda/lesson_9/tests/identity.lambda.out index 46c620ac..9476ee41 100644 --- a/1_k/1_lambda/lesson_9/tests/identity.lambda.out +++ b/1_k/1_lambda/lesson_9/tests/identity.lambda.out @@ -1,3 +1,3 @@ - lambda x . x ~> . + lambda x . x ~> .K diff --git a/1_k/1_lambda/lesson_9/tests/if.lambda.out b/1_k/1_lambda/lesson_9/tests/if.lambda.out index faedaaaf..1b239a34 100644 --- a/1_k/1_lambda/lesson_9/tests/if.lambda.out +++ b/1_k/1_lambda/lesson_9/tests/if.lambda.out @@ -1,3 +1,3 @@ - 10 ~> . + 10 ~> .K diff --git a/1_k/1_lambda/lesson_9/tests/lets.lambda.out b/1_k/1_lambda/lesson_9/tests/lets.lambda.out index 12360172..97f10093 100644 --- a/1_k/1_lambda/lesson_9/tests/lets.lambda.out +++ b/1_k/1_lambda/lesson_9/tests/lets.lambda.out @@ -1,3 +1,3 @@ - true ~> . + true ~> .K diff --git a/1_k/2_imp/lesson_1/tests/collatz.imp.out b/1_k/2_imp/lesson_1/tests/collatz.imp.out index 88e74d91..50b0ed54 100644 --- a/1_k/2_imp/lesson_1/tests/collatz.imp.out +++ b/1_k/2_imp/lesson_1/tests/collatz.imp.out @@ -1,3 +1,3 @@ - int m , n , q , r , s , .Ids ; m = 10 ; while ( ! m <= 2 ) { n = m ; m = m + - 1 ; while ( ! n <= 1 ) { s = s + 1 ; q = n / 2 ; r = q + q + 1 ; if ( r <= n ) { n = n + n + n + 1 ; } else { n = q ; } } } ~> . + int m , n , q , r , s , .Ids ; m = 10 ; while ( ! m <= 2 ) { n = m ; m = m + - 1 ; while ( ! n <= 1 ) { s = s + 1 ; q = n / 2 ; r = q + q + 1 ; if ( r <= n ) { n = n + n + n + 1 ; } else { n = q ; } } } ~> .K diff --git a/1_k/2_imp/lesson_1/tests/primes.imp.out b/1_k/2_imp/lesson_1/tests/primes.imp.out index 393dffbb..f9f5fc23 100644 --- a/1_k/2_imp/lesson_1/tests/primes.imp.out +++ b/1_k/2_imp/lesson_1/tests/primes.imp.out @@ -1,3 +1,3 @@ - int i , m , n , q , r , s , t , x , y , z , .Ids ; m = 10 ; n = 2 ; while ( n <= m ) { i = 2 ; q = n / i ; t = 1 ; while ( i <= q && 1 <= t ) { x = i ; y = q ; z = 0 ; while ( ! x <= 0 ) { q = x / 2 ; r = q + q + 1 ; if ( r <= x ) { z = z + y ; } else { } x = q ; y = y + y ; } if ( n <= z ) { t = 0 ; } else { i = i + 1 ; q = n / i ; } } if ( 1 <= t ) { s = s + 1 ; } else { } n = n + 1 ; } ~> . + int i , m , n , q , r , s , t , x , y , z , .Ids ; m = 10 ; n = 2 ; while ( n <= m ) { i = 2 ; q = n / i ; t = 1 ; while ( i <= q && 1 <= t ) { x = i ; y = q ; z = 0 ; while ( ! x <= 0 ) { q = x / 2 ; r = q + q + 1 ; if ( r <= x ) { z = z + y ; } else { } x = q ; y = y + y ; } if ( n <= z ) { t = 0 ; } else { i = i + 1 ; q = n / i ; } } if ( 1 <= t ) { s = s + 1 ; } else { } n = n + 1 ; } ~> .K diff --git a/1_k/2_imp/lesson_1/tests/sum.imp.out b/1_k/2_imp/lesson_1/tests/sum.imp.out index e4012cab..5d3e4c9a 100644 --- a/1_k/2_imp/lesson_1/tests/sum.imp.out +++ b/1_k/2_imp/lesson_1/tests/sum.imp.out @@ -1,3 +1,3 @@ - int n , sum , .Ids ; n = 100 ; sum = 0 ; while ( ! n <= 0 ) { sum = sum + n ; n = n + - 1 ; } ~> . + int n , sum , .Ids ; n = 100 ; sum = 0 ; while ( ! n <= 0 ) { sum = sum + n ; n = n + - 1 ; } ~> .K diff --git a/1_k/2_imp/lesson_2/tests/collatz.imp.out b/1_k/2_imp/lesson_2/tests/collatz.imp.out index 0b8674ca..e2accbf9 100644 --- a/1_k/2_imp/lesson_2/tests/collatz.imp.out +++ b/1_k/2_imp/lesson_2/tests/collatz.imp.out @@ -1,6 +1,6 @@ - int m , n , q , r , s , .Ids ; m = 10 ; while ( ! m <= 2 ) { n = m ; m = m + - 1 ; while ( ! n <= 1 ) { s = s + 1 ; q = n / 2 ; r = q + q + 1 ; if ( r <= n ) { n = n + n + n + 1 ; } else { n = q ; } } } ~> . + int m , n , q , r , s , .Ids ; m = 10 ; while ( ! m <= 2 ) { n = m ; m = m + - 1 ; while ( ! n <= 1 ) { s = s + 1 ; q = n / 2 ; r = q + q + 1 ; if ( r <= n ) { n = n + n + n + 1 ; } else { n = q ; } } } ~> .K .Map diff --git a/1_k/2_imp/lesson_2/tests/primes.imp.out b/1_k/2_imp/lesson_2/tests/primes.imp.out index b975be1a..54f1009e 100644 --- a/1_k/2_imp/lesson_2/tests/primes.imp.out +++ b/1_k/2_imp/lesson_2/tests/primes.imp.out @@ -1,6 +1,6 @@ - int i , m , n , q , r , s , t , x , y , z , .Ids ; m = 10 ; n = 2 ; while ( n <= m ) { i = 2 ; q = n / i ; t = 1 ; while ( i <= q && 1 <= t ) { x = i ; y = q ; z = 0 ; while ( ! x <= 0 ) { q = x / 2 ; r = q + q + 1 ; if ( r <= x ) { z = z + y ; } else { } x = q ; y = y + y ; } if ( n <= z ) { t = 0 ; } else { i = i + 1 ; q = n / i ; } } if ( 1 <= t ) { s = s + 1 ; } else { } n = n + 1 ; } ~> . + int i , m , n , q , r , s , t , x , y , z , .Ids ; m = 10 ; n = 2 ; while ( n <= m ) { i = 2 ; q = n / i ; t = 1 ; while ( i <= q && 1 <= t ) { x = i ; y = q ; z = 0 ; while ( ! x <= 0 ) { q = x / 2 ; r = q + q + 1 ; if ( r <= x ) { z = z + y ; } else { } x = q ; y = y + y ; } if ( n <= z ) { t = 0 ; } else { i = i + 1 ; q = n / i ; } } if ( 1 <= t ) { s = s + 1 ; } else { } n = n + 1 ; } ~> .K .Map diff --git a/1_k/2_imp/lesson_2/tests/sum.imp.out b/1_k/2_imp/lesson_2/tests/sum.imp.out index 80a08851..0eb6ad80 100644 --- a/1_k/2_imp/lesson_2/tests/sum.imp.out +++ b/1_k/2_imp/lesson_2/tests/sum.imp.out @@ -1,6 +1,6 @@ - int n , sum , .Ids ; n = 100 ; sum = 0 ; while ( ! n <= 0 ) { sum = sum + n ; n = n + - 1 ; } ~> . + int n , sum , .Ids ; n = 100 ; sum = 0 ; while ( ! n <= 0 ) { sum = sum + n ; n = n + - 1 ; } ~> .K .Map diff --git a/1_k/2_imp/lesson_3/tests/collatz.imp.out b/1_k/2_imp/lesson_3/tests/collatz.imp.out index 0b8674ca..e2accbf9 100644 --- a/1_k/2_imp/lesson_3/tests/collatz.imp.out +++ b/1_k/2_imp/lesson_3/tests/collatz.imp.out @@ -1,6 +1,6 @@ - int m , n , q , r , s , .Ids ; m = 10 ; while ( ! m <= 2 ) { n = m ; m = m + - 1 ; while ( ! n <= 1 ) { s = s + 1 ; q = n / 2 ; r = q + q + 1 ; if ( r <= n ) { n = n + n + n + 1 ; } else { n = q ; } } } ~> . + int m , n , q , r , s , .Ids ; m = 10 ; while ( ! m <= 2 ) { n = m ; m = m + - 1 ; while ( ! n <= 1 ) { s = s + 1 ; q = n / 2 ; r = q + q + 1 ; if ( r <= n ) { n = n + n + n + 1 ; } else { n = q ; } } } ~> .K .Map diff --git a/1_k/2_imp/lesson_3/tests/primes.imp.out b/1_k/2_imp/lesson_3/tests/primes.imp.out index b975be1a..54f1009e 100644 --- a/1_k/2_imp/lesson_3/tests/primes.imp.out +++ b/1_k/2_imp/lesson_3/tests/primes.imp.out @@ -1,6 +1,6 @@ - int i , m , n , q , r , s , t , x , y , z , .Ids ; m = 10 ; n = 2 ; while ( n <= m ) { i = 2 ; q = n / i ; t = 1 ; while ( i <= q && 1 <= t ) { x = i ; y = q ; z = 0 ; while ( ! x <= 0 ) { q = x / 2 ; r = q + q + 1 ; if ( r <= x ) { z = z + y ; } else { } x = q ; y = y + y ; } if ( n <= z ) { t = 0 ; } else { i = i + 1 ; q = n / i ; } } if ( 1 <= t ) { s = s + 1 ; } else { } n = n + 1 ; } ~> . + int i , m , n , q , r , s , t , x , y , z , .Ids ; m = 10 ; n = 2 ; while ( n <= m ) { i = 2 ; q = n / i ; t = 1 ; while ( i <= q && 1 <= t ) { x = i ; y = q ; z = 0 ; while ( ! x <= 0 ) { q = x / 2 ; r = q + q + 1 ; if ( r <= x ) { z = z + y ; } else { } x = q ; y = y + y ; } if ( n <= z ) { t = 0 ; } else { i = i + 1 ; q = n / i ; } } if ( 1 <= t ) { s = s + 1 ; } else { } n = n + 1 ; } ~> .K .Map diff --git a/1_k/2_imp/lesson_3/tests/sum.imp.out b/1_k/2_imp/lesson_3/tests/sum.imp.out index 80a08851..0eb6ad80 100644 --- a/1_k/2_imp/lesson_3/tests/sum.imp.out +++ b/1_k/2_imp/lesson_3/tests/sum.imp.out @@ -1,6 +1,6 @@ - int n , sum , .Ids ; n = 100 ; sum = 0 ; while ( ! n <= 0 ) { sum = sum + n ; n = n + - 1 ; } ~> . + int n , sum , .Ids ; n = 100 ; sum = 0 ; while ( ! n <= 0 ) { sum = sum + n ; n = n + - 1 ; } ~> .K .Map diff --git a/1_k/2_imp/lesson_4/tests/collatz.imp.out b/1_k/2_imp/lesson_4/tests/collatz.imp.out index 4e77a353..746da717 100644 --- a/1_k/2_imp/lesson_4/tests/collatz.imp.out +++ b/1_k/2_imp/lesson_4/tests/collatz.imp.out @@ -1,6 +1,6 @@ - . + .K m |-> 2 diff --git a/1_k/2_imp/lesson_4/tests/primes.imp.out b/1_k/2_imp/lesson_4/tests/primes.imp.out index dc1326e5..702afd61 100644 --- a/1_k/2_imp/lesson_4/tests/primes.imp.out +++ b/1_k/2_imp/lesson_4/tests/primes.imp.out @@ -1,6 +1,6 @@ - . + .K i |-> 2 diff --git a/1_k/2_imp/lesson_4/tests/sum.imp.out b/1_k/2_imp/lesson_4/tests/sum.imp.out index f72ab68a..d6373fd2 100644 --- a/1_k/2_imp/lesson_4/tests/sum.imp.out +++ b/1_k/2_imp/lesson_4/tests/sum.imp.out @@ -1,6 +1,6 @@ - . + .K n |-> 0 diff --git a/1_k/2_imp/lesson_5/tests/collatz.imp.out b/1_k/2_imp/lesson_5/tests/collatz.imp.out index 4e77a353..746da717 100644 --- a/1_k/2_imp/lesson_5/tests/collatz.imp.out +++ b/1_k/2_imp/lesson_5/tests/collatz.imp.out @@ -1,6 +1,6 @@ - . + .K m |-> 2 diff --git a/1_k/2_imp/lesson_5/tests/primes.imp.out b/1_k/2_imp/lesson_5/tests/primes.imp.out index dc1326e5..702afd61 100644 --- a/1_k/2_imp/lesson_5/tests/primes.imp.out +++ b/1_k/2_imp/lesson_5/tests/primes.imp.out @@ -1,6 +1,6 @@ - . + .K i |-> 2 diff --git a/1_k/2_imp/lesson_5/tests/sum.imp.out b/1_k/2_imp/lesson_5/tests/sum.imp.out index f72ab68a..d6373fd2 100644 --- a/1_k/2_imp/lesson_5/tests/sum.imp.out +++ b/1_k/2_imp/lesson_5/tests/sum.imp.out @@ -1,6 +1,6 @@ - . + .K n |-> 0 diff --git a/1_k/3_lambda++/lesson_1/tests/arithmetic.lambda.out b/1_k/3_lambda++/lesson_1/tests/arithmetic.lambda.out index 12360172..97f10093 100644 --- a/1_k/3_lambda++/lesson_1/tests/arithmetic.lambda.out +++ b/1_k/3_lambda++/lesson_1/tests/arithmetic.lambda.out @@ -1,3 +1,3 @@ - true ~> . + true ~> .K diff --git a/1_k/3_lambda++/lesson_1/tests/callcc-jump.lambda.out b/1_k/3_lambda++/lesson_1/tests/callcc-jump.lambda.out index eb2385c1..db4e6bd8 100644 --- a/1_k/3_lambda++/lesson_1/tests/callcc-jump.lambda.out +++ b/1_k/3_lambda++/lesson_1/tests/callcc-jump.lambda.out @@ -1,3 +1,3 @@ - 15 ~> . + 15 ~> .K diff --git a/1_k/3_lambda++/lesson_1/tests/callcc-not-jump.lambda.out b/1_k/3_lambda++/lesson_1/tests/callcc-not-jump.lambda.out index 3f513e00..c05155d6 100644 --- a/1_k/3_lambda++/lesson_1/tests/callcc-not-jump.lambda.out +++ b/1_k/3_lambda++/lesson_1/tests/callcc-not-jump.lambda.out @@ -1,3 +1,3 @@ - 17 ~> . + 17 ~> .K diff --git a/1_k/3_lambda++/lesson_1/tests/callcc-return.lambda.out b/1_k/3_lambda++/lesson_1/tests/callcc-return.lambda.out index 63d0524f..36e7b68b 100644 --- a/1_k/3_lambda++/lesson_1/tests/callcc-return.lambda.out +++ b/1_k/3_lambda++/lesson_1/tests/callcc-return.lambda.out @@ -1,3 +1,3 @@ - 1 ~> . + 1 ~> .K diff --git a/1_k/3_lambda++/lesson_1/tests/callcc-with-let.lambda.out b/1_k/3_lambda++/lesson_1/tests/callcc-with-let.lambda.out index 9051ba6f..d0e47e5d 100644 --- a/1_k/3_lambda++/lesson_1/tests/callcc-with-let.lambda.out +++ b/1_k/3_lambda++/lesson_1/tests/callcc-with-let.lambda.out @@ -1,3 +1,3 @@ - 32 ~> . + 32 ~> .K diff --git a/1_k/3_lambda++/lesson_1/tests/closed-variable-capture.lambda.out b/1_k/3_lambda++/lesson_1/tests/closed-variable-capture.lambda.out index 7cb2c2a2..b4b7c6bc 100644 --- a/1_k/3_lambda++/lesson_1/tests/closed-variable-capture.lambda.out +++ b/1_k/3_lambda++/lesson_1/tests/closed-variable-capture.lambda.out @@ -1,3 +1,3 @@ - lambda y . ( ( lambda x . lambda y0 . ( x y0 ) ) y ) ~> . + lambda y . ( ( lambda x . lambda y0 . ( x y0 ) ) y ) ~> .K diff --git a/1_k/3_lambda++/lesson_1/tests/factorial-let-fix.lambda.out b/1_k/3_lambda++/lesson_1/tests/factorial-let-fix.lambda.out index 31643d70..c36a0d86 100644 --- a/1_k/3_lambda++/lesson_1/tests/factorial-let-fix.lambda.out +++ b/1_k/3_lambda++/lesson_1/tests/factorial-let-fix.lambda.out @@ -1,3 +1,3 @@ - 3628800 ~> . + 3628800 ~> .K diff --git a/1_k/3_lambda++/lesson_1/tests/factorial-let.lambda.out b/1_k/3_lambda++/lesson_1/tests/factorial-let.lambda.out index 31643d70..c36a0d86 100644 --- a/1_k/3_lambda++/lesson_1/tests/factorial-let.lambda.out +++ b/1_k/3_lambda++/lesson_1/tests/factorial-let.lambda.out @@ -1,3 +1,3 @@ - 3628800 ~> . + 3628800 ~> .K diff --git a/1_k/3_lambda++/lesson_1/tests/factorial-letrec.lambda.out b/1_k/3_lambda++/lesson_1/tests/factorial-letrec.lambda.out index 31643d70..c36a0d86 100644 --- a/1_k/3_lambda++/lesson_1/tests/factorial-letrec.lambda.out +++ b/1_k/3_lambda++/lesson_1/tests/factorial-letrec.lambda.out @@ -1,3 +1,3 @@ - 3628800 ~> . + 3628800 ~> .K diff --git a/1_k/3_lambda++/lesson_1/tests/fibbo.lambda.out b/1_k/3_lambda++/lesson_1/tests/fibbo.lambda.out index 7b3823ba..dac83548 100644 --- a/1_k/3_lambda++/lesson_1/tests/fibbo.lambda.out +++ b/1_k/3_lambda++/lesson_1/tests/fibbo.lambda.out @@ -1,3 +1,3 @@ - 13 ~> . + 13 ~> .K diff --git a/1_k/3_lambda++/lesson_1/tests/free-variable-capture.lambda.out b/1_k/3_lambda++/lesson_1/tests/free-variable-capture.lambda.out index ea4c74bd..556ded24 100644 --- a/1_k/3_lambda++/lesson_1/tests/free-variable-capture.lambda.out +++ b/1_k/3_lambda++/lesson_1/tests/free-variable-capture.lambda.out @@ -1,3 +1,3 @@ - a y ~> . + a y ~> .K diff --git a/1_k/3_lambda++/lesson_1/tests/identity.lambda.out b/1_k/3_lambda++/lesson_1/tests/identity.lambda.out index 46c620ac..9476ee41 100644 --- a/1_k/3_lambda++/lesson_1/tests/identity.lambda.out +++ b/1_k/3_lambda++/lesson_1/tests/identity.lambda.out @@ -1,3 +1,3 @@ - lambda x . x ~> . + lambda x . x ~> .K diff --git a/1_k/3_lambda++/lesson_1/tests/if.lambda.out b/1_k/3_lambda++/lesson_1/tests/if.lambda.out index faedaaaf..1b239a34 100644 --- a/1_k/3_lambda++/lesson_1/tests/if.lambda.out +++ b/1_k/3_lambda++/lesson_1/tests/if.lambda.out @@ -1,3 +1,3 @@ - 10 ~> . + 10 ~> .K diff --git a/1_k/3_lambda++/lesson_1/tests/lets.lambda.out b/1_k/3_lambda++/lesson_1/tests/lets.lambda.out index 12360172..97f10093 100644 --- a/1_k/3_lambda++/lesson_1/tests/lets.lambda.out +++ b/1_k/3_lambda++/lesson_1/tests/lets.lambda.out @@ -1,3 +1,3 @@ - true ~> . + true ~> .K diff --git a/1_k/3_lambda++/lesson_2/tests/closed-variable-capture.lambda.out b/1_k/3_lambda++/lesson_2/tests/closed-variable-capture.lambda.out index b6bf03fa..370d2457 100644 --- a/1_k/3_lambda++/lesson_2/tests/closed-variable-capture.lambda.out +++ b/1_k/3_lambda++/lesson_2/tests/closed-variable-capture.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - closure ( x |-> 1 , y , x y ) ~> . + closure ( x |-> 1 , y , x y ) ~> .K } diff --git a/1_k/3_lambda++/lesson_2/tests/free-variable-capture.lambda.out b/1_k/3_lambda++/lesson_2/tests/free-variable-capture.lambda.out index 1611b54b..90350803 100644 --- a/1_k/3_lambda++/lesson_2/tests/free-variable-capture.lambda.out +++ b/1_k/3_lambda++/lesson_2/tests/free-variable-capture.lambda.out @@ -1,23 +1,23 @@ { V:K #Equals - a ~> #freezer___LAMBDA_Exp_Exp_Exp0_ ( ( lambda x . lambda y . x ) y z ~> . ) ~> . + a ~> #freezer___LAMBDA_Exp_Exp_Exp0_ ( ( lambda x . lambda y . x ) y z ~> .K ) ~> .K } #Or { V:K #Equals - y ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( closure ( .Map , x , lambda y . x ) ~> . ) ~> #freezer___LAMBDA_Exp_Exp_Exp0_ ( z ~> . ) ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( a ~> . ) ~> . + y ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( closure ( .Map , x , lambda y . x ) ~> .K ) ~> #freezer___LAMBDA_Exp_Exp_Exp0_ ( z ~> .K ) ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( a ~> .K ) ~> .K } #Or { V:K #Equals - y ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( lambda x . lambda y . x ~> . ) ~> #freezer___LAMBDA_Exp_Exp_Exp0_ ( z ~> . ) ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( a ~> . ) ~> . + y ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( lambda x . lambda y . x ~> .K ) ~> #freezer___LAMBDA_Exp_Exp_Exp0_ ( z ~> .K ) ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( a ~> .K ) ~> .K } #Or { V:K #Equals - z ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( ( lambda x . lambda y . x ) y ~> . ) ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( a ~> . ) ~> . + z ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( ( lambda x . lambda y . x ) y ~> .K ) ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( a ~> .K ) ~> .K } diff --git a/1_k/3_lambda++/lesson_2/tests/identity.lambda.out b/1_k/3_lambda++/lesson_2/tests/identity.lambda.out index 4d5cd5b9..216e622c 100644 --- a/1_k/3_lambda++/lesson_2/tests/identity.lambda.out +++ b/1_k/3_lambda++/lesson_2/tests/identity.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - closure ( .Map , x , x ) ~> . + closure ( .Map , x , x ) ~> .K } diff --git a/1_k/3_lambda++/lesson_3/tests/closed-variable-capture.lambda.out b/1_k/3_lambda++/lesson_3/tests/closed-variable-capture.lambda.out index b6bf03fa..370d2457 100644 --- a/1_k/3_lambda++/lesson_3/tests/closed-variable-capture.lambda.out +++ b/1_k/3_lambda++/lesson_3/tests/closed-variable-capture.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - closure ( x |-> 1 , y , x y ) ~> . + closure ( x |-> 1 , y , x y ) ~> .K } diff --git a/1_k/3_lambda++/lesson_3/tests/free-variable-capture.lambda.out b/1_k/3_lambda++/lesson_3/tests/free-variable-capture.lambda.out index 1611b54b..90350803 100644 --- a/1_k/3_lambda++/lesson_3/tests/free-variable-capture.lambda.out +++ b/1_k/3_lambda++/lesson_3/tests/free-variable-capture.lambda.out @@ -1,23 +1,23 @@ { V:K #Equals - a ~> #freezer___LAMBDA_Exp_Exp_Exp0_ ( ( lambda x . lambda y . x ) y z ~> . ) ~> . + a ~> #freezer___LAMBDA_Exp_Exp_Exp0_ ( ( lambda x . lambda y . x ) y z ~> .K ) ~> .K } #Or { V:K #Equals - y ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( closure ( .Map , x , lambda y . x ) ~> . ) ~> #freezer___LAMBDA_Exp_Exp_Exp0_ ( z ~> . ) ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( a ~> . ) ~> . + y ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( closure ( .Map , x , lambda y . x ) ~> .K ) ~> #freezer___LAMBDA_Exp_Exp_Exp0_ ( z ~> .K ) ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( a ~> .K ) ~> .K } #Or { V:K #Equals - y ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( lambda x . lambda y . x ~> . ) ~> #freezer___LAMBDA_Exp_Exp_Exp0_ ( z ~> . ) ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( a ~> . ) ~> . + y ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( lambda x . lambda y . x ~> .K ) ~> #freezer___LAMBDA_Exp_Exp_Exp0_ ( z ~> .K ) ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( a ~> .K ) ~> .K } #Or { V:K #Equals - z ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( ( lambda x . lambda y . x ) y ~> . ) ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( a ~> . ) ~> . + z ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( ( lambda x . lambda y . x ) y ~> .K ) ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( a ~> .K ) ~> .K } diff --git a/1_k/3_lambda++/lesson_3/tests/identity.lambda.out b/1_k/3_lambda++/lesson_3/tests/identity.lambda.out index 4d5cd5b9..216e622c 100644 --- a/1_k/3_lambda++/lesson_3/tests/identity.lambda.out +++ b/1_k/3_lambda++/lesson_3/tests/identity.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - closure ( .Map , x , x ) ~> . + closure ( .Map , x , x ) ~> .K } diff --git a/1_k/3_lambda++/lesson_4/tests/callcc-env1.lambda.out b/1_k/3_lambda++/lesson_4/tests/callcc-env1.lambda.out index 844768f8..4272b3ea 100644 --- a/1_k/3_lambda++/lesson_4/tests/callcc-env1.lambda.out +++ b/1_k/3_lambda++/lesson_4/tests/callcc-env1.lambda.out @@ -1,11 +1,11 @@ { V:K #Equals - 3 ~> . + 3 ~> .K } #Or { V:K #Equals - 4 ~> . + 4 ~> .K } diff --git a/1_k/3_lambda++/lesson_4/tests/callcc-env2.lambda.out b/1_k/3_lambda++/lesson_4/tests/callcc-env2.lambda.out index 844768f8..4272b3ea 100644 --- a/1_k/3_lambda++/lesson_4/tests/callcc-env2.lambda.out +++ b/1_k/3_lambda++/lesson_4/tests/callcc-env2.lambda.out @@ -1,11 +1,11 @@ { V:K #Equals - 3 ~> . + 3 ~> .K } #Or { V:K #Equals - 4 ~> . + 4 ~> .K } diff --git a/1_k/3_lambda++/lesson_4/tests/callcc-with-let.lambda.out b/1_k/3_lambda++/lesson_4/tests/callcc-with-let.lambda.out index 4a781c72..471a5c06 100644 --- a/1_k/3_lambda++/lesson_4/tests/callcc-with-let.lambda.out +++ b/1_k/3_lambda++/lesson_4/tests/callcc-with-let.lambda.out @@ -1,11 +1,11 @@ { V:K #Equals - 32 ~> . + 32 ~> .K } #Or { V:K #Equals - 33 ~> . + 33 ~> .K } diff --git a/1_k/3_lambda++/lesson_4/tests/closed-variable-capture.lambda.out b/1_k/3_lambda++/lesson_4/tests/closed-variable-capture.lambda.out index b6bf03fa..370d2457 100644 --- a/1_k/3_lambda++/lesson_4/tests/closed-variable-capture.lambda.out +++ b/1_k/3_lambda++/lesson_4/tests/closed-variable-capture.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - closure ( x |-> 1 , y , x y ) ~> . + closure ( x |-> 1 , y , x y ) ~> .K } diff --git a/1_k/3_lambda++/lesson_4/tests/free-variable-capture.lambda.out b/1_k/3_lambda++/lesson_4/tests/free-variable-capture.lambda.out index 1611b54b..90350803 100644 --- a/1_k/3_lambda++/lesson_4/tests/free-variable-capture.lambda.out +++ b/1_k/3_lambda++/lesson_4/tests/free-variable-capture.lambda.out @@ -1,23 +1,23 @@ { V:K #Equals - a ~> #freezer___LAMBDA_Exp_Exp_Exp0_ ( ( lambda x . lambda y . x ) y z ~> . ) ~> . + a ~> #freezer___LAMBDA_Exp_Exp_Exp0_ ( ( lambda x . lambda y . x ) y z ~> .K ) ~> .K } #Or { V:K #Equals - y ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( closure ( .Map , x , lambda y . x ) ~> . ) ~> #freezer___LAMBDA_Exp_Exp_Exp0_ ( z ~> . ) ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( a ~> . ) ~> . + y ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( closure ( .Map , x , lambda y . x ) ~> .K ) ~> #freezer___LAMBDA_Exp_Exp_Exp0_ ( z ~> .K ) ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( a ~> .K ) ~> .K } #Or { V:K #Equals - y ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( lambda x . lambda y . x ~> . ) ~> #freezer___LAMBDA_Exp_Exp_Exp0_ ( z ~> . ) ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( a ~> . ) ~> . + y ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( lambda x . lambda y . x ~> .K ) ~> #freezer___LAMBDA_Exp_Exp_Exp0_ ( z ~> .K ) ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( a ~> .K ) ~> .K } #Or { V:K #Equals - z ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( ( lambda x . lambda y . x ) y ~> . ) ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( a ~> . ) ~> . + z ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( ( lambda x . lambda y . x ) y ~> .K ) ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( a ~> .K ) ~> .K } diff --git a/1_k/3_lambda++/lesson_4/tests/identity.lambda.out b/1_k/3_lambda++/lesson_4/tests/identity.lambda.out index 4d5cd5b9..216e622c 100644 --- a/1_k/3_lambda++/lesson_4/tests/identity.lambda.out +++ b/1_k/3_lambda++/lesson_4/tests/identity.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - closure ( .Map , x , x ) ~> . + closure ( .Map , x , x ) ~> .K } diff --git a/1_k/3_lambda++/lesson_5/tests/deterministic/factorial-let-fix.lambda.out b/1_k/3_lambda++/lesson_5/tests/deterministic/factorial-let-fix.lambda.out index 1c843187..5522f66a 100644 --- a/1_k/3_lambda++/lesson_5/tests/deterministic/factorial-let-fix.lambda.out +++ b/1_k/3_lambda++/lesson_5/tests/deterministic/factorial-let-fix.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - 3628800 ~> . + 3628800 ~> .K } diff --git a/1_k/3_lambda++/lesson_5/tests/deterministic/factorial-let.lambda.out b/1_k/3_lambda++/lesson_5/tests/deterministic/factorial-let.lambda.out index 1c843187..5522f66a 100644 --- a/1_k/3_lambda++/lesson_5/tests/deterministic/factorial-let.lambda.out +++ b/1_k/3_lambda++/lesson_5/tests/deterministic/factorial-let.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - 3628800 ~> . + 3628800 ~> .K } diff --git a/1_k/3_lambda++/lesson_5/tests/deterministic/factorial-letrec.lambda.out b/1_k/3_lambda++/lesson_5/tests/deterministic/factorial-letrec.lambda.out index 1c843187..5522f66a 100644 --- a/1_k/3_lambda++/lesson_5/tests/deterministic/factorial-letrec.lambda.out +++ b/1_k/3_lambda++/lesson_5/tests/deterministic/factorial-letrec.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - 3628800 ~> . + 3628800 ~> .K } diff --git a/1_k/3_lambda++/lesson_5/tests/deterministic/fibbo.lambda.out b/1_k/3_lambda++/lesson_5/tests/deterministic/fibbo.lambda.out index a7028cde..e4b5bd52 100644 --- a/1_k/3_lambda++/lesson_5/tests/deterministic/fibbo.lambda.out +++ b/1_k/3_lambda++/lesson_5/tests/deterministic/fibbo.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - 13 ~> . + 13 ~> .K } diff --git a/1_k/3_lambda++/lesson_5/tests/nondeterministic/arithmetic.lambda.out b/1_k/3_lambda++/lesson_5/tests/nondeterministic/arithmetic.lambda.out index a01c03d1..cbb93410 100644 --- a/1_k/3_lambda++/lesson_5/tests/nondeterministic/arithmetic.lambda.out +++ b/1_k/3_lambda++/lesson_5/tests/nondeterministic/arithmetic.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - true ~> . + true ~> .K } diff --git a/1_k/3_lambda++/lesson_5/tests/nondeterministic/callcc-env1.lambda.out b/1_k/3_lambda++/lesson_5/tests/nondeterministic/callcc-env1.lambda.out index 0d1534ce..32ce768f 100644 --- a/1_k/3_lambda++/lesson_5/tests/nondeterministic/callcc-env1.lambda.out +++ b/1_k/3_lambda++/lesson_5/tests/nondeterministic/callcc-env1.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - 3 ~> . + 3 ~> .K } diff --git a/1_k/3_lambda++/lesson_5/tests/nondeterministic/callcc-env2.lambda.out b/1_k/3_lambda++/lesson_5/tests/nondeterministic/callcc-env2.lambda.out index 0d1534ce..32ce768f 100644 --- a/1_k/3_lambda++/lesson_5/tests/nondeterministic/callcc-env2.lambda.out +++ b/1_k/3_lambda++/lesson_5/tests/nondeterministic/callcc-env2.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - 3 ~> . + 3 ~> .K } diff --git a/1_k/3_lambda++/lesson_5/tests/nondeterministic/callcc-with-let.lambda.out b/1_k/3_lambda++/lesson_5/tests/nondeterministic/callcc-with-let.lambda.out index 579a5e29..147dbafd 100644 --- a/1_k/3_lambda++/lesson_5/tests/nondeterministic/callcc-with-let.lambda.out +++ b/1_k/3_lambda++/lesson_5/tests/nondeterministic/callcc-with-let.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - 32 ~> . + 32 ~> .K } diff --git a/1_k/3_lambda++/lesson_5/tests/nondeterministic/closed-variable-capture.lambda.out b/1_k/3_lambda++/lesson_5/tests/nondeterministic/closed-variable-capture.lambda.out index b6bf03fa..370d2457 100644 --- a/1_k/3_lambda++/lesson_5/tests/nondeterministic/closed-variable-capture.lambda.out +++ b/1_k/3_lambda++/lesson_5/tests/nondeterministic/closed-variable-capture.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - closure ( x |-> 1 , y , x y ) ~> . + closure ( x |-> 1 , y , x y ) ~> .K } diff --git a/1_k/3_lambda++/lesson_5/tests/nondeterministic/free-variable-capture.lambda.out b/1_k/3_lambda++/lesson_5/tests/nondeterministic/free-variable-capture.lambda.out index 1611b54b..90350803 100644 --- a/1_k/3_lambda++/lesson_5/tests/nondeterministic/free-variable-capture.lambda.out +++ b/1_k/3_lambda++/lesson_5/tests/nondeterministic/free-variable-capture.lambda.out @@ -1,23 +1,23 @@ { V:K #Equals - a ~> #freezer___LAMBDA_Exp_Exp_Exp0_ ( ( lambda x . lambda y . x ) y z ~> . ) ~> . + a ~> #freezer___LAMBDA_Exp_Exp_Exp0_ ( ( lambda x . lambda y . x ) y z ~> .K ) ~> .K } #Or { V:K #Equals - y ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( closure ( .Map , x , lambda y . x ) ~> . ) ~> #freezer___LAMBDA_Exp_Exp_Exp0_ ( z ~> . ) ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( a ~> . ) ~> . + y ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( closure ( .Map , x , lambda y . x ) ~> .K ) ~> #freezer___LAMBDA_Exp_Exp_Exp0_ ( z ~> .K ) ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( a ~> .K ) ~> .K } #Or { V:K #Equals - y ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( lambda x . lambda y . x ~> . ) ~> #freezer___LAMBDA_Exp_Exp_Exp0_ ( z ~> . ) ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( a ~> . ) ~> . + y ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( lambda x . lambda y . x ~> .K ) ~> #freezer___LAMBDA_Exp_Exp_Exp0_ ( z ~> .K ) ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( a ~> .K ) ~> .K } #Or { V:K #Equals - z ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( ( lambda x . lambda y . x ) y ~> . ) ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( a ~> . ) ~> . + z ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( ( lambda x . lambda y . x ) y ~> .K ) ~> #freezer___LAMBDA_Exp_Exp_Exp1_ ( a ~> .K ) ~> .K } diff --git a/1_k/3_lambda++/lesson_5/tests/nondeterministic/identity.lambda.out b/1_k/3_lambda++/lesson_5/tests/nondeterministic/identity.lambda.out index 4d5cd5b9..216e622c 100644 --- a/1_k/3_lambda++/lesson_5/tests/nondeterministic/identity.lambda.out +++ b/1_k/3_lambda++/lesson_5/tests/nondeterministic/identity.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - closure ( .Map , x , x ) ~> . + closure ( .Map , x , x ) ~> .K } diff --git a/1_k/3_lambda++/lesson_5/tests/nondeterministic/if.lambda.out b/1_k/3_lambda++/lesson_5/tests/nondeterministic/if.lambda.out index 484970b7..0c63378c 100644 --- a/1_k/3_lambda++/lesson_5/tests/nondeterministic/if.lambda.out +++ b/1_k/3_lambda++/lesson_5/tests/nondeterministic/if.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - 10 ~> . + 10 ~> .K } diff --git a/1_k/3_lambda++/lesson_5/tests/nondeterministic/lets.lambda.out b/1_k/3_lambda++/lesson_5/tests/nondeterministic/lets.lambda.out index a01c03d1..cbb93410 100644 --- a/1_k/3_lambda++/lesson_5/tests/nondeterministic/lets.lambda.out +++ b/1_k/3_lambda++/lesson_5/tests/nondeterministic/lets.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - true ~> . + true ~> .K } diff --git a/1_k/3_lambda++/lesson_6/tests/deterministic/factorial-let-fix.lambda.out b/1_k/3_lambda++/lesson_6/tests/deterministic/factorial-let-fix.lambda.out index 1c843187..5522f66a 100644 --- a/1_k/3_lambda++/lesson_6/tests/deterministic/factorial-let-fix.lambda.out +++ b/1_k/3_lambda++/lesson_6/tests/deterministic/factorial-let-fix.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - 3628800 ~> . + 3628800 ~> .K } diff --git a/1_k/3_lambda++/lesson_6/tests/deterministic/factorial-let.lambda.out b/1_k/3_lambda++/lesson_6/tests/deterministic/factorial-let.lambda.out index 1c843187..5522f66a 100644 --- a/1_k/3_lambda++/lesson_6/tests/deterministic/factorial-let.lambda.out +++ b/1_k/3_lambda++/lesson_6/tests/deterministic/factorial-let.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - 3628800 ~> . + 3628800 ~> .K } diff --git a/1_k/3_lambda++/lesson_6/tests/deterministic/factorial-letrec.lambda.out b/1_k/3_lambda++/lesson_6/tests/deterministic/factorial-letrec.lambda.out index 1c843187..5522f66a 100644 --- a/1_k/3_lambda++/lesson_6/tests/deterministic/factorial-letrec.lambda.out +++ b/1_k/3_lambda++/lesson_6/tests/deterministic/factorial-letrec.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - 3628800 ~> . + 3628800 ~> .K } diff --git a/1_k/3_lambda++/lesson_6/tests/deterministic/fibbo.lambda.out b/1_k/3_lambda++/lesson_6/tests/deterministic/fibbo.lambda.out index a7028cde..e4b5bd52 100644 --- a/1_k/3_lambda++/lesson_6/tests/deterministic/fibbo.lambda.out +++ b/1_k/3_lambda++/lesson_6/tests/deterministic/fibbo.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - 13 ~> . + 13 ~> .K } diff --git a/1_k/3_lambda++/lesson_6/tests/nondeterministic/arithmetic.lambda.out b/1_k/3_lambda++/lesson_6/tests/nondeterministic/arithmetic.lambda.out index a01c03d1..cbb93410 100644 --- a/1_k/3_lambda++/lesson_6/tests/nondeterministic/arithmetic.lambda.out +++ b/1_k/3_lambda++/lesson_6/tests/nondeterministic/arithmetic.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - true ~> . + true ~> .K } diff --git a/1_k/3_lambda++/lesson_6/tests/nondeterministic/callcc-env1.lambda.out b/1_k/3_lambda++/lesson_6/tests/nondeterministic/callcc-env1.lambda.out index 0d1534ce..32ce768f 100644 --- a/1_k/3_lambda++/lesson_6/tests/nondeterministic/callcc-env1.lambda.out +++ b/1_k/3_lambda++/lesson_6/tests/nondeterministic/callcc-env1.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - 3 ~> . + 3 ~> .K } diff --git a/1_k/3_lambda++/lesson_6/tests/nondeterministic/callcc-env2.lambda.out b/1_k/3_lambda++/lesson_6/tests/nondeterministic/callcc-env2.lambda.out index 0d1534ce..32ce768f 100644 --- a/1_k/3_lambda++/lesson_6/tests/nondeterministic/callcc-env2.lambda.out +++ b/1_k/3_lambda++/lesson_6/tests/nondeterministic/callcc-env2.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - 3 ~> . + 3 ~> .K } diff --git a/1_k/3_lambda++/lesson_6/tests/nondeterministic/callcc-with-let.lambda.out b/1_k/3_lambda++/lesson_6/tests/nondeterministic/callcc-with-let.lambda.out index 579a5e29..147dbafd 100644 --- a/1_k/3_lambda++/lesson_6/tests/nondeterministic/callcc-with-let.lambda.out +++ b/1_k/3_lambda++/lesson_6/tests/nondeterministic/callcc-with-let.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - 32 ~> . + 32 ~> .K } diff --git a/1_k/3_lambda++/lesson_6/tests/nondeterministic/closed-variable-capture.lambda.out b/1_k/3_lambda++/lesson_6/tests/nondeterministic/closed-variable-capture.lambda.out index b6bf03fa..370d2457 100644 --- a/1_k/3_lambda++/lesson_6/tests/nondeterministic/closed-variable-capture.lambda.out +++ b/1_k/3_lambda++/lesson_6/tests/nondeterministic/closed-variable-capture.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - closure ( x |-> 1 , y , x y ) ~> . + closure ( x |-> 1 , y , x y ) ~> .K } diff --git a/1_k/3_lambda++/lesson_6/tests/nondeterministic/free-variable-capture.lambda.out b/1_k/3_lambda++/lesson_6/tests/nondeterministic/free-variable-capture.lambda.out index d39db2f2..61b7b5f0 100644 --- a/1_k/3_lambda++/lesson_6/tests/nondeterministic/free-variable-capture.lambda.out +++ b/1_k/3_lambda++/lesson_6/tests/nondeterministic/free-variable-capture.lambda.out @@ -1,23 +1,23 @@ { V:K #Equals - a ~> #freezer___LAMBDA-SYNTAX_Exp_Exp_Exp0_ ( ( lambda x . lambda y . x ) y z ~> . ) ~> . + a ~> #freezer___LAMBDA-SYNTAX_Exp_Exp_Exp0_ ( ( lambda x . lambda y . x ) y z ~> .K ) ~> .K } #Or { V:K #Equals - y ~> #freezer___LAMBDA-SYNTAX_Exp_Exp_Exp1_ ( closure ( .Map , x , lambda y . x ) ~> . ) ~> #freezer___LAMBDA-SYNTAX_Exp_Exp_Exp0_ ( z ~> . ) ~> #freezer___LAMBDA-SYNTAX_Exp_Exp_Exp1_ ( a ~> . ) ~> . + y ~> #freezer___LAMBDA-SYNTAX_Exp_Exp_Exp1_ ( closure ( .Map , x , lambda y . x ) ~> .K ) ~> #freezer___LAMBDA-SYNTAX_Exp_Exp_Exp0_ ( z ~> .K ) ~> #freezer___LAMBDA-SYNTAX_Exp_Exp_Exp1_ ( a ~> .K ) ~> .K } #Or { V:K #Equals - y ~> #freezer___LAMBDA-SYNTAX_Exp_Exp_Exp1_ ( lambda x . lambda y . x ~> . ) ~> #freezer___LAMBDA-SYNTAX_Exp_Exp_Exp0_ ( z ~> . ) ~> #freezer___LAMBDA-SYNTAX_Exp_Exp_Exp1_ ( a ~> . ) ~> . + y ~> #freezer___LAMBDA-SYNTAX_Exp_Exp_Exp1_ ( lambda x . lambda y . x ~> .K ) ~> #freezer___LAMBDA-SYNTAX_Exp_Exp_Exp0_ ( z ~> .K ) ~> #freezer___LAMBDA-SYNTAX_Exp_Exp_Exp1_ ( a ~> .K ) ~> .K } #Or { V:K #Equals - z ~> #freezer___LAMBDA-SYNTAX_Exp_Exp_Exp1_ ( ( lambda x . lambda y . x ) y ~> . ) ~> #freezer___LAMBDA-SYNTAX_Exp_Exp_Exp1_ ( a ~> . ) ~> . + z ~> #freezer___LAMBDA-SYNTAX_Exp_Exp_Exp1_ ( ( lambda x . lambda y . x ) y ~> .K ) ~> #freezer___LAMBDA-SYNTAX_Exp_Exp_Exp1_ ( a ~> .K ) ~> .K } diff --git a/1_k/3_lambda++/lesson_6/tests/nondeterministic/identity.lambda.out b/1_k/3_lambda++/lesson_6/tests/nondeterministic/identity.lambda.out index 4d5cd5b9..216e622c 100644 --- a/1_k/3_lambda++/lesson_6/tests/nondeterministic/identity.lambda.out +++ b/1_k/3_lambda++/lesson_6/tests/nondeterministic/identity.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - closure ( .Map , x , x ) ~> . + closure ( .Map , x , x ) ~> .K } diff --git a/1_k/3_lambda++/lesson_6/tests/nondeterministic/if.lambda.out b/1_k/3_lambda++/lesson_6/tests/nondeterministic/if.lambda.out index 484970b7..0c63378c 100644 --- a/1_k/3_lambda++/lesson_6/tests/nondeterministic/if.lambda.out +++ b/1_k/3_lambda++/lesson_6/tests/nondeterministic/if.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - 10 ~> . + 10 ~> .K } diff --git a/1_k/3_lambda++/lesson_6/tests/nondeterministic/lets.lambda.out b/1_k/3_lambda++/lesson_6/tests/nondeterministic/lets.lambda.out index a01c03d1..cbb93410 100644 --- a/1_k/3_lambda++/lesson_6/tests/nondeterministic/lets.lambda.out +++ b/1_k/3_lambda++/lesson_6/tests/nondeterministic/lets.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - true ~> . + true ~> .K } diff --git a/1_k/4_imp++/lesson_1/imp.k b/1_k/4_imp++/lesson_1/imp.k index 4125b96f..fe043d01 100644 --- a/1_k/4_imp++/lesson_1/imp.k +++ b/1_k/4_imp++/lesson_1/imp.k @@ -28,8 +28,8 @@ module IMP-SYNTAX > "spawn" Stmt > Stmt Stmt [left] - syntax Ids ::= List{Id,","} [klabel(exps)] - syntax AExps ::= List{AExp,","} [klabel(exps)] + syntax Ids ::= List{Id,","} [overload(exps)] + syntax AExps ::= List{AExp,","} [overload(exps)] syntax AExps ::= Ids endmodule diff --git a/1_k/4_imp++/lesson_1/tests/collatz.imp.out b/1_k/4_imp++/lesson_1/tests/collatz.imp.out index 4e77a353..746da717 100644 --- a/1_k/4_imp++/lesson_1/tests/collatz.imp.out +++ b/1_k/4_imp++/lesson_1/tests/collatz.imp.out @@ -1,6 +1,6 @@ - . + .K m |-> 2 diff --git a/1_k/4_imp++/lesson_1/tests/div.imp.out b/1_k/4_imp++/lesson_1/tests/div.imp.out index b92be8cc..3bc9bde4 100644 --- a/1_k/4_imp++/lesson_1/tests/div.imp.out +++ b/1_k/4_imp++/lesson_1/tests/div.imp.out @@ -3,7 +3,7 @@ #Equals - ++ x ~> #freezer_/__IMP-SYNTAX_AExp_AExp_AExp0_ ( 1 ~> . ) ~> #freezer_/__IMP-SYNTAX_AExp_AExp_AExp1_ ( ++ x ~> . ) ~> #freezer_=_;_IMP-SYNTAX_Stmt_Id_AExp1_ ( y ~> . ) ~> . + ++ x ~> #freezer_/__IMP-SYNTAX_AExp_AExp_AExp0_ ( 1 ~> .K ) ~> #freezer_/__IMP-SYNTAX_AExp_AExp_AExp1_ ( ++ x ~> .K ) ~> #freezer_=_;_IMP-SYNTAX_Stmt_Id_AExp1_ ( y ~> .K ) ~> .K x |-> 1 @@ -17,7 +17,7 @@ #Equals - ++ x ~> #freezer_/__IMP-SYNTAX_AExp_AExp_AExp0_ ( ++ x / x ~> . ) ~> #freezer_=_;_IMP-SYNTAX_Stmt_Id_AExp1_ ( y ~> . ) ~> . + ++ x ~> #freezer_/__IMP-SYNTAX_AExp_AExp_AExp0_ ( ++ x / x ~> .K ) ~> #freezer_=_;_IMP-SYNTAX_Stmt_Id_AExp1_ ( y ~> .K ) ~> .K x |-> 1 @@ -31,7 +31,7 @@ #Equals - ++ x ~> #freezer_/__IMP-SYNTAX_AExp_AExp_AExp0_ ( x ~> . ) ~> #freezer_/__IMP-SYNTAX_AExp_AExp_AExp1_ ( ++ x ~> . ) ~> #freezer_=_;_IMP-SYNTAX_Stmt_Id_AExp1_ ( y ~> . ) ~> . + ++ x ~> #freezer_/__IMP-SYNTAX_AExp_AExp_AExp0_ ( x ~> .K ) ~> #freezer_/__IMP-SYNTAX_AExp_AExp_AExp1_ ( ++ x ~> .K ) ~> #freezer_=_;_IMP-SYNTAX_Stmt_Id_AExp1_ ( y ~> .K ) ~> .K x |-> 1 diff --git a/1_k/4_imp++/lesson_1/tests/io.imp.out b/1_k/4_imp++/lesson_1/tests/io.imp.out index dadd9f37..94a8d17c 100644 --- a/1_k/4_imp++/lesson_1/tests/io.imp.out +++ b/1_k/4_imp++/lesson_1/tests/io.imp.out @@ -1,6 +1,6 @@ - print ( "Input two numbers: " , .Ids ) ; ~> int x , y , .Ids ; ~> x = read ( ) ; ~> y = read ( ) ; ~> print ( "Their sum is: " , x + y , "\n" , .Ids ) ; ~> . + print ( "Input two numbers: " , .Ids ) ; ~> int x , y , .Ids ; ~> x = read ( ) ; ~> y = read ( ) ; ~> print ( "Their sum is: " , x + y , "\n" , .Ids ) ; ~> .K .Map diff --git a/1_k/4_imp++/lesson_1/tests/locals.imp.out b/1_k/4_imp++/lesson_1/tests/locals.imp.out index 50c43888..d7a84eee 100644 --- a/1_k/4_imp++/lesson_1/tests/locals.imp.out +++ b/1_k/4_imp++/lesson_1/tests/locals.imp.out @@ -1,6 +1,6 @@ - print ( "Line 3: x = " , x , "\n" , .Ids ) ; ~> { int x , .Ids ; x = 2 ; print ( "Line 7: x = " , x , "\n" , .Ids ) ; { int x , .Ids ; x = 3 ; print ( "Line 11: x = " , x , "\n" , .Ids ) ; } print ( "Line 13: x = " , x , "\n" , .Ids ) ; } ~> print ( "Line 15: x = " , x , "\n" , .Ids ) ; ~> . + print ( "Line 3: x = " , x , "\n" , .Ids ) ; ~> { int x , .Ids ; x = 2 ; print ( "Line 7: x = " , x , "\n" , .Ids ) ; { int x , .Ids ; x = 3 ; print ( "Line 11: x = " , x , "\n" , .Ids ) ; } print ( "Line 13: x = " , x , "\n" , .Ids ) ; } ~> print ( "Line 15: x = " , x , "\n" , .Ids ) ; ~> .K x |-> 1 diff --git a/1_k/4_imp++/lesson_1/tests/primes.imp.out b/1_k/4_imp++/lesson_1/tests/primes.imp.out index dc1326e5..702afd61 100644 --- a/1_k/4_imp++/lesson_1/tests/primes.imp.out +++ b/1_k/4_imp++/lesson_1/tests/primes.imp.out @@ -1,6 +1,6 @@ - . + .K i |-> 2 diff --git a/1_k/4_imp++/lesson_1/tests/spawn.imp.out b/1_k/4_imp++/lesson_1/tests/spawn.imp.out index 3ad77330..b6aa55f8 100644 --- a/1_k/4_imp++/lesson_1/tests/spawn.imp.out +++ b/1_k/4_imp++/lesson_1/tests/spawn.imp.out @@ -1,6 +1,6 @@ - print ( "x = " , .Ids ) ; ~> x = read ( ) ; ~> spawn x = x / 2 ; ~> spawn x = x + 10 ; ~> print ( x , "\n" , .Ids ) ; ~> . + print ( "x = " , .Ids ) ; ~> x = read ( ) ; ~> spawn x = x / 2 ; ~> spawn x = x + 10 ; ~> print ( x , "\n" , .Ids ) ; ~> .K x |-> 0 diff --git a/1_k/4_imp++/lesson_1/tests/sum-io.imp.out b/1_k/4_imp++/lesson_1/tests/sum-io.imp.out index 6cda5667..754f0c38 100644 --- a/1_k/4_imp++/lesson_1/tests/sum-io.imp.out +++ b/1_k/4_imp++/lesson_1/tests/sum-io.imp.out @@ -1,6 +1,6 @@ - print ( "Add numbers up to (<= 0 to quit)? " , .Ids ) ; ~> n = read ( ) ; ~> if ( n <= 0 ) { halt ; } else { s = 0 ; while ( ! n <= 0 ) { s = s + n ; n = n + - 1 ; } print ( "Sum = " , s , "\n" , .Ids ) ; } ~> while ( true ) { print ( "Add numbers up to (<= 0 to quit)? " , .Ids ) ; n = read ( ) ; if ( n <= 0 ) { halt ; } else { s = 0 ; while ( ! n <= 0 ) { s = s + n ; n = n + - 1 ; } print ( "Sum = " , s , "\n" , .Ids ) ; } } ~> . + print ( "Add numbers up to (<= 0 to quit)? " , .Ids ) ; ~> n = read ( ) ; ~> if ( n <= 0 ) { halt ; } else { s = 0 ; while ( ! n <= 0 ) { s = s + n ; n = n + - 1 ; } print ( "Sum = " , s , "\n" , .Ids ) ; } ~> while ( true ) { print ( "Add numbers up to (<= 0 to quit)? " , .Ids ) ; n = read ( ) ; if ( n <= 0 ) { halt ; } else { s = 0 ; while ( ! n <= 0 ) { s = s + n ; n = n + - 1 ; } print ( "Sum = " , s , "\n" , .Ids ) ; } } ~> .K n |-> 0 diff --git a/1_k/4_imp++/lesson_1/tests/sum.imp.out b/1_k/4_imp++/lesson_1/tests/sum.imp.out index f72ab68a..d6373fd2 100644 --- a/1_k/4_imp++/lesson_1/tests/sum.imp.out +++ b/1_k/4_imp++/lesson_1/tests/sum.imp.out @@ -1,6 +1,6 @@ - . + .K n |-> 0 diff --git a/1_k/4_imp++/lesson_2/imp.k b/1_k/4_imp++/lesson_2/imp.k index 2872acd7..13bc68b5 100644 --- a/1_k/4_imp++/lesson_2/imp.k +++ b/1_k/4_imp++/lesson_2/imp.k @@ -27,8 +27,8 @@ module IMP-SYNTAX > "spawn" Stmt > Stmt Stmt [left] - syntax Ids ::= List{Id,","} [klabel(exps)] - syntax AExps ::= List{AExp,","} [klabel(exps)] + syntax Ids ::= List{Id,","} [overload(exps)] + syntax AExps ::= List{AExp,","} [overload(exps)] syntax AExps ::= Ids endmodule diff --git a/1_k/4_imp++/lesson_2/tests/collatz.imp.out b/1_k/4_imp++/lesson_2/tests/collatz.imp.out index 25e89858..db47869c 100644 --- a/1_k/4_imp++/lesson_2/tests/collatz.imp.out +++ b/1_k/4_imp++/lesson_2/tests/collatz.imp.out @@ -1,6 +1,6 @@ - . + .K m |-> 0 diff --git a/1_k/4_imp++/lesson_2/tests/div.imp.out b/1_k/4_imp++/lesson_2/tests/div.imp.out index 197e36c6..c6d00046 100644 --- a/1_k/4_imp++/lesson_2/tests/div.imp.out +++ b/1_k/4_imp++/lesson_2/tests/div.imp.out @@ -3,7 +3,7 @@ #Equals - ++ x ~> #freezer_/__IMP-SYNTAX_AExp_AExp_AExp0_ ( 1 ~> . ) ~> #freezer_/__IMP-SYNTAX_AExp_AExp_AExp1_ ( ++ x ~> . ) ~> #freezer_=_;_IMP-SYNTAX_Stmt_Id_AExp1_ ( y ~> . ) ~> . + ++ x ~> #freezer_/__IMP-SYNTAX_AExp_AExp_AExp0_ ( 1 ~> .K ) ~> #freezer_/__IMP-SYNTAX_AExp_AExp_AExp1_ ( ++ x ~> .K ) ~> #freezer_=_;_IMP-SYNTAX_Stmt_Id_AExp1_ ( y ~> .K ) ~> .K x |-> 0 @@ -21,7 +21,7 @@ #Equals - ++ x ~> #freezer_/__IMP-SYNTAX_AExp_AExp_AExp0_ ( ++ x / x ~> . ) ~> #freezer_=_;_IMP-SYNTAX_Stmt_Id_AExp1_ ( y ~> . ) ~> . + ++ x ~> #freezer_/__IMP-SYNTAX_AExp_AExp_AExp0_ ( ++ x / x ~> .K ) ~> #freezer_=_;_IMP-SYNTAX_Stmt_Id_AExp1_ ( y ~> .K ) ~> .K x |-> 0 @@ -39,7 +39,7 @@ #Equals - ++ x ~> #freezer_/__IMP-SYNTAX_AExp_AExp_AExp0_ ( x ~> . ) ~> #freezer_/__IMP-SYNTAX_AExp_AExp_AExp1_ ( ++ x ~> . ) ~> #freezer_=_;_IMP-SYNTAX_Stmt_Id_AExp1_ ( y ~> . ) ~> . + ++ x ~> #freezer_/__IMP-SYNTAX_AExp_AExp_AExp0_ ( x ~> .K ) ~> #freezer_/__IMP-SYNTAX_AExp_AExp_AExp1_ ( ++ x ~> .K ) ~> #freezer_=_;_IMP-SYNTAX_Stmt_Id_AExp1_ ( y ~> .K ) ~> .K x |-> 0 diff --git a/1_k/4_imp++/lesson_2/tests/io.imp.out b/1_k/4_imp++/lesson_2/tests/io.imp.out index 0abd9904..cd32a9a2 100644 --- a/1_k/4_imp++/lesson_2/tests/io.imp.out +++ b/1_k/4_imp++/lesson_2/tests/io.imp.out @@ -1,6 +1,6 @@ - print ( "Input two numbers: " , .Ids ) ; ~> int x , y , .Ids ; ~> x = read ( ) ; ~> y = read ( ) ; ~> print ( "Their sum is: " , x + y , "\n" , .Ids ) ; ~> . + print ( "Input two numbers: " , .Ids ) ; ~> int x , y , .Ids ; ~> x = read ( ) ; ~> y = read ( ) ; ~> print ( "Their sum is: " , x + y , "\n" , .Ids ) ; ~> .K .Map diff --git a/1_k/4_imp++/lesson_2/tests/locals.imp.out b/1_k/4_imp++/lesson_2/tests/locals.imp.out index e6e28e2b..ed5b13ee 100644 --- a/1_k/4_imp++/lesson_2/tests/locals.imp.out +++ b/1_k/4_imp++/lesson_2/tests/locals.imp.out @@ -1,6 +1,6 @@ - print ( "Line 3: x = " , x , "\n" , .Ids ) ; ~> { int x , .Ids ; x = 2 ; print ( "Line 7: x = " , x , "\n" , .Ids ) ; { int x , .Ids ; x = 3 ; print ( "Line 11: x = " , x , "\n" , .Ids ) ; } print ( "Line 13: x = " , x , "\n" , .Ids ) ; } ~> print ( "Line 15: x = " , x , "\n" , .Ids ) ; ~> . + print ( "Line 3: x = " , x , "\n" , .Ids ) ; ~> { int x , .Ids ; x = 2 ; print ( "Line 7: x = " , x , "\n" , .Ids ) ; { int x , .Ids ; x = 3 ; print ( "Line 11: x = " , x , "\n" , .Ids ) ; } print ( "Line 13: x = " , x , "\n" , .Ids ) ; } ~> print ( "Line 15: x = " , x , "\n" , .Ids ) ; ~> .K x |-> 0 diff --git a/1_k/4_imp++/lesson_2/tests/primes.imp.out b/1_k/4_imp++/lesson_2/tests/primes.imp.out index 9434601e..8935603c 100644 --- a/1_k/4_imp++/lesson_2/tests/primes.imp.out +++ b/1_k/4_imp++/lesson_2/tests/primes.imp.out @@ -1,6 +1,6 @@ - . + .K i |-> 0 diff --git a/1_k/4_imp++/lesson_2/tests/spawn.imp.out b/1_k/4_imp++/lesson_2/tests/spawn.imp.out index c2be178b..9efe6bdc 100644 --- a/1_k/4_imp++/lesson_2/tests/spawn.imp.out +++ b/1_k/4_imp++/lesson_2/tests/spawn.imp.out @@ -1,6 +1,6 @@ - print ( "x = " , .Ids ) ; ~> x = read ( ) ; ~> spawn x = x / 2 ; ~> spawn x = x + 10 ; ~> print ( x , "\n" , .Ids ) ; ~> . + print ( "x = " , .Ids ) ; ~> x = read ( ) ; ~> spawn x = x / 2 ; ~> spawn x = x + 10 ; ~> print ( x , "\n" , .Ids ) ; ~> .K x |-> 0 diff --git a/1_k/4_imp++/lesson_2/tests/sum-io.imp.out b/1_k/4_imp++/lesson_2/tests/sum-io.imp.out index e93a02ef..cef7ade6 100644 --- a/1_k/4_imp++/lesson_2/tests/sum-io.imp.out +++ b/1_k/4_imp++/lesson_2/tests/sum-io.imp.out @@ -1,6 +1,6 @@ - print ( "Add numbers up to (<= 0 to quit)? " , .Ids ) ; ~> n = read ( ) ; ~> if ( n <= 0 ) { halt ; } else { s = 0 ; while ( ! n <= 0 ) { s = s + n ; n = n + - 1 ; } print ( "Sum = " , s , "\n" , .Ids ) ; } ~> while ( true ) { print ( "Add numbers up to (<= 0 to quit)? " , .Ids ) ; n = read ( ) ; if ( n <= 0 ) { halt ; } else { s = 0 ; while ( ! n <= 0 ) { s = s + n ; n = n + - 1 ; } print ( "Sum = " , s , "\n" , .Ids ) ; } } ~> . + print ( "Add numbers up to (<= 0 to quit)? " , .Ids ) ; ~> n = read ( ) ; ~> if ( n <= 0 ) { halt ; } else { s = 0 ; while ( ! n <= 0 ) { s = s + n ; n = n + - 1 ; } print ( "Sum = " , s , "\n" , .Ids ) ; } ~> while ( true ) { print ( "Add numbers up to (<= 0 to quit)? " , .Ids ) ; n = read ( ) ; if ( n <= 0 ) { halt ; } else { s = 0 ; while ( ! n <= 0 ) { s = s + n ; n = n + - 1 ; } print ( "Sum = " , s , "\n" , .Ids ) ; } } ~> .K n |-> 0 diff --git a/1_k/4_imp++/lesson_2/tests/sum.imp.out b/1_k/4_imp++/lesson_2/tests/sum.imp.out index afc535a8..8c6229f8 100644 --- a/1_k/4_imp++/lesson_2/tests/sum.imp.out +++ b/1_k/4_imp++/lesson_2/tests/sum.imp.out @@ -1,6 +1,6 @@ - . + .K n |-> 0 diff --git a/1_k/4_imp++/lesson_3/imp.k b/1_k/4_imp++/lesson_3/imp.k index fa7db5c8..b62b77dd 100644 --- a/1_k/4_imp++/lesson_3/imp.k +++ b/1_k/4_imp++/lesson_3/imp.k @@ -27,8 +27,8 @@ module IMP-SYNTAX > "spawn" Stmt > Stmt Stmt [left] - syntax Ids ::= List{Id,","} [klabel(exps)] - syntax AExps ::= List{AExp,","} [klabel(exps)] + syntax Ids ::= List{Id,","} [overload(exps)] + syntax AExps ::= List{AExp,","} [overload(exps)] syntax AExps ::= Ids endmodule diff --git a/1_k/4_imp++/lesson_3/tests/collatz.imp.out b/1_k/4_imp++/lesson_3/tests/collatz.imp.out index 25e89858..db47869c 100644 --- a/1_k/4_imp++/lesson_3/tests/collatz.imp.out +++ b/1_k/4_imp++/lesson_3/tests/collatz.imp.out @@ -1,6 +1,6 @@ - . + .K m |-> 0 diff --git a/1_k/4_imp++/lesson_3/tests/div.imp.out b/1_k/4_imp++/lesson_3/tests/div.imp.out index 6ba728d1..3af7a35d 100644 --- a/1_k/4_imp++/lesson_3/tests/div.imp.out +++ b/1_k/4_imp++/lesson_3/tests/div.imp.out @@ -3,7 +3,7 @@ #Equals - . + .K x |-> 0 @@ -21,7 +21,7 @@ #Equals - . + .K x |-> 0 @@ -39,7 +39,7 @@ #Equals - . + .K x |-> 0 diff --git a/1_k/4_imp++/lesson_3/tests/io.imp.out b/1_k/4_imp++/lesson_3/tests/io.imp.out index 0abd9904..cd32a9a2 100644 --- a/1_k/4_imp++/lesson_3/tests/io.imp.out +++ b/1_k/4_imp++/lesson_3/tests/io.imp.out @@ -1,6 +1,6 @@ - print ( "Input two numbers: " , .Ids ) ; ~> int x , y , .Ids ; ~> x = read ( ) ; ~> y = read ( ) ; ~> print ( "Their sum is: " , x + y , "\n" , .Ids ) ; ~> . + print ( "Input two numbers: " , .Ids ) ; ~> int x , y , .Ids ; ~> x = read ( ) ; ~> y = read ( ) ; ~> print ( "Their sum is: " , x + y , "\n" , .Ids ) ; ~> .K .Map diff --git a/1_k/4_imp++/lesson_3/tests/locals.imp.out b/1_k/4_imp++/lesson_3/tests/locals.imp.out index e6e28e2b..ed5b13ee 100644 --- a/1_k/4_imp++/lesson_3/tests/locals.imp.out +++ b/1_k/4_imp++/lesson_3/tests/locals.imp.out @@ -1,6 +1,6 @@ - print ( "Line 3: x = " , x , "\n" , .Ids ) ; ~> { int x , .Ids ; x = 2 ; print ( "Line 7: x = " , x , "\n" , .Ids ) ; { int x , .Ids ; x = 3 ; print ( "Line 11: x = " , x , "\n" , .Ids ) ; } print ( "Line 13: x = " , x , "\n" , .Ids ) ; } ~> print ( "Line 15: x = " , x , "\n" , .Ids ) ; ~> . + print ( "Line 3: x = " , x , "\n" , .Ids ) ; ~> { int x , .Ids ; x = 2 ; print ( "Line 7: x = " , x , "\n" , .Ids ) ; { int x , .Ids ; x = 3 ; print ( "Line 11: x = " , x , "\n" , .Ids ) ; } print ( "Line 13: x = " , x , "\n" , .Ids ) ; } ~> print ( "Line 15: x = " , x , "\n" , .Ids ) ; ~> .K x |-> 0 diff --git a/1_k/4_imp++/lesson_3/tests/primes.imp.out b/1_k/4_imp++/lesson_3/tests/primes.imp.out index 9434601e..8935603c 100644 --- a/1_k/4_imp++/lesson_3/tests/primes.imp.out +++ b/1_k/4_imp++/lesson_3/tests/primes.imp.out @@ -1,6 +1,6 @@ - . + .K i |-> 0 diff --git a/1_k/4_imp++/lesson_3/tests/spawn.imp.out b/1_k/4_imp++/lesson_3/tests/spawn.imp.out index c2be178b..9efe6bdc 100644 --- a/1_k/4_imp++/lesson_3/tests/spawn.imp.out +++ b/1_k/4_imp++/lesson_3/tests/spawn.imp.out @@ -1,6 +1,6 @@ - print ( "x = " , .Ids ) ; ~> x = read ( ) ; ~> spawn x = x / 2 ; ~> spawn x = x + 10 ; ~> print ( x , "\n" , .Ids ) ; ~> . + print ( "x = " , .Ids ) ; ~> x = read ( ) ; ~> spawn x = x / 2 ; ~> spawn x = x + 10 ; ~> print ( x , "\n" , .Ids ) ; ~> .K x |-> 0 diff --git a/1_k/4_imp++/lesson_3/tests/sum-io.imp.out b/1_k/4_imp++/lesson_3/tests/sum-io.imp.out index e93a02ef..cef7ade6 100644 --- a/1_k/4_imp++/lesson_3/tests/sum-io.imp.out +++ b/1_k/4_imp++/lesson_3/tests/sum-io.imp.out @@ -1,6 +1,6 @@ - print ( "Add numbers up to (<= 0 to quit)? " , .Ids ) ; ~> n = read ( ) ; ~> if ( n <= 0 ) { halt ; } else { s = 0 ; while ( ! n <= 0 ) { s = s + n ; n = n + - 1 ; } print ( "Sum = " , s , "\n" , .Ids ) ; } ~> while ( true ) { print ( "Add numbers up to (<= 0 to quit)? " , .Ids ) ; n = read ( ) ; if ( n <= 0 ) { halt ; } else { s = 0 ; while ( ! n <= 0 ) { s = s + n ; n = n + - 1 ; } print ( "Sum = " , s , "\n" , .Ids ) ; } } ~> . + print ( "Add numbers up to (<= 0 to quit)? " , .Ids ) ; ~> n = read ( ) ; ~> if ( n <= 0 ) { halt ; } else { s = 0 ; while ( ! n <= 0 ) { s = s + n ; n = n + - 1 ; } print ( "Sum = " , s , "\n" , .Ids ) ; } ~> while ( true ) { print ( "Add numbers up to (<= 0 to quit)? " , .Ids ) ; n = read ( ) ; if ( n <= 0 ) { halt ; } else { s = 0 ; while ( ! n <= 0 ) { s = s + n ; n = n + - 1 ; } print ( "Sum = " , s , "\n" , .Ids ) ; } } ~> .K n |-> 0 diff --git a/1_k/4_imp++/lesson_3/tests/sum.imp.out b/1_k/4_imp++/lesson_3/tests/sum.imp.out index afc535a8..8c6229f8 100644 --- a/1_k/4_imp++/lesson_3/tests/sum.imp.out +++ b/1_k/4_imp++/lesson_3/tests/sum.imp.out @@ -1,6 +1,6 @@ - . + .K n |-> 0 diff --git a/1_k/4_imp++/lesson_4/imp.k b/1_k/4_imp++/lesson_4/imp.k index 71ae12f0..2229bde8 100644 --- a/1_k/4_imp++/lesson_4/imp.k +++ b/1_k/4_imp++/lesson_4/imp.k @@ -27,8 +27,8 @@ module IMP-SYNTAX > "spawn" Stmt > Stmt Stmt [left] - syntax Ids ::= List{Id,","} [klabel(exps)] - syntax AExps ::= List{AExp,","} [klabel(exps)] + syntax Ids ::= List{Id,","} [overload(exps)] + syntax AExps ::= List{AExp,","} [overload(exps)] syntax AExps ::= Ids endmodule diff --git a/1_k/4_imp++/lesson_4/tests/div.imp.out b/1_k/4_imp++/lesson_4/tests/div.imp.out index dc290d68..9e950333 100644 --- a/1_k/4_imp++/lesson_4/tests/div.imp.out +++ b/1_k/4_imp++/lesson_4/tests/div.imp.out @@ -3,7 +3,7 @@ #Equals - . + .K x |-> 0 @@ -14,14 +14,14 @@ 1 |-> 1 - ListItem ( #buffer ( "\n" ~> . ) ) + ListItem ( #buffer ( "\n" ~> .K ) ) ListItem ( "off" ) ListItem ( #istream ( 0 ) ) ListItem ( #ostream ( 1 ) ) ListItem ( "off" ) - ListItem ( #buffer ( "" ~> . ) ) + ListItem ( #buffer ( "" ~> .K ) ) } @@ -31,7 +31,7 @@ #Equals - . + .K x |-> 0 @@ -42,14 +42,14 @@ 1 |-> 2 - ListItem ( #buffer ( "\n" ~> . ) ) + ListItem ( #buffer ( "\n" ~> .K ) ) ListItem ( "off" ) ListItem ( #istream ( 0 ) ) ListItem ( #ostream ( 1 ) ) ListItem ( "off" ) - ListItem ( #buffer ( "" ~> . ) ) + ListItem ( #buffer ( "" ~> .K ) ) } @@ -59,7 +59,7 @@ #Equals - . + .K x |-> 0 @@ -70,14 +70,14 @@ 1 |-> 3 - ListItem ( #buffer ( "\n" ~> . ) ) + ListItem ( #buffer ( "\n" ~> .K ) ) ListItem ( "off" ) ListItem ( #istream ( 0 ) ) ListItem ( #ostream ( 1 ) ) ListItem ( "off" ) - ListItem ( #buffer ( "" ~> . ) ) + ListItem ( #buffer ( "" ~> .K ) ) } diff --git a/1_k/4_imp++/lesson_5/imp.k b/1_k/4_imp++/lesson_5/imp.k index f8215325..be51e7eb 100644 --- a/1_k/4_imp++/lesson_5/imp.k +++ b/1_k/4_imp++/lesson_5/imp.k @@ -26,8 +26,8 @@ module IMP-SYNTAX > "spawn" Stmt > Stmt Stmt [left] - syntax Ids ::= List{Id,","} [klabel(exps)] - syntax AExps ::= List{AExp,","} [klabel(exps)] + syntax Ids ::= List{Id,","} [overload(exps)] + syntax AExps ::= List{AExp,","} [overload(exps)] syntax AExps ::= Ids endmodule diff --git a/1_k/4_imp++/lesson_5/tests/div.imp.out b/1_k/4_imp++/lesson_5/tests/div.imp.out index dc290d68..9e950333 100644 --- a/1_k/4_imp++/lesson_5/tests/div.imp.out +++ b/1_k/4_imp++/lesson_5/tests/div.imp.out @@ -3,7 +3,7 @@ #Equals - . + .K x |-> 0 @@ -14,14 +14,14 @@ 1 |-> 1 - ListItem ( #buffer ( "\n" ~> . ) ) + ListItem ( #buffer ( "\n" ~> .K ) ) ListItem ( "off" ) ListItem ( #istream ( 0 ) ) ListItem ( #ostream ( 1 ) ) ListItem ( "off" ) - ListItem ( #buffer ( "" ~> . ) ) + ListItem ( #buffer ( "" ~> .K ) ) } @@ -31,7 +31,7 @@ #Equals - . + .K x |-> 0 @@ -42,14 +42,14 @@ 1 |-> 2 - ListItem ( #buffer ( "\n" ~> . ) ) + ListItem ( #buffer ( "\n" ~> .K ) ) ListItem ( "off" ) ListItem ( #istream ( 0 ) ) ListItem ( #ostream ( 1 ) ) ListItem ( "off" ) - ListItem ( #buffer ( "" ~> . ) ) + ListItem ( #buffer ( "" ~> .K ) ) } @@ -59,7 +59,7 @@ #Equals - . + .K x |-> 0 @@ -70,14 +70,14 @@ 1 |-> 3 - ListItem ( #buffer ( "\n" ~> . ) ) + ListItem ( #buffer ( "\n" ~> .K ) ) ListItem ( "off" ) ListItem ( #istream ( 0 ) ) ListItem ( #ostream ( 1 ) ) ListItem ( "off" ) - ListItem ( #buffer ( "" ~> . ) ) + ListItem ( #buffer ( "" ~> .K ) ) } diff --git a/1_k/4_imp++/lesson_6/imp.k b/1_k/4_imp++/lesson_6/imp.k index 8e382390..984ee014 100644 --- a/1_k/4_imp++/lesson_6/imp.k +++ b/1_k/4_imp++/lesson_6/imp.k @@ -27,8 +27,8 @@ module IMP-SYNTAX > "spawn" Stmt > Stmt Stmt [left] - syntax Ids ::= List{Id,","} [klabel(exps)] - syntax AExps ::= List{AExp,","} [klabel(exps)] + syntax Ids ::= List{Id,","} [overload(exps)] + syntax AExps ::= List{AExp,","} [overload(exps)] syntax AExps ::= Ids endmodule diff --git a/1_k/4_imp++/lesson_6/tests/div.imp.out b/1_k/4_imp++/lesson_6/tests/div.imp.out index 82e0047f..22e5fef4 100644 --- a/1_k/4_imp++/lesson_6/tests/div.imp.out +++ b/1_k/4_imp++/lesson_6/tests/div.imp.out @@ -10,14 +10,14 @@ 1 |-> 1 - ListItem ( #buffer ( "\n" ~> . ) ) + ListItem ( #buffer ( "\n" ~> .K ) ) ListItem ( "off" ) ListItem ( #istream ( 0 ) ) ListItem ( #ostream ( 1 ) ) ListItem ( "off" ) - ListItem ( #buffer ( "" ~> . ) ) + ListItem ( #buffer ( "" ~> .K ) ) } @@ -34,14 +34,14 @@ 1 |-> 2 - ListItem ( #buffer ( "\n" ~> . ) ) + ListItem ( #buffer ( "\n" ~> .K ) ) ListItem ( "off" ) ListItem ( #istream ( 0 ) ) ListItem ( #ostream ( 1 ) ) ListItem ( "off" ) - ListItem ( #buffer ( "" ~> . ) ) + ListItem ( #buffer ( "" ~> .K ) ) } @@ -58,14 +58,14 @@ 1 |-> 3 - ListItem ( #buffer ( "\n" ~> . ) ) + ListItem ( #buffer ( "\n" ~> .K ) ) ListItem ( "off" ) ListItem ( #istream ( 0 ) ) ListItem ( #ostream ( 1 ) ) ListItem ( "off" ) - ListItem ( #buffer ( "" ~> . ) ) + ListItem ( #buffer ( "" ~> .K ) ) } diff --git a/1_k/4_imp++/lesson_7/imp.k b/1_k/4_imp++/lesson_7/imp.k index 56967795..23a9fd8e 100644 --- a/1_k/4_imp++/lesson_7/imp.k +++ b/1_k/4_imp++/lesson_7/imp.k @@ -27,8 +27,8 @@ module IMP-SYNTAX | "halt" ";" > "join" AExp ";" [strict] - syntax Ids ::= List{Id,","} [klabel(exps)] - syntax AExps ::= List{AExp,","} [klabel(exps)] + syntax Ids ::= List{Id,","} [overload(exps)] + syntax AExps ::= List{AExp,","} [overload(exps)] syntax Stmts ::= List{Stmt,""} syntax AExps ::= Ids endmodule diff --git a/1_k/4_imp++/lesson_7/tests/div.imp.out b/1_k/4_imp++/lesson_7/tests/div.imp.out index 7374ffea..33c4a2e7 100644 --- a/1_k/4_imp++/lesson_7/tests/div.imp.out +++ b/1_k/4_imp++/lesson_7/tests/div.imp.out @@ -8,7 +8,7 @@ 0 - . + .K x |-> 0 @@ -21,14 +21,14 @@ 1 |-> 1 - ListItem ( #buffer ( "\n" ~> . ) ) + ListItem ( #buffer ( "\n" ~> .K ) ) ListItem ( "off" ) ListItem ( #istream ( 0 ) ) ListItem ( #ostream ( 1 ) ) ListItem ( "off" ) - ListItem ( #buffer ( "" ~> . ) ) + ListItem ( #buffer ( "" ~> .K ) ) } @@ -43,7 +43,7 @@ 0 - . + .K x |-> 0 @@ -56,14 +56,14 @@ 1 |-> 2 - ListItem ( #buffer ( "\n" ~> . ) ) + ListItem ( #buffer ( "\n" ~> .K ) ) ListItem ( "off" ) ListItem ( #istream ( 0 ) ) ListItem ( #ostream ( 1 ) ) ListItem ( "off" ) - ListItem ( #buffer ( "" ~> . ) ) + ListItem ( #buffer ( "" ~> .K ) ) } @@ -78,7 +78,7 @@ 0 - . + .K x |-> 0 @@ -91,14 +91,14 @@ 1 |-> 3 - ListItem ( #buffer ( "\n" ~> . ) ) + ListItem ( #buffer ( "\n" ~> .K ) ) ListItem ( "off" ) ListItem ( #istream ( 0 ) ) ListItem ( #ostream ( 1 ) ) ListItem ( "off" ) - ListItem ( #buffer ( "" ~> . ) ) + ListItem ( #buffer ( "" ~> .K ) ) } diff --git a/1_k/4_imp++/lesson_8/imp.md b/1_k/4_imp++/lesson_8/imp.md index 78b26a18..a0121409 100644 --- a/1_k/4_imp++/lesson_8/imp.md +++ b/1_k/4_imp++/lesson_8/imp.md @@ -144,8 +144,8 @@ of statements surrounded by curly brackets. | "halt" ";" > "join" AExp ";" [strict] - syntax Ids ::= List{Id,","} [klabel(exps)] - syntax AExps ::= List{AExp,","} [klabel(exps)] + syntax Ids ::= List{Id,","} [overload(exps)] + syntax AExps ::= List{AExp,","} [overload(exps)] syntax Stmts ::= List{Stmt,""} syntax AExps ::= Ids endmodule diff --git a/1_k/4_imp++/lesson_8/tests/div.imp.out b/1_k/4_imp++/lesson_8/tests/div.imp.out index 7374ffea..33c4a2e7 100644 --- a/1_k/4_imp++/lesson_8/tests/div.imp.out +++ b/1_k/4_imp++/lesson_8/tests/div.imp.out @@ -8,7 +8,7 @@ 0 - . + .K x |-> 0 @@ -21,14 +21,14 @@ 1 |-> 1 - ListItem ( #buffer ( "\n" ~> . ) ) + ListItem ( #buffer ( "\n" ~> .K ) ) ListItem ( "off" ) ListItem ( #istream ( 0 ) ) ListItem ( #ostream ( 1 ) ) ListItem ( "off" ) - ListItem ( #buffer ( "" ~> . ) ) + ListItem ( #buffer ( "" ~> .K ) ) } @@ -43,7 +43,7 @@ 0 - . + .K x |-> 0 @@ -56,14 +56,14 @@ 1 |-> 2 - ListItem ( #buffer ( "\n" ~> . ) ) + ListItem ( #buffer ( "\n" ~> .K ) ) ListItem ( "off" ) ListItem ( #istream ( 0 ) ) ListItem ( #ostream ( 1 ) ) ListItem ( "off" ) - ListItem ( #buffer ( "" ~> . ) ) + ListItem ( #buffer ( "" ~> .K ) ) } @@ -78,7 +78,7 @@ 0 - . + .K x |-> 0 @@ -91,14 +91,14 @@ 1 |-> 3 - ListItem ( #buffer ( "\n" ~> . ) ) + ListItem ( #buffer ( "\n" ~> .K ) ) ListItem ( "off" ) ListItem ( #istream ( 0 ) ) ListItem ( #ostream ( 1 ) ) ListItem ( "off" ) - ListItem ( #buffer ( "" ~> . ) ) + ListItem ( #buffer ( "" ~> .K ) ) } diff --git a/1_k/5_types/lesson_1.9/tests/factorial-letrec.lambda.out b/1_k/5_types/lesson_1.9/tests/factorial-letrec.lambda.out index 24bfc83c..922e08a9 100644 --- a/1_k/5_types/lesson_1.9/tests/factorial-letrec.lambda.out +++ b/1_k/5_types/lesson_1.9/tests/factorial-letrec.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - int ~> . + int ~> .K } diff --git a/1_k/5_types/lesson_1.9/tests/ll.lambda.out b/1_k/5_types/lesson_1.9/tests/ll.lambda.out index 24bfc83c..922e08a9 100644 --- a/1_k/5_types/lesson_1.9/tests/ll.lambda.out +++ b/1_k/5_types/lesson_1.9/tests/ll.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - int ~> . + int ~> .K } diff --git a/1_k/5_types/lesson_1/tests/collatz.imp.out b/1_k/5_types/lesson_1/tests/collatz.imp.out index 8bbccd1b..bdc3b6ca 100644 --- a/1_k/5_types/lesson_1/tests/collatz.imp.out +++ b/1_k/5_types/lesson_1/tests/collatz.imp.out @@ -1,6 +1,6 @@ - stmt ~> . + stmt ~> .K m |-> int diff --git a/1_k/5_types/lesson_1/tests/div.imp.out b/1_k/5_types/lesson_1/tests/div.imp.out index 34d0fe87..0cdee1ac 100644 --- a/1_k/5_types/lesson_1/tests/div.imp.out +++ b/1_k/5_types/lesson_1/tests/div.imp.out @@ -1,6 +1,6 @@ - stmt ~> . + stmt ~> .K x |-> int diff --git a/1_k/5_types/lesson_1/tests/io.imp.out b/1_k/5_types/lesson_1/tests/io.imp.out index 34d0fe87..0cdee1ac 100644 --- a/1_k/5_types/lesson_1/tests/io.imp.out +++ b/1_k/5_types/lesson_1/tests/io.imp.out @@ -1,6 +1,6 @@ - stmt ~> . + stmt ~> .K x |-> int diff --git a/1_k/5_types/lesson_1/tests/locals.imp.out b/1_k/5_types/lesson_1/tests/locals.imp.out index 74ddde61..068f0983 100644 --- a/1_k/5_types/lesson_1/tests/locals.imp.out +++ b/1_k/5_types/lesson_1/tests/locals.imp.out @@ -1,6 +1,6 @@ - stmt ~> . + stmt ~> .K x |-> int diff --git a/1_k/5_types/lesson_1/tests/primes.imp.out b/1_k/5_types/lesson_1/tests/primes.imp.out index 94ac6210..e6f3b277 100644 --- a/1_k/5_types/lesson_1/tests/primes.imp.out +++ b/1_k/5_types/lesson_1/tests/primes.imp.out @@ -1,6 +1,6 @@ - stmt ~> . + stmt ~> .K i |-> int diff --git a/1_k/5_types/lesson_1/tests/spawn.imp.out b/1_k/5_types/lesson_1/tests/spawn.imp.out index 96126dcf..d55ee27d 100644 --- a/1_k/5_types/lesson_1/tests/spawn.imp.out +++ b/1_k/5_types/lesson_1/tests/spawn.imp.out @@ -1,6 +1,6 @@ - stmt ~> . + stmt ~> .K t1 |-> int diff --git a/1_k/5_types/lesson_1/tests/sum-io.imp.out b/1_k/5_types/lesson_1/tests/sum-io.imp.out index 38d56ba4..08648c75 100644 --- a/1_k/5_types/lesson_1/tests/sum-io.imp.out +++ b/1_k/5_types/lesson_1/tests/sum-io.imp.out @@ -1,6 +1,6 @@ - stmt ~> . + stmt ~> .K n |-> int diff --git a/1_k/5_types/lesson_1/tests/sum.imp.out b/1_k/5_types/lesson_1/tests/sum.imp.out index 12d51ccd..7ec6b4d3 100644 --- a/1_k/5_types/lesson_1/tests/sum.imp.out +++ b/1_k/5_types/lesson_1/tests/sum.imp.out @@ -1,6 +1,6 @@ - stmt ~> . + stmt ~> .K n |-> int diff --git a/1_k/5_types/lesson_2/tests/factorial-letrec.lambda.out b/1_k/5_types/lesson_2/tests/factorial-letrec.lambda.out index 24bfc83c..922e08a9 100644 --- a/1_k/5_types/lesson_2/tests/factorial-letrec.lambda.out +++ b/1_k/5_types/lesson_2/tests/factorial-letrec.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - int ~> . + int ~> .K } diff --git a/1_k/5_types/lesson_2/tests/ll.lambda.out b/1_k/5_types/lesson_2/tests/ll.lambda.out index 24bfc83c..922e08a9 100644 --- a/1_k/5_types/lesson_2/tests/ll.lambda.out +++ b/1_k/5_types/lesson_2/tests/ll.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - int ~> . + int ~> .K } diff --git a/1_k/5_types/lesson_3/tests/factorial-letrec.lambda.out b/1_k/5_types/lesson_3/tests/factorial-letrec.lambda.out index 24bfc83c..922e08a9 100644 --- a/1_k/5_types/lesson_3/tests/factorial-letrec.lambda.out +++ b/1_k/5_types/lesson_3/tests/factorial-letrec.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - int ~> . + int ~> .K } diff --git a/1_k/5_types/lesson_3/tests/ll.lambda.out b/1_k/5_types/lesson_3/tests/ll.lambda.out index 24bfc83c..922e08a9 100644 --- a/1_k/5_types/lesson_3/tests/ll.lambda.out +++ b/1_k/5_types/lesson_3/tests/ll.lambda.out @@ -1,5 +1,5 @@ { V:K #Equals - int ~> . + int ~> .K } diff --git a/2_languages/1_simple/1_untyped/simple-untyped.md b/2_languages/1_simple/1_untyped/simple-untyped.md index ecfa8324..e497b1aa 100644 --- a/2_languages/1_simple/1_untyped/simple-untyped.md +++ b/2_languages/1_simple/1_untyped/simple-untyped.md @@ -175,13 +175,13 @@ whenever requested (e.g., when they appear as strict arguments of the constructs above). ```k - syntax Ids ::= List{Id,","} [klabel(Exps)] - syntax Exps ::= List{Exp,","} [klabel(Exps), strict] // automatically hybrid now + syntax Ids ::= List{Id,","} [overload(Exps)] + syntax Exps ::= List{Exp,","} [overload(Exps), strict] // automatically hybrid now syntax Exps ::= Ids syntax Val - syntax Vals ::= List{Val,","} [klabel(Exps)] + syntax Vals ::= List{Val,","} [overload(Exps)] syntax Bottom - syntax Bottoms ::= List{Bottom,","} [klabel(Exps)] + syntax Bottoms ::= List{Bottom,","} [overload(Exps)] syntax Ids ::= Bottoms ``` diff --git a/2_languages/1_simple/1_untyped/tests/threads/threads_05.simple.out b/2_languages/1_simple/1_untyped/tests/threads/threads_05.simple.out index c73e3be1..46862f7b 100644 --- a/2_languages/1_simple/1_untyped/tests/threads/threads_05.simple.out +++ b/2_languages/1_simple/1_untyped/tests/threads/threads_05.simple.out @@ -23,14 +23,14 @@ SetItem ( -1 ) - ListItem ( #buffer ( "\n" ~> . ) ) + ListItem ( #buffer ( "\n" ~> .K ) ) ListItem ( "off" ) ListItem ( #istream ( 0 ) ) ListItem ( #ostream ( 1 ) ) ListItem ( "off" ) - ListItem ( #buffer ( "0\n" ~> . ) ) + ListItem ( #buffer ( "0\n" ~> .K ) ) 3 @@ -63,14 +63,14 @@ SetItem ( -1 ) - ListItem ( #buffer ( "\n" ~> . ) ) + ListItem ( #buffer ( "\n" ~> .K ) ) ListItem ( "off" ) ListItem ( #istream ( 0 ) ) ListItem ( #ostream ( 1 ) ) ListItem ( "off" ) - ListItem ( #buffer ( "1\n" ~> . ) ) + ListItem ( #buffer ( "1\n" ~> .K ) ) 3 @@ -103,14 +103,14 @@ SetItem ( -1 ) - ListItem ( #buffer ( "\n" ~> . ) ) + ListItem ( #buffer ( "\n" ~> .K ) ) ListItem ( "off" ) ListItem ( #istream ( 0 ) ) ListItem ( #ostream ( 1 ) ) ListItem ( "off" ) - ListItem ( #buffer ( "2\n" ~> . ) ) + ListItem ( #buffer ( "2\n" ~> .K ) ) 3 @@ -143,14 +143,14 @@ SetItem ( -1 ) - ListItem ( #buffer ( "\n" ~> . ) ) + ListItem ( #buffer ( "\n" ~> .K ) ) ListItem ( "off" ) ListItem ( #istream ( 0 ) ) ListItem ( #ostream ( 1 ) ) ListItem ( "off" ) - ListItem ( #buffer ( "3\n" ~> . ) ) + ListItem ( #buffer ( "3\n" ~> .K ) ) 3 @@ -183,14 +183,14 @@ SetItem ( -1 ) - ListItem ( #buffer ( "\n" ~> . ) ) + ListItem ( #buffer ( "\n" ~> .K ) ) ListItem ( "off" ) ListItem ( #istream ( 0 ) ) ListItem ( #ostream ( 1 ) ) ListItem ( "off" ) - ListItem ( #buffer ( "4\n" ~> . ) ) + ListItem ( #buffer ( "4\n" ~> .K ) ) 3 diff --git a/2_languages/1_simple/2_typed/1_static/simple-typed-static.md b/2_languages/1_simple/2_typed/1_static/simple-typed-static.md index 0ff79689..dfe0b826 100644 --- a/2_languages/1_simple/2_typed/1_static/simple-typed-static.md +++ b/2_languages/1_simple/2_typed/1_static/simple-typed-static.md @@ -135,7 +135,7 @@ The lists of types are useful for function arguments. | "(" Type ")" [bracket] > Types "->" Type - syntax Types ::= List{Type,","} [klabel(exps)] + syntax Types ::= List{Type,","} [overload(exps)] ``` ## Declarations @@ -203,7 +203,7 @@ We still need lists of expressions, defined below, but note that we do not need lists of identifiers anymore. They have been replaced by the lists of parameters. ```k - syntax Exps ::= List{Exp,","} [strict, klabel(exps)] + syntax Exps ::= List{Exp,","} [strict, overload(exps)] ``` ## Statements diff --git a/2_languages/1_simple/2_typed/2_dynamic/simple-typed-dynamic.md b/2_languages/1_simple/2_typed/2_dynamic/simple-typed-dynamic.md index 15262040..b0a20711 100644 --- a/2_languages/1_simple/2_typed/2_dynamic/simple-typed-dynamic.md +++ b/2_languages/1_simple/2_typed/2_dynamic/simple-typed-dynamic.md @@ -47,7 +47,7 @@ constructs. | Type "[" "]" | "(" Type ")" [bracket] > Types "->" Type - syntax Types ::= List{Type,","} [klabel(exps)] + syntax Types ::= List{Type,","} [overload(exps)] ``` ## Declarations @@ -95,9 +95,9 @@ constructs. Like in the static semantics, there is no need for lists of identifiers (because we now have lists of parameters). ```k - syntax Exps ::= List{Exp,","} [strict, klabel(exps)] + syntax Exps ::= List{Exp,","} [strict, overload(exps)] syntax Val - syntax Vals ::= List{Val,","} [klabel(exps)] + syntax Vals ::= List{Val,","} [overload(exps)] ``` ## Statements diff --git a/2_languages/1_simple/2_typed/2_dynamic/tests/threads_05.simple.out b/2_languages/1_simple/2_typed/2_dynamic/tests/threads_05.simple.out index 65e9f585..5414948e 100644 --- a/2_languages/1_simple/2_typed/2_dynamic/tests/threads_05.simple.out +++ b/2_languages/1_simple/2_typed/2_dynamic/tests/threads_05.simple.out @@ -23,14 +23,14 @@ SetItem ( 1 ) - ListItem ( #buffer ( "\n" ~> . ) ) + ListItem ( #buffer ( "\n" ~> .K ) ) ListItem ( "off" ) ListItem ( #istream ( 0 ) ) ListItem ( #ostream ( 1 ) ) ListItem ( "off" ) - ListItem ( #buffer ( "0\n" ~> . ) ) + ListItem ( #buffer ( "0\n" ~> .K ) ) 3 @@ -63,14 +63,14 @@ SetItem ( 1 ) - ListItem ( #buffer ( "\n" ~> . ) ) + ListItem ( #buffer ( "\n" ~> .K ) ) ListItem ( "off" ) ListItem ( #istream ( 0 ) ) ListItem ( #ostream ( 1 ) ) ListItem ( "off" ) - ListItem ( #buffer ( "1\n" ~> . ) ) + ListItem ( #buffer ( "1\n" ~> .K ) ) 3 @@ -103,14 +103,14 @@ SetItem ( 1 ) - ListItem ( #buffer ( "\n" ~> . ) ) + ListItem ( #buffer ( "\n" ~> .K ) ) ListItem ( "off" ) ListItem ( #istream ( 0 ) ) ListItem ( #ostream ( 1 ) ) ListItem ( "off" ) - ListItem ( #buffer ( "2\n" ~> . ) ) + ListItem ( #buffer ( "2\n" ~> .K ) ) 3 @@ -143,14 +143,14 @@ SetItem ( 1 ) - ListItem ( #buffer ( "\n" ~> . ) ) + ListItem ( #buffer ( "\n" ~> .K ) ) ListItem ( "off" ) ListItem ( #istream ( 0 ) ) ListItem ( #ostream ( 1 ) ) ListItem ( "off" ) - ListItem ( #buffer ( "3\n" ~> . ) ) + ListItem ( #buffer ( "3\n" ~> .K ) ) 3 @@ -183,14 +183,14 @@ SetItem ( 1 ) - ListItem ( #buffer ( "\n" ~> . ) ) + ListItem ( #buffer ( "\n" ~> .K ) ) ListItem ( "off" ) ListItem ( #istream ( 0 ) ) ListItem ( #ostream ( 1 ) ) ListItem ( "off" ) - ListItem ( #buffer ( "4\n" ~> . ) ) + ListItem ( #buffer ( "4\n" ~> .K ) ) 3 diff --git a/2_languages/2_kool/1_untyped/kool-untyped.md b/2_languages/2_kool/1_untyped/kool-untyped.md index ea1dc286..5c915c00 100644 --- a/2_languages/2_kool/1_untyped/kool-untyped.md +++ b/2_languages/2_kool/1_untyped/kool-untyped.md @@ -209,9 +209,9 @@ syntax includes: syntax Ids ::= List{Id,","} - syntax Exps ::= List{Exp,","} [strict, klabel(exps)] + syntax Exps ::= List{Exp,","} [strict, overload(exps)] syntax Val - syntax Vals ::= List{Val,","} [klabel(exps)] + syntax Vals ::= List{Val,","} [overload(exps)] syntax Block ::= "{" "}" | "{" Stmt "}" diff --git a/2_languages/2_kool/2_typed/1_dynamic/kool-typed-dynamic.md b/2_languages/2_kool/2_typed/1_dynamic/kool-typed-dynamic.md index a2f79c68..7cfd474b 100644 --- a/2_languages/2_kool/2_typed/1_dynamic/kool-typed-dynamic.md +++ b/2_languages/2_kool/2_typed/1_dynamic/kool-typed-dynamic.md @@ -56,7 +56,7 @@ untyped KOOL. | "(" Type ")" [bracket] > Types "->" Type // TODO(KORE): drop klabel once issues #1913 are fixed - syntax Types ::= List{Type,","} [klabel(_,_::Types)] + syntax Types ::= List{Type,","} [symbol(_,_::Types)] /* syntax Types ::= List{Type,","} */ @@ -112,9 +112,9 @@ untyped KOOL. > "spawn" Block > Exp "=" Exp [strict(2), right] - syntax Exps ::= List{Exp,","} [strict, klabel(exps)] + syntax Exps ::= List{Exp,","} [strict, overload(exps)] syntax Val - syntax Vals ::= List{Val,","} [klabel(exps)] + syntax Vals ::= List{Val,","} [overload(exps)] ``` ## Statements diff --git a/2_languages/2_kool/2_typed/2_static/kool-typed-static.md b/2_languages/2_kool/2_typed/2_static/kool-typed-static.md index 76018c12..30d4b144 100644 --- a/2_languages/2_kool/2_typed/2_static/kool-typed-static.md +++ b/2_languages/2_kool/2_typed/2_static/kool-typed-static.md @@ -130,7 +130,7 @@ the wrapper in the generated documentation, we associate it an | "(" Type ")" [bracket] > Types "->" Type - syntax Types ::= List{Type,","} [klabel(exps)] + syntax Types ::= List{Type,","} [overload(exps)] ``` ## Declarations @@ -187,7 +187,7 @@ the wrapper in the generated documentation, we associate it an syntax Exp ::= FieldReference | ArrayReference syntax priority _.__KOOL-TYPED-STATIC-SYNTAX > _[_]_KOOL-TYPED-STATIC-SYNTAX > _(_)_KOOL-TYPED-STATIC-SYNTAX - syntax Exps ::= List{Exp,","} [strict, klabel(exps)] + syntax Exps ::= List{Exp,","} [strict, overload(exps)] ``` ## Statements diff --git a/2_languages/3_fun/1_untyped/1_environment/fun-untyped.md b/2_languages/3_fun/1_untyped/1_environment/fun-untyped.md index be9cdac7..af37f6bd 100644 --- a/2_languages/3_fun/1_untyped/1_environment/fun-untyped.md +++ b/2_languages/3_fun/1_untyped/1_environment/fun-untyped.md @@ -146,7 +146,7 @@ to start with lower case letters. We take the freedom to tacitly introduce syntactic lists/sequences for each nonterminal for which we need them: ```k syntax Name [token] - syntax Names ::= List{Name,","} [klabel(exps)] + syntax Names ::= List{Name,","} [overload(exps)] ``` Expression constructs will be defined throughtout the syntax module. Below are the very basic ones, namely the builtins, the names, and the @@ -156,13 +156,13 @@ the list is on a position which can be evaluated: ```k syntax Exp ::= Int | Bool | String | Name | "(" Exp ")" [bracket] - syntax Exps ::= List{Exp,","} [strict, klabel(exps)] + syntax Exps ::= List{Exp,","} [strict, overload(exps)] syntax Val syntax Exp ::= Val syntax Exps ::= Vals - syntax Vals ::= List{Val,","} [klabel(exps)] + syntax Vals ::= List{Val,","} [overload(exps)] syntax Bottom - syntax Bottoms ::= List{Bottom,","} [klabel(exps)] + syntax Bottoms ::= List{Bottom,","} [overload(exps)] ``` We next define the syntax of arithmetic constructs, together with their relative priorities and left-/non-associativities. We also @@ -335,7 +335,7 @@ Like in many functional languages, type parameters/variables in user-defined types are quoted identifiers. ```k syntax TypeVar [token] - syntax TypeVars ::= List{TypeVar,","} [klabel(types)] + syntax TypeVars ::= List{TypeVar,","} [overload(types)] ``` Types can be basic types, function types, or user-defined parametric types. In the dynamic semantics we are going to simply ignore @@ -352,12 +352,12 @@ a constructor for function types: | TypeName [klabel(TypeName), avoid] | Type TypeName [klabel(Type-TypeName), symbol, macro] | "(" Types ")" TypeName [prefer] - syntax Types ::= List{Type,","} [klabel(types)] + syntax Types ::= List{Type,","} [overload(types)] syntax Types ::= TypeVars syntax TypeCase ::= ConstructorName | ConstructorName "(" Types ")" - syntax TypeCases ::= List{TypeCase,"|"} [klabel(_|TypeCase_)] + syntax TypeCases ::= List{TypeCase,"|"} [symbol(_|TypeCase_)] ``` ## Additional Priorities diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/ackermann.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/ackermann.fun.out index 6a90a04d..09403325 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/ackermann.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/ackermann.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 9 ~> . + 9 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/callcc-1.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/callcc-1.fun.out index 96cf3951..03204962 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/callcc-1.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/callcc-1.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 7 ~> . + 7 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/callcc-2.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/callcc-2.fun.out index 96cf3951..03204962 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/callcc-2.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/callcc-2.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 7 ~> . + 7 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/callcc-3.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/callcc-3.fun.out index 96cf3951..03204962 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/callcc-3.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/callcc-3.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 7 ~> . + 7 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/callcc-4.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/callcc-4.fun.out index 484970b7..0c63378c 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/callcc-4.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/callcc-4.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 10 ~> . + 10 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/callcc-5.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/callcc-5.fun.out index 484970b7..0c63378c 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/callcc-5.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/callcc-5.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 10 ~> . + 10 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/callcc-efficient-with-1.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/callcc-efficient-with-1.fun.out index 3ea80bcc..f5212a68 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/callcc-efficient-with-1.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/callcc-efficient-with-1.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 0 ~> . + 0 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/callcc-efficient-with-2.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/callcc-efficient-with-2.fun.out index 3ea80bcc..f5212a68 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/callcc-efficient-with-2.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/callcc-efficient-with-2.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 0 ~> . + 0 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/callcc-inefficient-without.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/callcc-inefficient-without.fun.out index 3ea80bcc..f5212a68 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/callcc-inefficient-without.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/callcc-inefficient-without.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 0 ~> . + 0 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/callcc-looping.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/callcc-looping.fun.out index c8568a9f..f80978a2 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/callcc-looping.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/callcc-looping.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 100 ~> . + 100 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/callcc-return-1.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/callcc-return-1.fun.out index 3ea80bcc..f5212a68 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/callcc-return-1.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/callcc-return-1.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 0 ~> . + 0 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/callcc-return-2.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/callcc-return-2.fun.out index 700871b8..10a4ae7b 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/callcc-return-2.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/callcc-return-2.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 1 ~> . + 1 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/constructor-bst-sorting.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/constructor-bst-sorting.fun.out index 8d9ba48a..786c63cb 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/constructor-bst-sorting.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/constructor-bst-sorting.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - [ 0 , 0 , 1 , 1 , 2 , 2 , 3 , 3 , 4 , 4 , 5 , 5 , 6 , 6 , 7 , 7 , 8 , 8 , 9 , 9 , 10 , 10 , .Bottoms ] ~> . + [ 0 , 0 , 1 , 1 , 2 , 2 , 3 , 3 , 4 , 4 , 5 , 5 , 6 , 6 , 7 , 7 , 8 , 8 , 9 , 9 , 10 , 10 , .Bottoms ] ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/constructor-days.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/constructor-days.fun.out index c3122cd2..c5e9a964 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/constructor-days.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/constructor-days.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - [ Thursday , Saturday , Thursday , .Bottoms ] ~> . + [ Thursday , Saturday , Thursday , .Bottoms ] ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/constructor-expr-distributivity.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/constructor-expr-distributivity.fun.out index 80ab2455..f4f110d4 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/constructor-expr-distributivity.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/constructor-expr-distributivity.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - "(n * x + n * y)" ~> . + "(n * x + n * y)" ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/constructor-expr-toString.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/constructor-expr-toString.fun.out index 5921ac48..785258fe 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/constructor-expr-toString.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/constructor-expr-toString.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - "n * (x + y)" ~> . + "n * (x + y)" ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/constructor-list-length.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/constructor-list-length.fun.out index 0d1534ce..32ce768f 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/constructor-list-length.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/constructor-list-length.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 3 ~> . + 3 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/constructor-tree-mirror.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/constructor-tree-mirror.fun.out index 077867f4..aab16147 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/constructor-tree-mirror.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/constructor-tree-mirror.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - Tree ( Tree ( Tree ( Leaf ( 5 , .Bottoms ) , Leaf ( 4 , .Bottoms ) , .Bottoms ) , Leaf ( 3 , .Bottoms ) , .Bottoms ) , Tree ( Leaf ( 2 , .Bottoms ) , Leaf ( 1 , .Bottoms ) , .Bottoms ) , .Bottoms ) ~> . + Tree ( Tree ( Tree ( Leaf ( 5 , .Bottoms ) , Leaf ( 4 , .Bottoms ) , .Bottoms ) , Leaf ( 3 , .Bottoms ) , .Bottoms ) , Tree ( Leaf ( 2 , .Bottoms ) , Leaf ( 1 , .Bottoms ) , .Bottoms ) , .Bottoms ) ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/empty-argument-1.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/empty-argument-1.fun.out index 6ad43d4e..a5ee4b3e 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/empty-argument-1.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/empty-argument-1.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - closure ( .Map , Nothing -> 7 | .Cases ) ~> . + closure ( .Map , Nothing -> 7 | .Cases ) ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/empty-argument-2.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/empty-argument-2.fun.out index 96cf3951..03204962 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/empty-argument-2.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/empty-argument-2.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 7 ~> . + 7 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/exceptions.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/exceptions.fun.out index af105b90..98eee127 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/exceptions.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/exceptions.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 21 ~> . + 21 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/factorial-and-list-max.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/factorial-and-list-max.fun.out index 3cf8d077..b14a3325 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/factorial-and-list-max.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/factorial-and-list-max.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 620448401733239439360000 ~> . + 620448401733239439360000 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/factorial.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/factorial.fun.out index 3cf8d077..b14a3325 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/factorial.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/factorial.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 620448401733239439360000 ~> . + 620448401733239439360000 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/list-1.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/list-1.fun.out index 0d1534ce..32ce768f 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/list-1.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/list-1.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 3 ~> . + 3 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/list-2.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/list-2.fun.out index 0d1534ce..32ce768f 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/list-2.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/list-2.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 3 ~> . + 3 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/list-3.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/list-3.fun.out index 0d1534ce..32ce768f 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/list-3.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/list-3.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 3 ~> . + 3 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/list-4.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/list-4.fun.out index 0d1534ce..32ce768f 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/list-4.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/list-4.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 3 ~> . + 3 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/list-length.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/list-length.fun.out index 9ea0e4a7..8131b447 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/list-length.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/list-length.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 8 ~> . + 8 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/list-max.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/list-max.fun.out index 8452ba72..8b50c414 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/list-max.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/list-max.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 5 ~> . + 5 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/list-nth.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/list-nth.fun.out index 713ebfe6..6eaaaef4 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/list-nth.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/list-nth.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 2 ~> . + 2 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/nth.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/nth.fun.out index cc7245eb..9ea5598e 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/nth.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/nth.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - [ 10 , 11 , 12 , 13 , 14 , .Bottoms ] ~> . + [ 10 , 11 , 12 , 13 , 14 , .Bottoms ] ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/pattern.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/pattern.fun.out index 92c320f3..f711fabe 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/pattern.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/pattern.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - [ Pair ( 10 , 9 , .Bottoms ) , Pair ( 0 , 1 , .Bottoms ) , Pair ( 0 , 0 , .Bottoms ) , .Bottoms ] ~> . + [ Pair ( 10 , 9 , .Bottoms ) , Pair ( 0 , 1 , .Bottoms ) , Pair ( 0 , 0 , .Bottoms ) , .Bottoms ] ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/polymorphism-1.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/polymorphism-1.fun.out index 704a5fba..694e76d6 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/polymorphism-1.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/polymorphism-1.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - closure ( .Map , x -> x | .Cases ) ~> . + closure ( .Map , x -> x | .Cases ) ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/polymorphism-2.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/polymorphism-2.fun.out index 0d1534ce..32ce768f 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/polymorphism-2.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/polymorphism-2.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 3 ~> . + 3 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/polymorphism-3.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/polymorphism-3.fun.out index 713ebfe6..6eaaaef4 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/polymorphism-3.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/polymorphism-3.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 2 ~> . + 2 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/polymorphism-4.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/polymorphism-4.fun.out index 9f2b74da..6a8f0631 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/polymorphism-4.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/polymorphism-4.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - closure ( .Map , x -> let ( y = x ) and .Bindings in y | .Cases ) ~> . + closure ( .Map , x -> let ( y = x ) and .Bindings in y | .Cases ) ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/polymorphism-5.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/polymorphism-5.fun.out index 0d1534ce..32ce768f 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/polymorphism-5.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/polymorphism-5.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 3 ~> . + 3 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/polymorphism-6.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/polymorphism-6.fun.out index 84dc1ad6..dabd2db3 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/polymorphism-6.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/polymorphism-6.fun.out @@ -4,5 +4,5 @@ closure ( f00 |-> 0 f01 |-> 1 f02 |-> 2 - f03 |-> 3 , x -> f03 ( f03 x ) | .Cases ) ~> . + f03 |-> 3 , x -> f03 ( f03 x ) | .Cases ) ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/references-1.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/references-1.fun.out index 3cf8d077..b14a3325 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/references-1.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/references-1.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 620448401733239439360000 ~> . + 620448401733239439360000 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/references-2.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/references-2.fun.out index 8452ba72..8b50c414 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/references-2.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/references-2.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 5 ~> . + 5 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/references-3.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/references-3.fun.out index a8c65f33..1a734707 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/references-3.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/references-3.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 16 ~> . + 16 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/references-4.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/references-4.fun.out index eda9bca8..2ddb88d1 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/references-4.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/references-4.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 3202 ~> . + 3202 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/references-5.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/references-5.fun.out index 4fd3badf..f33d7a14 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/references-5.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/references-5.fun.out @@ -1,23 +1,23 @@ { V:K #Equals - [ 7 , 8 , 9 , .Bottoms ] ~> . + [ 7 , 8 , 9 , .Bottoms ] ~> .K } #Or { V:K #Equals - [ 7 , 9 , 8 , .Bottoms ] ~> . + [ 7 , 9 , 8 , .Bottoms ] ~> .K } #Or { V:K #Equals - [ 9 , 8 , 9 , .Bottoms ] ~> . + [ 9 , 8 , 9 , .Bottoms ] ~> .K } #Or { V:K #Equals - [ 9 , 9 , 8 , .Bottoms ] ~> . + [ 9 , 9 , 8 , .Bottoms ] ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/stuck-letrec.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/stuck-letrec.fun.out index a298c9bb..2607ec69 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/stuck-letrec.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/stuck-letrec.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - x ~> #freezer_,__FUN-UNTYPED-COMMON_Exps_Exp_Exps0_ ( .Bottoms ~> . ) ~> #freezer_,__FUN-UNTYPED-COMMON_Exps_Exp_Exps1_ ( 2 ~> . ) ~> #freezerassignTo(_,_)_FUN-UNTYPED_KItem_Names_Exps1_ ( x , y , .Bottoms ~> . ) ~> y ~> setEnv ( x |-> 0 ) ~> setEnv ( .Map ) ~> . + x ~> #freezer_,__FUN-UNTYPED-COMMON_Exps_Exp_Exps0_ ( .Bottoms ~> .K ) ~> #freezer_,__FUN-UNTYPED-COMMON_Exps_Exp_Exps1_ ( 2 ~> .K ) ~> #freezerassignTo(_,_)_FUN-UNTYPED_KItem_Names_Exps1_ ( x , y , .Bottoms ~> .K ) ~> y ~> setEnv ( x |-> 0 ) ~> setEnv ( .Map ) ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/tail-recursion.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/tail-recursion.fun.out index 3ea80bcc..f5212a68 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/tail-recursion.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/tail-recursion.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 0 ~> . + 0 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/tuple-1.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/tuple-1.fun.out index e61e6b30..aecf5adf 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/tuple-1.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/tuple-1.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - closure ( .Map , Triple ( x , y , z , .Bottoms ) -> y | .Cases ) ~> . + closure ( .Map , Triple ( x , y , z , .Bottoms ) -> y | .Cases ) ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/tuple-2.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/tuple-2.fun.out index f75cf98e..875da5f1 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/tuple-2.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/tuple-2.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - Pair ( Pair ( 1 , Wrapper ( 2 , .Bottoms ) , .Bottoms ) , Pair ( 3 , 4 , .Bottoms ) , .Bottoms ) ~> . + Pair ( Pair ( 1 , Wrapper ( 2 , .Bottoms ) , .Bottoms ) , Pair ( 3 , 4 , .Bottoms ) , .Bottoms ) ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/tuple-3.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/tuple-3.fun.out index dd62a8de..ffeee47d 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/tuple-3.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/tuple-3.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 6 ~> . + 6 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/tuple-4.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/tuple-4.fun.out index 57900ef0..44660b54 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/tuple-4.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/tuple-4.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 230 ~> . + 230 ~> .K } diff --git a/2_languages/3_fun/1_untyped/1_environment/tests/tuple-5.fun.out b/2_languages/3_fun/1_untyped/1_environment/tests/tuple-5.fun.out index 57900ef0..44660b54 100644 --- a/2_languages/3_fun/1_untyped/1_environment/tests/tuple-5.fun.out +++ b/2_languages/3_fun/1_untyped/1_environment/tests/tuple-5.fun.out @@ -1,5 +1,5 @@ { V:K #Equals - 230 ~> . + 230 ~> .K } diff --git a/deps/k_release b/deps/k_release index 06a16edc..c6acbd06 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.2.37 +6.3.29