summaryrefslogtreecommitdiff
path: root/Test/dafny0/Trait/TraitBasix.dfy.expect
diff options
context:
space:
mode:
authorGravatar leino <unknown>2014-08-05 10:06:39 -0700
committerGravatar leino <unknown>2014-08-05 10:06:39 -0700
commit498bff41addc9ca481926f668fb6b69b17b9deda (patch)
tree7294a111a6b5ef3a11f0a864cebe5cfbb919630f /Test/dafny0/Trait/TraitBasix.dfy.expect
parente17ec43d4f53d179c367b5c6bb52c893e0f57bff (diff)
Resolved further merge issues
Diffstat (limited to 'Test/dafny0/Trait/TraitBasix.dfy.expect')
-rw-r--r--Test/dafny0/Trait/TraitBasix.dfy.expect4
1 files changed, 2 insertions, 2 deletions
diff --git a/Test/dafny0/Trait/TraitBasix.dfy.expect b/Test/dafny0/Trait/TraitBasix.dfy.expect
index 1d44d0f6..4a908ee7 100644
--- a/Test/dafny0/Trait/TraitBasix.dfy.expect
+++ b/Test/dafny0/Trait/TraitBasix.dfy.expect
@@ -1,7 +1,7 @@
+TraitBasix.dfy(91,23): Error: unresolved identifier: IX
TraitBasix.dfy(77,13): Error: member in the class has been already inherited from its parent trait
TraitBasix.dfy(70,7): Error: class: I0Child does not implement trait member: Customizable
TraitBasix.dfy(80,7): Error: class: I0Child2 does not implement trait member: F
-TraitBasix.dfy(91,7): Error: unresolved identifier: IX
TraitBasix.dfy(98,6): Error: a trait is not allowed to declare a constructor
-TraitBasix.dfy(117,10): Error: new can not be applied to a trait
+TraitBasix.dfy(117,10): Error: new cannot be applied to a trait
6 resolution/type errors detected in TraitBasix.dfy