| OLD | NEW |
| 1 import 'package:angular/core/parser/parser.dart'; | 1 import 'package:angular/core/parser/parser.dart'; |
| 2 import 'package:angular/utils.dart' show isReservedWord; | 2 import 'package:angular/utils.dart' show isReservedWord; |
| 3 import 'dart:math'; |
| 3 | 4 |
| 4 class DartGetterSetterGen extends ParserBackend { | 5 class DartGetterSetterGen extends ParserBackend { |
| 5 final properties = new Set<String>(); | 6 final Set<String> properties = new Set<String>(); |
| 6 final calls = new Set<String>(); | 7 final Map<String, Set<int>> calls = new Map<String, Set<int>>(); |
| 7 final symbols = new Set<String>(); | |
| 8 | 8 |
| 9 bool isAssignable(expression) => true; | 9 bool isAssignable(expression) => true; |
| 10 | 10 |
| 11 registerAccess(String name) { | 11 registerAccess(String name) { |
| 12 if (isReservedWord(name)) return; | 12 if (isReservedWord(name)) return; |
| 13 properties.add(name); | 13 properties.add(name); |
| 14 } | 14 } |
| 15 | 15 |
| 16 registerCall(String name, CallArguments arguments) { | 16 registerCall(String name, List arguments) { |
| 17 if (isReservedWord(name)) return; | 17 if (isReservedWord(name)) return; |
| 18 calls.add(name); | 18 Set<int> arities = calls.putIfAbsent(name, () => new Set<int>()); |
| 19 symbols.addAll(arguments.named.keys); | 19 arities.add(arguments.length); |
| 20 } | 20 } |
| 21 | 21 |
| 22 newAccessScope(String name) => registerAccess(name); | 22 newAccessScope(String name) |
| 23 newAccessMember(var object, String name) => registerAccess(name); | 23 => registerAccess(name); |
| 24 newCallScope(String name, CallArguments arguments) => | 24 newAccessMember(var object, String name) |
| 25 registerCall(name, arguments); | 25 => registerAccess(name); |
| 26 newCallMember(var object, String name, CallArguments arguments) => | 26 newCallScope(String name, List arguments) |
| 27 registerCall(name, arguments); | 27 => registerCall(name, arguments); |
| 28 newCallMember(var object, String name, List arguments) |
| 29 => registerCall(name, arguments); |
| 28 } | 30 } |
| 29 | 31 |
| 30 class ParserGetterSetter { | 32 class ParserGetterSetter { |
| 31 final Parser parser; | 33 final Parser parser; |
| 32 final ParserBackend backend; | 34 final ParserBackend backend; |
| 33 ParserGetterSetter(this.parser, this.backend); | 35 ParserGetterSetter(this.parser, this.backend); |
| 34 | 36 |
| 35 generateParser(List<String> exprs, StringSink sink) { | 37 generateParser(List<String> exprs) { |
| 36 exprs.forEach((expr) { | 38 exprs.forEach((expr) { |
| 37 try { | 39 try { |
| 38 parser(expr); | 40 parser(expr); |
| 39 } catch (e) { | 41 } catch (e) { |
| 40 // Ignore exceptions. | 42 // Ignore exceptions. |
| 41 } | 43 } |
| 42 }); | 44 }); |
| 43 | 45 |
| 44 DartGetterSetterGen backend = this.backend; | 46 DartGetterSetterGen backend = this.backend; |
| 45 sink.write(generateClosureMap(backend.properties, backend.calls, | 47 print(generateClosureMap(backend.properties, backend.calls)); |
| 46 backend.symbols)); | |
| 47 } | 48 } |
| 48 | 49 |
| 49 generateClosureMap(Set<String> properties, | 50 generateClosureMap(Set<String> properties, Map<String, Set<int>> calls) { |
| 50 Set<String> calls, | |
| 51 Set<String> symbols) { | |
| 52 var getters = new Set.from(properties)..addAll(calls); | |
| 53 return ''' | 51 return ''' |
| 54 StaticClosureMap closureMap = new StaticClosureMap( | 52 class StaticClosureMap extends ClosureMap { |
| 55 ${generateGetterMap(getters)}, | 53 Map<String, Getter> _getters = ${generateGetterMap(properties)}; |
| 56 ${generateSetterMap(properties)}, | 54 Map<String, Setter> _setters = ${generateSetterMap(properties)}; |
| 57 ${generateSymbolMap(symbols)}); | 55 List<Map<String, Function>> _functions = ${generateFunctionMap(calls)}; |
| 56 |
| 57 Getter lookupGetter(String name) |
| 58 => _getters[name]; |
| 59 Setter lookupSetter(String name) |
| 60 => _setters[name]; |
| 61 lookupFunction(String name, int arity) |
| 62 => (arity < _functions.length) ? _functions[arity][name] : null; |
| 63 } |
| 58 '''; | 64 '''; |
| 59 } | 65 } |
| 60 | 66 |
| 61 generateGetterMap(Iterable<String> keys) { | 67 generateGetterMap(Iterable<String> keys) { |
| 62 var lines = keys.map((key) => ' r"${key}": (o) => o.$key'); | 68 var lines = keys.map((key) => 'r"${key}": (o) => o.$key'); |
| 63 return '{\n${lines.join(",\n")}\n }'; | 69 return '{\n ${lines.join(",\n ")}\n }'; |
| 64 } | 70 } |
| 65 | 71 |
| 66 generateSetterMap(Iterable<String> keys) { | 72 generateSetterMap(Iterable<String> keys) { |
| 67 var lines = keys.map((key) => ' r"${key}": (o,v) => o.$key = v'); | 73 var lines = keys.map((key) => 'r"${key}": (o, v) => o.$key = v'); |
| 68 return '{\n${lines.join(",\n")}\n }'; | 74 return '{\n ${lines.join(",\n ")}\n }'; |
| 69 } | 75 } |
| 70 | 76 |
| 71 generateSymbolMap(Set<String> symbols) { | 77 generateFunctionMap(Map<String, Set<int>> calls) { |
| 72 var lines = symbols.map((key) => ' r"${key}": #$key'); | 78 Map<int, Set<String>> arities = {}; |
| 73 return '{\n${lines.join(",\n")}\n }'; | 79 calls.forEach((name, callArities) { |
| 80 callArities.forEach((arity){ |
| 81 arities.putIfAbsent(arity, () => new Set<String>()).add(name); |
| 82 }); |
| 83 }); |
| 84 |
| 85 var maxArity = arities.keys.reduce((x, y) => max(x, y)); |
| 86 |
| 87 var maps = new Iterable.generate(maxArity, (arity) { |
| 88 var names = arities[arity]; |
| 89 if (names == null) { |
| 90 return '{\n }'; |
| 91 } else { |
| 92 var args = new List.generate(arity, (e) => "a$e").join(','); |
| 93 var p = args.isEmpty ? '' : ', $args'; |
| 94 var lines = names.map((name) => 'r"$name": (o$p) => o.$name($args)'); |
| 95 return '{\n ${lines.join(",\n ")}\n }'; |
| 96 } |
| 97 }); |
| 98 |
| 99 return '[${maps.join(",")}]'; |
| 74 } | 100 } |
| 75 } | 101 } |
| OLD | NEW |