Index: third_party/pkg/angular/lib/core/parser/static_parser.dart |
diff --git a/third_party/pkg/angular/lib/core/parser/static_parser.dart b/third_party/pkg/angular/lib/core/parser/static_parser.dart |
index b9c59ee5d80acd46c7bff1f347c153e91f9b3336..ac097c67a682ceb9245ec5961a5b13fd82534527 100644 |
--- a/third_party/pkg/angular/lib/core/parser/static_parser.dart |
+++ b/third_party/pkg/angular/lib/core/parser/static_parser.dart |
@@ -1,6 +1,7 @@ |
library angular.core.parser.static_parser; |
-import 'package:angular/core/module.dart' show FilterMap, NgInjectableService; |
+import 'package:angular/core/annotation_src.dart' show Injectable; |
+import 'package:angular/core/module_internal.dart' show FormatterMap; |
import 'package:angular/core/parser/parser.dart'; |
import 'package:angular/core/parser/utils.dart' show EvalError; |
import 'package:angular/core/parser/syntax.dart'; |
@@ -11,11 +12,11 @@ class StaticParserFunctions { |
StaticParserFunctions(this.eval, this.assign); |
} |
-@NgInjectableService() |
+@Injectable() |
class StaticParser implements Parser<Expression> { |
final StaticParserFunctions _functions; |
final DynamicParser _fallbackParser; |
- final Map<String, Expression> _cache = {}; |
+ final _cache = <String, Expression>{}; |
StaticParser(this._functions, this._fallbackParser); |
Expression call(String input) { |
@@ -42,9 +43,9 @@ class StaticExpression extends Expression { |
accept(Visitor visitor) => throw "Cannot visit static expression $this"; |
toString() => _input; |
- eval(scope, [FilterMap filters = defaultFilterMap]) { |
+ eval(scope, [FormatterMap formatters = defaultFormatterMap]) { |
try { |
- return _eval(scope, filters); |
+ return _eval(scope, formatters); |
} on EvalError catch (e, s) { |
throw e.unwrap("$this", s); |
} |
@@ -58,4 +59,4 @@ class StaticExpression extends Expression { |
throw e.unwrap("$this", s); |
} |
} |
-} |
+} |