Index: tests/errors/.expect/completeType.nast.x64.txt =================================================================== --- tests/errors/.expect/completeType.nast.x64.txt (revision 5dc5da7a7221403820e332305ade84ac3af8a274) +++ tests/errors/.expect/completeType.nast.x64.txt (revision 3e5dd91354f39b161547cc1119ecef5890aa765f) @@ -12,5 +12,5 @@ Application of Variable Expression: *?: forall - DT: data type + instance of type DT (not function type) function ... with parameters @@ -21,5 +21,5 @@ ... with resolved type: pointer to forall - [unbound]:data type + instance of type [unbound] (not function type) function ... with parameters @@ -41,5 +41,5 @@ void ) - Environment:([unbound]) -> instance of struct A without body (no widening) + Environment:([unbound]DT) -> instance of struct A without body (no widening) @@ -47,5 +47,5 @@ Application of Variable Expression: *?: forall - DT: data type + instance of type DT (not function type) function ... with parameters @@ -56,5 +56,5 @@ ... with resolved type: pointer to forall - [unbound]:data type + instance of type [unbound] (not function type) function ... with parameters @@ -76,5 +76,5 @@ void ) - Environment:([unbound]) -> instance of struct B with body (no widening) + Environment:([unbound]DT) -> instance of struct B with body (no widening) @@ -113,7 +113,15 @@ Cost ( 0, 1, 0, 0, 1, -5, 0 ): Application of Variable Expression: baz: forall - T: sized data type - ... with assertions - ?=?: pointer to function + instance of type T (not function type) + with assertions + Variable Expression: ?=?: pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning + instance of type T (not function type) + + ... with resolved type: + pointer to function ... with parameters reference to instance of type T (not function type) @@ -122,20 +130,38 @@ instance of type T (not function type) - ?{}: pointer to function - ... with parameters - reference to instance of type T (not function type) - ... returning nothing - - ?{}: pointer to function - ... with parameters - reference to instance of type T (not function type) - instance of type T (not function type) - ... returning nothing - - ^?{}: pointer to function - ... with parameters - reference to instance of type T (not function type) - ... returning nothing - + Variable Expression: ?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + Variable Expression: ?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning nothing + + Variable Expression: ^?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing function @@ -146,7 +172,15 @@ ... with resolved type: pointer to forall - [unbound]:sized data type - ... with assertions - ?=?: pointer to function + instance of type [unbound] (not function type) + with assertions + Variable Expression: ?=?: pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning + instance of type T (not function type) + + ... with resolved type: + pointer to function ... with parameters reference to instance of type [unbound] (not function type) @@ -155,10 +189,23 @@ instance of type [unbound] (not function type) - ?{}: pointer to function + Variable Expression: ?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function ... with parameters reference to instance of type [unbound] (not function type) ... returning nothing - ?{}: pointer to function + Variable Expression: ?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function ... with parameters reference to instance of type [unbound] (not function type) @@ -166,9 +213,14 @@ ... returning nothing - ^?{}: pointer to function + Variable Expression: ^?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function ... with parameters reference to instance of type [unbound] (not function type) ... returning nothing - function @@ -188,12 +240,20 @@ void ) - Environment:([unbound]) -> instance of type T (not function type) (no widening) + Environment:([unbound]T) -> instance of type T (not function type) (no widening) Could not satisfy assertion: -?=?: pointer to function +Variable Expression: ?=?: pointer to function ... with parameters - reference to instance of type [unbound] (not function type) - instance of type [unbound] (not function type) + reference to instance of type T (not function type) + instance of type T (not function type) ... returning - instance of type [unbound] (not function type) - + instance of type T (not function type) + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type [unbound] (not function type) + instance of type [unbound] (not function type) + ... returning + instance of type [unbound] (not function type) + Index: tests/errors/.expect/completeType.nast.x86.txt =================================================================== --- tests/errors/.expect/completeType.nast.x86.txt (revision 5dc5da7a7221403820e332305ade84ac3af8a274) +++ tests/errors/.expect/completeType.nast.x86.txt (revision 3e5dd91354f39b161547cc1119ecef5890aa765f) @@ -12,5 +12,5 @@ Application of Variable Expression: *?: forall - DT: data type + instance of type DT (not function type) function ... with parameters @@ -21,5 +21,5 @@ ... with resolved type: pointer to forall - [unbound]:data type + instance of type [unbound] (not function type) function ... with parameters @@ -41,5 +41,5 @@ void ) - Environment:([unbound]) -> instance of struct A without body (no widening) + Environment:([unbound]DT) -> instance of struct A without body (no widening) @@ -47,5 +47,5 @@ Application of Variable Expression: *?: forall - DT: data type + instance of type DT (not function type) function ... with parameters @@ -56,5 +56,5 @@ ... with resolved type: pointer to forall - [unbound]:data type + instance of type [unbound] (not function type) function ... with parameters @@ -76,5 +76,5 @@ void ) - Environment:([unbound]) -> instance of struct B with body (no widening) + Environment:([unbound]DT) -> instance of struct B with body (no widening) @@ -113,7 +113,15 @@ Cost ( 0, 1, 0, 0, 1, -5, 0 ): Application of Variable Expression: baz: forall - T: sized data type - ... with assertions - ?=?: pointer to function + instance of type T (not function type) + with assertions + Variable Expression: ?=?: pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning + instance of type T (not function type) + + ... with resolved type: + pointer to function ... with parameters reference to instance of type T (not function type) @@ -122,20 +130,38 @@ instance of type T (not function type) - ?{}: pointer to function - ... with parameters - reference to instance of type T (not function type) - ... returning nothing - - ?{}: pointer to function - ... with parameters - reference to instance of type T (not function type) - instance of type T (not function type) - ... returning nothing - - ^?{}: pointer to function - ... with parameters - reference to instance of type T (not function type) - ... returning nothing - + Variable Expression: ?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + Variable Expression: ?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning nothing + + Variable Expression: ^?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing function @@ -146,7 +172,15 @@ ... with resolved type: pointer to forall - [unbound]:sized data type - ... with assertions - ?=?: pointer to function + instance of type [unbound] (not function type) + with assertions + Variable Expression: ?=?: pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning + instance of type T (not function type) + + ... with resolved type: + pointer to function ... with parameters reference to instance of type [unbound] (not function type) @@ -155,10 +189,23 @@ instance of type [unbound] (not function type) - ?{}: pointer to function + Variable Expression: ?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function ... with parameters reference to instance of type [unbound] (not function type) ... returning nothing - ?{}: pointer to function + Variable Expression: ?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function ... with parameters reference to instance of type [unbound] (not function type) @@ -166,9 +213,14 @@ ... returning nothing - ^?{}: pointer to function + Variable Expression: ^?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + ... with resolved type: + pointer to function ... with parameters reference to instance of type [unbound] (not function type) ... returning nothing - function @@ -188,12 +240,20 @@ void ) - Environment:([unbound]) -> instance of type T (not function type) (no widening) + Environment:([unbound]T) -> instance of type T (not function type) (no widening) Could not satisfy assertion: -?=?: pointer to function +Variable Expression: ?=?: pointer to function ... with parameters - reference to instance of type [unbound] (not function type) - instance of type [unbound] (not function type) + reference to instance of type T (not function type) + instance of type T (not function type) ... returning - instance of type [unbound] (not function type) - + instance of type T (not function type) + + ... with resolved type: + pointer to function + ... with parameters + reference to instance of type [unbound] (not function type) + instance of type [unbound] (not function type) + ... returning + instance of type [unbound] (not function type) + Index: tests/raii/.expect/ctor-autogen-ERR1.nast.txt =================================================================== --- tests/raii/.expect/ctor-autogen-ERR1.nast.txt (revision 5dc5da7a7221403820e332305ade84ac3af8a274) +++ tests/raii/.expect/ctor-autogen-ERR1.nast.txt (revision 3e5dd91354f39b161547cc1119ecef5890aa765f) @@ -70,5 +70,4 @@ ... with environment: Types: - Non-types: