Index: third_party/pkg/angular/lib/tools/expression_extractor.dart |
diff --git a/third_party/pkg/angular/lib/tools/expression_extractor.dart b/third_party/pkg/angular/lib/tools/expression_extractor.dart |
index e77afeba349bee1492b7d53d03f3f8e00c973429..e59705d1c534db1e1afac134ba8f30cec2d3cf98 100644 |
--- a/third_party/pkg/angular/lib/tools/expression_extractor.dart |
+++ b/third_party/pkg/angular/lib/tools/expression_extractor.dart |
@@ -12,10 +12,8 @@ import 'package:angular/tools/common.dart'; |
import 'package:di/di.dart'; |
import 'package:di/dynamic_injector.dart'; |
-import 'package:angular/core/module.dart'; |
import 'package:angular/core/parser/parser.dart'; |
import 'package:angular/tools/parser_getter_setter/generator.dart'; |
-import 'package:angular/tools/parser_generator/generator.dart'; |
main(args) { |
if (args.length < 5) { |
@@ -40,51 +38,38 @@ main(args) { |
var headerFile = args[2]; |
var footerFile = args[3]; |
var outputFile = args[4]; |
- SourcePrinter printer; |
+ var printer; |
if (outputFile == '--') { |
- printer = new SourcePrinter(); |
+ printer = stdout; |
} else { |
- printer = new FileSourcePrinter(outputFile); |
+ printer = new File(outputFile).openWrite(); |
} |
// Output the header file first. |
if (headerFile != '') { |
- printer.printSrc(_readFile(headerFile)); |
+ printer.write(_readFile(headerFile)); |
} |
- printer.printSrc('// Found ${expressions.length} expressions'); |
+ printer.write('// Found ${expressions.length} expressions\n'); |
Module module = new Module() |
..type(Parser, implementedBy: DynamicParser) |
- ..type(ParserBackend, implementedBy: DartGetterSetterGen) |
- ..type(FilterMap, implementedBy: NullFilterMap) |
- ..value(SourcePrinter, printer); |
+ ..type(ParserBackend, implementedBy: DartGetterSetterGen); |
Injector injector = |
new DynamicInjector(modules: [module], allowImplicitInjection: true); |
runZoned(() { |
// Run the generator. |
- injector.get(ParserGetterSetter).generateParser(htmlExtractor.expressions); |
+ injector.get(ParserGetterSetter).generateParser(htmlExtractor.expressions, |
+ printer); |
}, zoneSpecification: new ZoneSpecification(print: (_, __, ___, String line) { |
- printer.printSrc(line); |
+ printer.write(line); |
})); |
// Output footer last. |
if (footerFile != '') { |
- printer.printSrc(_readFile(footerFile)); |
+ printer.write(_readFile(footerFile)); |
} |
} |
String _readFile(String filePath) => new File(filePath).readAsStringSync(); |
- |
-class FileSourcePrinter implements SourcePrinter { |
- final File _file; |
- |
- FileSourcePrinter(String filePath) |
- : _file = new File(filePath) { |
- // clear file |
- _file.writeAsStringSync(''); |
- } |
- |
- printSrc(src) => _file.writeAsStringSync('$src\n', mode: FileMode.APPEND); |
-} |