Index: tests/lib/mirrors/symbol_validation_test.dart |
diff --git a/tests/lib/mirrors/symbol_validation_test.dart b/tests/lib/mirrors/symbol_validation_test.dart |
index 0fe3c45c3d412b142226754f67f66ee0473c4d18..51dba1481388ba475d24c26c3b6f5a7f9e31caaf 100644 |
--- a/tests/lib/mirrors/symbol_validation_test.dart |
+++ b/tests/lib/mirrors/symbol_validation_test.dart |
@@ -11,6 +11,7 @@ validSymbol(String string) { |
Expect.equals(string, |
MirrorSystem.getName(new Symbol(string)), |
'Valid symbol "$string" should be invertable'); |
+ return; /// 01: ok |
Expect.equals(string, |
MirrorSystem.getName(MirrorSystem.getSymbol(string)), |
'Valid symbol "$string" should be invertable'); |
@@ -20,20 +21,105 @@ invalidSymbol(String string) { |
Expect.throws(() => new Symbol(string), |
(e) => e is ArgumentError, |
'Invalid symbol "$string" should be rejected'); |
+ return; /// 01: continued |
Expect.throws(() => MirrorSystem.getSymbol(string), |
- (e) => e is ArgumentError, |
+ (e) => e is ArgumentError, |
'Invalid symbol "$string" should be rejected'); |
} |
main() { |
- ['%', '&', '*', '+', '-', '/', '<', '<<', '<=', '==', '>', |
- '>=', '>>', '[]', '[]=', '^', 'unary-', '|', '~', '~/'] |
- .forEach(validSymbol); |
+ // Operators that can be declared as class member operators. |
+ // These are all valid as symbols. |
+ var operators = [ |
+ '%', '&', '*', '+', '-', '/', '<', '<<', '<=', '==', '>', |
+ '>=', '>>', '[]', '[]=', '^', 'unary-', '|', '~', '~/' |
+ ]; |
+ operators.expand((op) => [op, "x.$op"]).forEach(validSymbol); |
+ operators.expand((op) => [".$op", "$op.x", "x$op", "_x.$op"]) |
+ .forEach(invalidSymbol); |
+ operators.expand((op) => operators.contains("$op=") ? [] : ["x.$op=", "$op="]) |
+ .forEach(invalidSymbol); |
+ |
+ var simpleSymbols = [ |
+ 'foo', 'bar_', 'baz.quz', 'fisk1', 'hest2fisk', 'a.b.c.d.e', |
+ r'$', r'foo$', r'bar$bar', r'$.$', r'x6$_', r'$6_', r'x.$$6_', |
+ 'x_', 'x_.x_', |
+ ]; |
+ simpleSymbols.expand((s) => [s, "s="]).forEach(validSymbol); |
+ |
+ var nonSymbols = [ |
+ // Non-identifiers. |
+ '6', '0foo', ',', 'S with M', '_invalid&private', "#foo", " foo", "foo ", |
+ // Operator variants. |
+ '+=', '()', 'operator+', 'unary+', '>>>', "&&", "||", "!", "@", "#", "[", |
+ // Privat symbols. |
ahe
2014/02/21 12:52:09
Privat*e*
|
+ '_', '_x', 'x._y', 'x._', |
+ // Empty parts of "qualified" symbols. |
+ '.', 'x.', '.x', 'x..y' |
+ ]; |
+ nonSymbols.forEach(invalidSymbol); |
- ['foo', '_bar', 'baz.quz', 'fisk1', 'hest2fisk', 'a.b.c.d.e', |
- '\$', 'foo\$', 'bar\$bar'] |
- .forEach(validSymbol); |
+ // Reserved words are not valid identifiers and therefore not valid symbols. |
+ var reservedWords = [ |
+ "assert", |
+ "break", |
+ "case", |
+ "catch", |
+ "class", |
+ "const", |
+ "continue", |
+ "default", |
+ "do", |
+ "else", |
+ "enum", |
+ "extends", |
+ "false", |
+ "final", |
+ "finally", |
+ "for", |
+ "if", |
+ "in", |
+ "is", |
+ "new", |
+ "null", |
+ "rethrow", |
+ "return", |
+ "super", |
+ "switch", |
+ "this", |
+ "throw", |
+ "true", |
+ "try", |
+ "var", |
+ "void", |
+ "while", |
+ "with" |
+ ]; |
+ reservedWords.expand((w) => [w, "$w=", "x.$w" , "$w.x", "x.$w.x"]) |
+ .forEach(invalidSymbol); |
+ reservedWords.expand((w) => ["${w}_", "${w}\$", "${w}q"]) |
+ .forEach(validSymbol); |
- ['6', '0foo', ',', 'S with M', '_invalid&private'] |
- .forEach(invalidSymbol); |
+ // Built-in identifiers are valid identifiers that are restricted from being |
+ // used in some cases, but they are all valid symbols. |
+ var builtInIdentifiers = [ |
+ "abstract", |
+ "as", |
+ "dynamic", |
+ "export", |
+ "external", |
+ "factory", |
+ "get", |
+ "implements", |
+ "import", |
+ "library", |
+ "operator", |
+ "part", |
+ "set", |
+ "static", |
+ "typedef" |
+ ]; |
+ builtInIdentifiers.expand((w) => [w, "$w=", "x.$w" , "$w.x", "x.$w.x", |
+ "$w=", "x.$w="]) |
+ .forEach(validSymbol); |
} |