Fix build and test failures, cleanup grammar.

1. A build failure caused by a method call before a contract was fixed.
2. An absolute path in an ".expect" file was changed to relative.
3. I eliminated the TopDecls and DeclModifiers non-terminals.
   They were giving a warning from Coco/R about being deletable.
   Instead I used repetition of the TopDecl or DeclModifier
   non-terminals where they had been used. I think this is
   also cleaner to talk about.

1 files changed, 3 insertions, 2 deletions

diff --git a/Source/DafnyDriver/DafnyDriver.cs b/Source/DafnyDriver/DafnyDriver.cs
index a60971b1..464aff79 100644
--- a/Source/DafnyDriver/DafnyDriver.cs
+++ b/Source/DafnyDriver/DafnyDriver.cs
@@ -310,11 +310,12 @@ namespace Microsoft.Dafny
       string targetFilename = Path.ChangeExtension(dafnyProgramName, "cs");

       using (TextWriter target = new StreamWriter(new FileStream(targetFilename, System.IO.FileMode.Create))) {

         target.Write(csharpProgram);

+        string relativeTarget = Path.GetFileName(targetFilename);

         if (completeProgram) {

-          outputWriter.WriteLine("Compiled program written to {0}", targetFilename);

+          outputWriter.WriteLine("Compiled program written to {0}", relativeTarget);

         }

         else {

-          outputWriter.WriteLine("File {0} contains the partially compiled program", targetFilename);

+          outputWriter.WriteLine("File {0} contains the partially compiled program", relativeTarget);

         }

       }

       return targetFilename;