Support for observable models, fixes #259

lib/src/analyzer.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.
 
 /**
  * Part of the template compilation that concerns with extracting information
  * from the HTML parse tree.
  */
 library analyzer;
 
 import 'package:html5lib/dom.dart';
 import 'package:html5lib/dom_parsing.dart';
 
-import 'directive_parser.dart' show parseDartCode;
+import 'dart_parser.dart';
 import 'file_system/path.dart';
 import 'files.dart';
 import 'html5_utils.dart';
 import 'info.dart';
 import 'messages.dart';
 import 'utils.dart';
 
 /**
  * Finds custom elements in this file and the list of referenced files with
  * component declarations. This is the first pass of analysis on a file.
@@ skipping 680 matching lines @@
   }
 
   /**
    * Stores a direct reference in [info] to a dart source file that was loaded
    * in a script tag with the 'src' attribute.
    */
   void _attachExtenalScript(LibraryInfo info, Map<Path, FileInfo> files) {
     var path = info.externalFile;
     if (path != null) {
       info.externalCode = files[path];
+      info.externalCode.htmlFile = info;
       info.userCode = info.externalCode.userCode;
     }
   }
 
   /** Adds a component's tag name to the names in scope for [fileInfo]. */
   void _addComponent(FileInfo fileInfo, ComponentInfo componentInfo) {
     var existing = fileInfo.components[componentInfo.tagName];
     if (existing != null) {
       if (existing == componentInfo) {
         // This is the same exact component as the existing one.
@@ skipping 221 matching lines @@
     assert(node.nodes.length == 1);
     Text text = node.nodes[0];
 
     if (_currentInfo.codeAttached) {
       _tooManyScriptsError(node);
     } else if (_currentInfo == _fileInfo && !_fileInfo.isEntryPoint) {
       _messages.warning('top-level dart code is ignored on '
           ' HTML pages that define components, but are not the entry HTML '
           'file.', node.sourceSpan, file: _fileInfo.path);
     } else {
-      _currentInfo.inlinedCode = text.value;
-      _currentInfo.userCode = parseDartCode(text.value,
-          _currentInfo.inputPath, messages:_messages);
+      var path = _currentInfo.inputPath;
+      _currentInfo.userCode = parseDartCode(path, text.value, _messages);
       if (_currentInfo.userCode.partOf != null) {
         _messages.error('expected a library, not a part.',
             node.sourceSpan, file: _fileInfo.path);
       }
     }
   }
 
   void _tooManyScriptsError(Node node) {
     var location = _currentInfo is ComponentInfo ?
         'a custom element declaration' : 'the top-level HTML page';
@@ skipping 62 matching lines @@
     if (start == null) moveNext();
     if (start < length) {
       do {
         bindings.add(binding);
         content.add(textContent);
       } while (moveNext());
     }
     content.add(textContent);
   }
 }