Revert "Refactor Library/CompilationUnit and how we define local Scope."

lib/compiler/implementation/patch_parser.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #library("patchparser");
 #import("dart:uri");
 
 #import("tree/tree.dart", prefix: "tree");
 #import("leg.dart", prefix: 'leg');  // CompilerTask, Compiler.
 #import("apiimpl.dart");
@@ skipping 22 matching lines @@
         scanLibraryElements(library);
         compiler.onLibraryLoaded(library, uri);
       });
     }
     return library;
   }
 
   void scanLibraryElements(LibraryElement library) {
     measure(() {
       // TODO(lrn): Possibly recursively handle #source directives in patch.
-      leg.Script script = library.entryCompilationUnit.script;
+      leg.Script script = library.script;
       Token tokens = new StringScanner(script.text).tokenize();
       Function idGenerator = compiler.getNextFreeClassId;
       PatchListener patchListener =
-          new PatchElementListener(compiler,
-                                   library.entryCompilationUnit,
-                                   idGenerator);
+          new PatchElementListener(compiler, library, idGenerator);
       new PatchParser(patchListener).parseUnit(tokens);
     });
   }
 
   tree.ClassNode parsePatchClassNode(PartialClassElement element) {
     // Parse [PartialClassElement] using a "patch"-aware parser instead
     // of calling its [parseNode] method.
     if (element.cachedNode != null) return element.cachedNode;
     PatchMemberListener listener =
         new PatchMemberListener(compiler, element);
@@ skipping 150 matching lines @@
     }
   }
 
   void addMember(Element element) {
     if (isMemberPatch || (isClassPatch && element is ClassElement)) {
       element.addMetadata(popNode());
     }
     super.addMember(element);
   }
 }