update the testsuite to the latest state of the compiler/interpreter

This commit is contained in:
krasimir
2010-10-25 11:50:41 +00:00
parent 53306414b6
commit 2965777003
5 changed files with 36 additions and 34 deletions

View File

@@ -2,25 +2,26 @@ checking module linsCnc
Warning: no linearization type for C, inserting default {s : Str} Warning: no linearization type for C, inserting default {s : Str}
Warning: no linearization of test Warning: no linearization of test
abstract lins { abstract lins {
cat C Nat cat C Nat ;
cat Float cat Float ;
cat Int cat Int ;
cat Nat cat Nat ;
cat String cat String ;
fun test : C zero fun test : C zero ;
fun zero : Nat fun zero : Nat ;
} }
concrete linsCnc { concrete linsCnc {
productions productions
C0 -> F0[CVar]
C1 -> F1[CVar]
C1 -> F2[] C1 -> F2[]
functions lindefs
F0 := (S0) [__gfV] C0 -> F0
F1 := () [__gfV] C1 -> F1
lin
F0 := (S0) [lindef C]
F1 := () [lindef Nat]
F2 := () [zero] F2 := () [zero]
sequences sequences
S0 := <0,0> S0 := {0,0}
categories categories
C := range [C0 .. C0] C := range [C0 .. C0]
labels ["s"] labels ["s"]
@@ -33,5 +34,6 @@ concrete linsCnc {
String := range [CString .. CString] String := range [CString .. CString]
labels ["s"] labels ["s"]
__gfVar := range [CVar .. CVar] __gfVar := range [CVar .. CVar]
labels ["s"] labels [""]
printnames
} }

View File

@@ -1,4 +1,4 @@
\x -> x 1 \v0 -> v0 1
?1 1 ?1 1
@@ -6,7 +6,7 @@
f 1 2 f 1 2
\x -> x \v0 -> v0
?1 ?1
@@ -18,7 +18,7 @@ f 1 2
g 0 g 0
\x -> g x \v0 -> g v0
g ?1 g ?1
@@ -44,7 +44,7 @@ dec (succF zeroF)
dec zeroF dec zeroF
\x -> dec x \v0 -> dec v0
dec ?1 dec ?1
@@ -60,5 +60,5 @@ dec2 0 err
succ err succ err
\x -> dec (dec x) \v0 -> dec (dec v0)

View File

@@ -1,28 +1,28 @@
(S (E (String ?1)) is even) (S:2 (E:1 (_:0 ?1)) is even)
(S exists (S (String x)) such that (S (S (E (String x)) is even))) (S:3 exists x such that (S:2 (E:1 (_:0 x)) is even))
(S (E a)) (S:1 (E:0 a))
(S (E aa) a) (S:1 (E:0 aa) a)
(S (E a) b) (S:1 (E:0 a) b)
(S (String abcd) is string) (S:1 (String:0 abcd) is string)
(S (Int 100) is integer) (S:1 (Int:0 100) is integer)
(S (Float 12.4) is float) (S:1 (Float:0 12.4) is float)
(S (String xyz) is string) (S:1 (String:0 xyz) is string)
cannot linearize cannot linearize

View File

@@ -1,10 +1,10 @@
\x -> x \v0 -> v0
1 1
\x -> x \v0 -> v0
\x -> 2 \v0 -> 2
1 1

View File

@@ -19,13 +19,13 @@ Expression: <\m, n -> vector (plus m n) : (m : Nat) -> (n : Nat) -> Vector (plus
Type: (m : Nat) -> (n : Nat) -> Vector (plus m n) Type: (m : Nat) -> (n : Nat) -> Vector (plus m n)
Expression: mkMorph (\x -> succ zero) Expression: mkMorph (\x -> succ zero)
Type: Morph (\x -> succ zero) Type: Morph (\v0 -> succ zero)
Expression: idMorph (mkMorph (\x -> x)) Expression: idMorph (mkMorph (\x -> x))
Type: Nat Type: Nat
Couldn't match expected type Morph (\x -> x) Couldn't match expected type Morph (\v0 -> v0)
against inferred type Morph (\x -> succ zero) against inferred type Morph (\v0 -> succ zero)
In the expression: mkMorph (\x -> succ zero) In the expression: mkMorph (\x -> succ zero)
Expression: <append zero (succ zero) : Vector zero -> Vector (succ zero) -> Vector (succ zero)> Expression: <append zero (succ zero) : Vector zero -> Vector (succ zero) -> Vector (succ zero)>
Type: Vector zero -> Vector (succ zero) -> Vector (succ zero) Type: Vector zero -> Vector (succ zero) -> Vector (succ zero)