From e114841f66691bd534bafc9b12d993fb246e375b Mon Sep 17 00:00:00 2001 From: Rustan Leino Date: Tue, 8 Jul 2014 15:28:19 -0700 Subject: Further resolved merge conflicts --- Test/dafny0/ResolutionErrors.dfy.expect | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Test/dafny0') diff --git a/Test/dafny0/ResolutionErrors.dfy.expect b/Test/dafny0/ResolutionErrors.dfy.expect index d768fc3e..4075ff29 100644 --- a/Test/dafny0/ResolutionErrors.dfy.expect +++ b/Test/dafny0/ResolutionErrors.dfy.expect @@ -54,8 +54,8 @@ ResolutionErrors.dfy(898,9): Error: cannot assign to a range of array elements ( ResolutionErrors.dfy(899,9): Error: cannot assign to a range of array elements (try the 'forall' statement) ResolutionErrors.dfy(900,5): Error: cannot assign to a range of array elements (try the 'forall' statement) ResolutionErrors.dfy(901,5): Error: cannot assign to a range of array elements (try the 'forall' statement) -ResolutionErrors.dfy(964,11): Error: Wrong number of type arguments (2 instead of 1) passed to class/datatype: array3 -ResolutionErrors.dfy(965,11): Error: Wrong number of type arguments (2 instead of 1) passed to class/datatype: C +ResolutionErrors.dfy(982,11): Error: Wrong number of type arguments (2 instead of 1) passed to class/datatype: array3 +ResolutionErrors.dfy(983,11): Error: Wrong number of type arguments (2 instead of 1) passed to class/datatype: C ResolutionErrors.dfy(429,2): Error: More than one default constructor ResolutionErrors.dfy(50,13): Error: 'this' is not allowed in a 'static' context ResolutionErrors.dfy(111,9): Error: ghost variables are allowed only in specification contexts @@ -147,4 +147,4 @@ ResolutionErrors.dfy(956,10): Error: second argument to % must be of type int (i ResolutionErrors.dfy(960,7): Error: type conversion to real is allowed only from int (got real) ResolutionErrors.dfy(961,7): Error: type conversion to int is allowed only from real (got int) ResolutionErrors.dfy(962,7): Error: type conversion to int is allowed only from real (got nat) -146 resolution/type errors detected in ResolutionErrors.dfy +149 resolution/type errors detected in ResolutionErrors.dfy -- cgit v1.2.3