Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(399)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: lib/runtime/dart/core.js

Issue 1034273003: fix for static methods and names banned in strict mode (Closed) Base URL: git@github.com:dart-lang/dev_compiler.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « lib/runtime/dart/convert.js ('k') | lib/runtime/dart/isolate.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/runtime/dart/core.js
diff --git a/lib/runtime/dart/core.js b/lib/runtime/dart/core.js
index 7760b7b66a486c0cff7589a62d0ac56776f00522..32ed3948a10242cc8ba4c9e21ef462e6e62e3d67 100644
--- a/lib/runtime/dart/core.js
+++ b/lib/runtime/dart/core.js
@@ -7,7 +7,7 @@ var core;
var init = this[name];
var result = void 0;
if (init)
- result = init.apply(this, arguments);
+ result = init.apply(this, arguments$);
return result === void 0 ? this : result;
}
['=='](other) {
@@ -64,11 +64,14 @@ var core;
return Comparable;
});
let Comparable = Comparable$(dart.dynamic);
- let _fourDigits$ = dart.JsSymbol('_fourDigits');
- let _sixDigits$ = dart.JsSymbol('_sixDigits');
- let _threeDigits$ = dart.JsSymbol('_threeDigits');
- let _twoDigits$ = dart.JsSymbol('_twoDigits');
- let _brokenDownDateToMillisecondsSinceEpoch$ = dart.JsSymbol('_brokenDownDateToMillisecondsSinceEpoch');
+ let _brokenDownDateToMillisecondsSinceEpoch = dart.JsSymbol('_brokenDownDateToMillisecondsSinceEpoch');
+ let _MAX_MILLISECONDS_SINCE_EPOCH = dart.JsSymbol('_MAX_MILLISECONDS_SINCE_EPOCH');
+ let _fourDigits = dart.JsSymbol('_fourDigits');
+ let _sixDigits = dart.JsSymbol('_sixDigits');
+ let _threeDigits = dart.JsSymbol('_threeDigits');
+ let _twoDigits = dart.JsSymbol('_twoDigits');
+ let _internal$ = dart.JsSymbol('_internal');
+ let _now = dart.JsSymbol('_now');
class DateTime extends Object {
DateTime(year, month, day, hour, minute, second, millisecond) {
if (month === void 0)
@@ -142,7 +145,7 @@ var core;
minute = dart.notNull(sign) * dart.notNull(minuteDifference);
}
}
- let millisecondsSinceEpoch = _brokenDownDateToMillisecondsSinceEpoch(years, month, day, hour, minute, second, millisecond, isUtc);
+ let millisecondsSinceEpoch = DateTime[_brokenDownDateToMillisecondsSinceEpoch](years, month, day, hour, minute, second, millisecond, isUtc);
if (millisecondsSinceEpoch === null) {
throw new FormatException("Time out of range", formattedString);
}
@@ -157,7 +160,7 @@ var core;
let isUtc = opts && 'isUtc' in opts ? opts.isUtc : false;
this.millisecondsSinceEpoch = millisecondsSinceEpoch;
this.isUtc = isUtc;
- if (dart.notNull(millisecondsSinceEpoch.abs()) > dart.notNull(DateTime._MAX_MILLISECONDS_SINCE_EPOCH)) {
+ if (dart.notNull(millisecondsSinceEpoch.abs()) > dart.notNull(DateTime[_MAX_MILLISECONDS_SINCE_EPOCH])) {
throw new ArgumentError(millisecondsSinceEpoch);
}
if (isUtc === null)
@@ -194,7 +197,7 @@ var core;
return this;
return new DateTime.fromMillisecondsSinceEpoch(this.millisecondsSinceEpoch, {isUtc: true});
}
- static [_fourDigits$](n) {
+ static [_fourDigits](n) {
let absN = n.abs();
let sign = dart.notNull(n) < 0 ? "-" : "";
if (dart.notNull(absN) >= 1000)
@@ -205,7 +208,7 @@ var core;
return `${sign}00${absN}`;
return `${sign}000${absN}`;
}
- static [_sixDigits$](n) {
+ static [_sixDigits](n) {
dart.assert(dart.notNull(n) < -9999 || dart.notNull(n) > 9999);
let absN = n.abs();
let sign = dart.notNull(n) < 0 ? "-" : "+";
@@ -213,26 +216,26 @@ var core;
return `${sign}${absN}`;
return `${sign}0${absN}`;
}
- static [_threeDigits$](n) {
+ static [_threeDigits](n) {
if (dart.notNull(n) >= 100)
return `${n}`;
if (dart.notNull(n) >= 10)
return `0${n}`;
return `00${n}`;
}
- static [_twoDigits$](n) {
+ static [_twoDigits](n) {
if (dart.notNull(n) >= 10)
return `${n}`;
return `0${n}`;
}
toString() {
- let y = _fourDigits(this.year);
- let m = _twoDigits(this.month);
- let d = _twoDigits(this.day);
- let h = _twoDigits(this.hour);
- let min = _twoDigits(this.minute);
- let sec = _twoDigits(this.second);
- let ms = _threeDigits(this.millisecond);
+ let y = DateTime[_fourDigits](this.year);
+ let m = DateTime[_twoDigits](this.month);
+ let d = DateTime[_twoDigits](this.day);
+ let h = DateTime[_twoDigits](this.hour);
+ let min = DateTime[_twoDigits](this.minute);
+ let sec = DateTime[_twoDigits](this.second);
+ let ms = DateTime[_threeDigits](this.millisecond);
if (this.isUtc) {
return `${y}-${m}-${d} ${h}:${min}:${sec}.${ms}Z`;
} else {
@@ -240,13 +243,13 @@ var core;
}
}
toIso8601String() {
- let y = dart.notNull(this.year) >= -9999 && dart.notNull(this.year) <= 9999 ? _fourDigits(this.year) : _sixDigits(this.year);
- let m = _twoDigits(this.month);
- let d = _twoDigits(this.day);
- let h = _twoDigits(this.hour);
- let min = _twoDigits(this.minute);
- let sec = _twoDigits(this.second);
- let ms = _threeDigits(this.millisecond);
+ let y = dart.notNull(this.year) >= -9999 && dart.notNull(this.year) <= 9999 ? DateTime[_fourDigits](this.year) : DateTime[_sixDigits](this.year);
+ let m = DateTime[_twoDigits](this.month);
+ let d = DateTime[_twoDigits](this.day);
+ let h = DateTime[_twoDigits](this.hour);
+ let min = DateTime[_twoDigits](this.minute);
+ let sec = DateTime[_twoDigits](this.second);
+ let ms = DateTime[_threeDigits](this.millisecond);
if (this.isUtc) {
return `${y}-${m}-${d}T${h}:${min}:${sec}.${ms}Z`;
} else {
@@ -274,7 +277,7 @@ var core;
this.isUtc = false;
this.millisecondsSinceEpoch = _js_helper.Primitives.dateNow();
}
- static [_brokenDownDateToMillisecondsSinceEpoch$](year, month, day, hour, minute, second, millisecond, isUtc) {
+ static [_brokenDownDateToMillisecondsSinceEpoch](year, month, day, hour, minute, second, millisecond, isUtc) {
return dart.as(_js_helper.Primitives.valueFromDecomposedDate(year, month, day, hour, minute, second, millisecond, isUtc), int);
}
get timeZoneName() {
@@ -315,8 +318,8 @@ var core;
dart.defineNamedConstructor(DateTime, 'utc');
dart.defineNamedConstructor(DateTime, 'now');
dart.defineNamedConstructor(DateTime, 'fromMillisecondsSinceEpoch');
- dart.defineNamedConstructor(DateTime, '_internal');
- dart.defineNamedConstructor(DateTime, '_now');
+ dart.defineNamedConstructor(DateTime, _internal$);
+ dart.defineNamedConstructor(DateTime, _now);
DateTime.MONDAY = 1;
DateTime.TUESDAY = 2;
DateTime.WEDNESDAY = 3;
@@ -339,31 +342,32 @@ var core;
DateTime.DECEMBER = 12;
DateTime.MONTHS_PER_YEAR = 12;
DateTime._MAX_MILLISECONDS_SINCE_EPOCH = 8640000000000000;
- let _onParseErrorInt$ = dart.JsSymbol('_onParseErrorInt');
- let _onParseErrorDouble$ = dart.JsSymbol('_onParseErrorDouble');
+ let _parseError = dart.JsSymbol('_parseError');
+ let _onParseErrorInt = dart.JsSymbol('_onParseErrorInt');
+ let _onParseErrorDouble = dart.JsSymbol('_onParseErrorDouble');
class num extends Object {
static parse(input, onError) {
if (onError === void 0)
onError = null;
let source = input.trim();
- _parseError = false;
- let result = int.parse(source, {onError: _onParseErrorInt});
- if (!dart.notNull(_parseError))
+ num[_parseError] = false;
+ let result = int.parse(source, {onError: num[_onParseErrorInt]});
+ if (!dart.notNull(num[_parseError]))
return result;
- _parseError = false;
- result = double.parse(source, _onParseErrorDouble);
- if (!dart.notNull(_parseError))
+ num[_parseError] = false;
+ result = double.parse(source, num[_onParseErrorDouble]);
+ if (!dart.notNull(num[_parseError]))
return result;
if (onError === null)
throw new FormatException(input);
return onError(input);
}
- static [_onParseErrorInt$](_) {
- _parseError = true;
+ static [_onParseErrorInt](_) {
+ num[_parseError] = true;
return 0;
}
- static [_onParseErrorDouble$](_) {
- _parseError = true;
+ static [_onParseErrorDouble](_) {
+ num[_parseError] = true;
return 0.0;
}
}
@@ -381,6 +385,7 @@ var core;
double.MIN_POSITIVE = 5e-324;
double.MAX_FINITE = 1.7976931348623157e+308;
let _duration = dart.JsSymbol('_duration');
+ let _microseconds = dart.JsSymbol('_microseconds');
class Duration extends Object {
Duration(opts) {
let days = opts && 'days' in opts ? opts.days : 0;
@@ -488,7 +493,7 @@ var core;
return new Duration._microseconds(-dart.notNull(this[_duration]));
}
}
- dart.defineNamedConstructor(Duration, '_microseconds');
+ dart.defineNamedConstructor(Duration, _microseconds);
Duration.MICROSECONDS_PER_MILLISECOND = 1000;
Duration.MILLISECONDS_PER_SECOND = 1000;
Duration.SECONDS_PER_MINUTE = 60;
@@ -505,8 +510,8 @@ var core;
Duration.SECONDS_PER_DAY = dart.notNull(Duration.SECONDS_PER_HOUR) * dart.notNull(Duration.HOURS_PER_DAY);
Duration.MINUTES_PER_DAY = dart.notNull(Duration.MINUTES_PER_HOUR) * dart.notNull(Duration.HOURS_PER_DAY);
Duration.ZERO = new Duration({seconds: 0});
- let _stringToSafeString$ = dart.JsSymbol('_stringToSafeString');
- let _objectToString$ = dart.JsSymbol('_objectToString');
+ let _stringToSafeString = dart.JsSymbol('_stringToSafeString');
+ let _objectToString = dart.JsSymbol('_objectToString');
class Error extends Object {
Error() {
}
@@ -515,14 +520,14 @@ var core;
return object.toString();
}
if (typeof object == string) {
- return _stringToSafeString(object);
+ return Error[_stringToSafeString](object);
}
- return _objectToString(object);
+ return Error[_objectToString](object);
}
- static [_stringToSafeString$](string) {
+ static [_stringToSafeString](string) {
return _js_helper.jsonEncodeNative(string);
}
- static [_objectToString$](object) {
+ static [_objectToString](object) {
return _js_helper.Primitives.objectToString(object);
}
get stackTrace() {
@@ -970,7 +975,10 @@ var core;
return "IntegerDivisionByZeroException";
}
}
+ let _EXPANDO_PROPERTY_NAME = dart.JsSymbol('_EXPANDO_PROPERTY_NAME');
let _getKey = dart.JsSymbol('_getKey');
+ let _KEY_PROPERTY_NAME = dart.JsSymbol('_KEY_PROPERTY_NAME');
+ let _keyCount = dart.JsSymbol('_keyCount');
let Expando$ = dart.generic(function(T) {
class Expando extends Object {
Expando(name) {
@@ -982,22 +990,22 @@ var core;
return `Expando:${this.name}`;
}
get(object) {
- let values = _js_helper.Primitives.getProperty(object, Expando._EXPANDO_PROPERTY_NAME);
+ let values = _js_helper.Primitives.getProperty(object, Expando[_EXPANDO_PROPERTY_NAME]);
return dart.as(values === null ? null : _js_helper.Primitives.getProperty(values, this[_getKey]()), T);
}
set(object, value) {
- let values = _js_helper.Primitives.getProperty(object, Expando._EXPANDO_PROPERTY_NAME);
+ let values = _js_helper.Primitives.getProperty(object, Expando[_EXPANDO_PROPERTY_NAME]);
if (values === null) {
values = new Object();
- _js_helper.Primitives.setProperty(object, Expando._EXPANDO_PROPERTY_NAME, values);
+ _js_helper.Primitives.setProperty(object, Expando[_EXPANDO_PROPERTY_NAME], values);
}
_js_helper.Primitives.setProperty(values, this[_getKey](), value);
}
[_getKey]() {
- let key = dart.as(_js_helper.Primitives.getProperty(this, Expando._KEY_PROPERTY_NAME), String);
+ let key = dart.as(_js_helper.Primitives.getProperty(this, Expando[_KEY_PROPERTY_NAME]), String);
if (key === null) {
- key = `expando$key$${((x) => _keyCount = dart.notNull(x) + 1, x)(_keyCount)}`;
- _js_helper.Primitives.setProperty(this, Expando._KEY_PROPERTY_NAME, key);
+ key = `expando$key$${((x) => Expando[_keyCount] = dart.notNull(x) + 1, x)(Expando[_keyCount])}`;
+ _js_helper.Primitives.setProperty(this, Expando[_KEY_PROPERTY_NAME], key);
}
return key;
}
@@ -1008,14 +1016,14 @@ var core;
return Expando;
});
let Expando = Expando$(dart.dynamic);
- let _toMangledNames$ = dart.JsSymbol('_toMangledNames');
+ let _toMangledNames = dart.JsSymbol('_toMangledNames');
class Function extends Object {
static apply(f, positionalArguments, namedArguments) {
if (namedArguments === void 0)
namedArguments = null;
- return _js_helper.Primitives.applyFunction(f, positionalArguments, namedArguments === null ? null : _toMangledNames(namedArguments));
+ return _js_helper.Primitives.applyFunction(f, positionalArguments, namedArguments === null ? null : Function[_toMangledNames](namedArguments));
}
- static [_toMangledNames$](namedArguments) {
+ static [_toMangledNames](namedArguments) {
let result = dart.as(dart.map(), Map$(String, dynamic));
namedArguments.forEach(dart.closureWrap((symbol, value) => {
result.set(_symbolToString(dart.as(symbol, Symbol)), value);
@@ -1083,13 +1091,13 @@ var core;
let _end = dart.JsSymbol('_end');
let _start = dart.JsSymbol('_start');
let _generator = dart.JsSymbol('_generator');
- let _id$ = dart.JsSymbol('_id');
+ let _id = dart.JsSymbol('_id');
let _GeneratorIterable$ = dart.generic(function(E) {
class _GeneratorIterable extends collection.IterableBase$(E) {
_GeneratorIterable(end$, generator) {
this[_end] = end$;
this[_start] = 0;
- this[_generator] = dart.as(generator !== null ? generator : _id, _Generator);
+ this[_generator] = dart.as(generator !== null ? generator : _GeneratorIterable[_id], _Generator);
super.IterableBase();
}
_GeneratorIterable$slice(start$, end$, generator$) {
@@ -1122,7 +1130,7 @@ var core;
return this;
return new _GeneratorIterable.slice(this[_start], newEnd, this[_generator]);
}
- static [_id$](n) {
+ static [_id](n) {
return n;
}
}
@@ -1240,6 +1248,7 @@ var core;
return Map;
});
let Map = Map$(dart.dynamic, dart.dynamic);
+ let _uninstantiable = dart.JsSymbol('_uninstantiable');
class Null extends Object {
Null$_uninstantiable() {
throw new UnsupportedError('class Null cannot be instantiated');
@@ -1248,7 +1257,7 @@ var core;
return "null";
}
}
- dart.defineNamedConstructor(Null, '_uninstantiable');
+ dart.defineNamedConstructor(Null, _uninstantiable);
class Pattern extends Object {
}
// Function print: (Object) → void
@@ -1294,37 +1303,37 @@ var core;
let Sink = Sink$(dart.dynamic);
class StackTrace extends Object {
}
+ let _frequency = dart.JsSymbol('_frequency');
let _stop = dart.JsSymbol('_stop');
- let _initTicker$ = dart.JsSymbol('_initTicker');
- let _now$ = dart.JsSymbol('_now');
+ let _initTicker = dart.JsSymbol('_initTicker');
class Stopwatch extends Object {
get frequency() {
- return _frequency;
+ return Stopwatch[_frequency];
}
Stopwatch() {
this[_start] = null;
this[_stop] = null;
- _initTicker();
+ Stopwatch[_initTicker]();
}
start() {
if (this.isRunning)
return;
if (this[_start] === null) {
- this[_start] = _now();
+ this[_start] = Stopwatch[_now]();
} else {
- this[_start] = dart.notNull(_now()) - (dart.notNull(this[_stop]) - dart.notNull(this[_start]));
+ this[_start] = dart.notNull(Stopwatch[_now]()) - (dart.notNull(this[_stop]) - dart.notNull(this[_start]));
this[_stop] = null;
}
}
stop() {
if (!dart.notNull(this.isRunning))
return;
- this[_stop] = _now();
+ this[_stop] = Stopwatch[_now]();
}
reset() {
if (this[_start] === null)
return;
- this[_start] = _now();
+ this[_start] = Stopwatch[_now]();
if (this[_stop] !== null) {
this[_stop] = this[_start];
}
@@ -1333,7 +1342,7 @@ var core;
if (this[_start] === null) {
return 0;
}
- return this[_stop] === null ? dart.notNull(_now()) - dart.notNull(this[_start]) : dart.notNull(this[_stop]) - dart.notNull(this[_start]);
+ return this[_stop] === null ? dart.notNull(Stopwatch[_now]()) - dart.notNull(this[_start]) : dart.notNull(this[_stop]) - dart.notNull(this[_start]);
}
get elapsed() {
return new Duration({microseconds: this.elapsedMicroseconds});
@@ -1347,16 +1356,16 @@ var core;
get isRunning() {
return this[_start] !== null && this[_stop] === null;
}
- static [_initTicker$]() {
+ static [_initTicker]() {
_js_helper.Primitives.initTicker();
- _frequency = _js_helper.Primitives.timerFrequency;
+ Stopwatch[_frequency] = _js_helper.Primitives.timerFrequency;
}
- static [_now$]() {
+ static [_now]() {
return dart.as(dart.dinvoke(_js_helper.Primitives, 'timerTicks'), int);
}
}
Stopwatch._frequency = null;
- let _stringFromIterable$ = dart.JsSymbol('_stringFromIterable');
+ let _stringFromIterable = dart.JsSymbol('_stringFromIterable');
class String extends Object {
String$fromCharCodes(charCodes, start, end) {
if (start === void 0)
@@ -1364,7 +1373,7 @@ var core;
if (end === void 0)
end = null;
if (!dart.is(charCodes, _interceptors.JSArray)) {
- return _stringFromIterable(charCodes, start, end);
+ return String[_stringFromIterable](charCodes, start, end);
}
let list = dart.as(charCodes, List);
let len = list.length;
@@ -1388,7 +1397,7 @@ var core;
let defaultValue = opts && 'defaultValue' in opts ? opts.defaultValue : null;
throw new UnsupportedError('String.fromEnvironment can only be used as a const constructor');
}
- static [_stringFromIterable$](charCodes, start, end) {
+ static [_stringFromIterable](charCodes, start, end) {
if (dart.notNull(start) < 0)
throw new RangeError.range(start, 0, charCodes.length);
if (end !== null && dart.notNull(end) < dart.notNull(start)) {
@@ -1623,49 +1632,78 @@ var core;
let _userInfo = dart.JsSymbol('_userInfo');
let _host = dart.JsSymbol('_host');
let _port = dart.JsSymbol('_port');
- let _defaultPort$ = dart.JsSymbol('_defaultPort');
+ let _defaultPort = dart.JsSymbol('_defaultPort');
let _path = dart.JsSymbol('_path');
let _query = dart.JsSymbol('_query');
let _fragment = dart.JsSymbol('_fragment');
- let _fail$ = dart.JsSymbol('_fail');
+ let _regNameTable = dart.JsSymbol('_regNameTable');
+ let _SLASH = dart.JsSymbol('_SLASH');
+ let _QUESTION = dart.JsSymbol('_QUESTION');
+ let _NUMBER_SIGN = dart.JsSymbol('_NUMBER_SIGN');
+ let _AT_SIGN = dart.JsSymbol('_AT_SIGN');
+ let _COLON = dart.JsSymbol('_COLON');
+ let _LEFT_BRACKET = dart.JsSymbol('_LEFT_BRACKET');
+ let _makeUserInfo = dart.JsSymbol('_makeUserInfo');
+ let _ZERO = dart.JsSymbol('_ZERO');
+ let _NINE = dart.JsSymbol('_NINE');
+ let _fail = dart.JsSymbol('_fail');
+ let _makePort = dart.JsSymbol('_makePort');
+ let _makeHost = dart.JsSymbol('_makeHost');
+ let _makeScheme = dart.JsSymbol('_makeScheme');
+ let _makePath = dart.JsSymbol('_makePath');
+ let _makeQuery = dart.JsSymbol('_makeQuery');
+ let _makeFragment = dart.JsSymbol('_makeFragment');
let _pathSegments = dart.JsSymbol('_pathSegments');
let _queryParameters = dart.JsSymbol('_queryParameters');
- let _makeHttpUri$ = dart.JsSymbol('_makeHttpUri');
- let _isWindows$ = dart.JsSymbol('_isWindows');
- let _checkNonWindowsPathReservedCharacters$ = dart.JsSymbol('_checkNonWindowsPathReservedCharacters');
- let _checkWindowsPathReservedCharacters$ = dart.JsSymbol('_checkWindowsPathReservedCharacters');
- let _checkWindowsDriveLetter$ = dart.JsSymbol('_checkWindowsDriveLetter');
- let _makeFileUri$ = dart.JsSymbol('_makeFileUri');
- let _makeWindowsFileUrl$ = dart.JsSymbol('_makeWindowsFileUrl');
- let _makePort$ = dart.JsSymbol('_makePort');
- let _makeHost$ = dart.JsSymbol('_makeHost');
- let _isRegNameChar$ = dart.JsSymbol('_isRegNameChar');
- let _normalizeRegName$ = dart.JsSymbol('_normalizeRegName');
- let _makeScheme$ = dart.JsSymbol('_makeScheme');
- let _makeUserInfo$ = dart.JsSymbol('_makeUserInfo');
- let _makePath$ = dart.JsSymbol('_makePath');
- let _makeQuery$ = dart.JsSymbol('_makeQuery');
- let _makeFragment$ = dart.JsSymbol('_makeFragment');
- let _stringOrNullLength$ = dart.JsSymbol('_stringOrNullLength');
- let _isHexDigit$ = dart.JsSymbol('_isHexDigit');
- let _hexValue$ = dart.JsSymbol('_hexValue');
- let _normalizeEscape$ = dart.JsSymbol('_normalizeEscape');
- let _isUnreservedChar$ = dart.JsSymbol('_isUnreservedChar');
- let _escapeChar$ = dart.JsSymbol('_escapeChar');
- let _normalize$ = dart.JsSymbol('_normalize');
- let _isSchemeCharacter$ = dart.JsSymbol('_isSchemeCharacter');
- let _isGeneralDelimiter$ = dart.JsSymbol('_isGeneralDelimiter');
+ let _stringOrNullLength = dart.JsSymbol('_stringOrNullLength');
+ let _makeHttpUri = dart.JsSymbol('_makeHttpUri');
+ let _RIGHT_BRACKET = dart.JsSymbol('_RIGHT_BRACKET');
+ let _isWindows = dart.JsSymbol('_isWindows');
+ let _makeWindowsFileUrl = dart.JsSymbol('_makeWindowsFileUrl');
+ let _makeFileUri = dart.JsSymbol('_makeFileUri');
+ let _checkNonWindowsPathReservedCharacters = dart.JsSymbol('_checkNonWindowsPathReservedCharacters');
+ let _checkWindowsPathReservedCharacters = dart.JsSymbol('_checkWindowsPathReservedCharacters');
+ let _checkWindowsDriveLetter = dart.JsSymbol('_checkWindowsDriveLetter');
+ let _UPPER_CASE_A = dart.JsSymbol('_UPPER_CASE_A');
+ let _UPPER_CASE_Z = dart.JsSymbol('_UPPER_CASE_Z');
+ let _LOWER_CASE_A = dart.JsSymbol('_LOWER_CASE_A');
+ let _LOWER_CASE_Z = dart.JsSymbol('_LOWER_CASE_Z');
+ let _BACKSLASH = dart.JsSymbol('_BACKSLASH');
+ let _normalizeRegName = dart.JsSymbol('_normalizeRegName');
+ let _isRegNameChar = dart.JsSymbol('_isRegNameChar');
+ let _PERCENT = dart.JsSymbol('_PERCENT');
+ let _normalizeEscape = dart.JsSymbol('_normalizeEscape');
+ let _isGeneralDelimiter = dart.JsSymbol('_isGeneralDelimiter');
+ let _escapeChar = dart.JsSymbol('_escapeChar');
+ let _isAlphabeticCharacter = dart.JsSymbol('_isAlphabeticCharacter');
+ let _isSchemeCharacter = dart.JsSymbol('_isSchemeCharacter');
+ let _normalize = dart.JsSymbol('_normalize');
+ let _userinfoTable = dart.JsSymbol('_userinfoTable');
+ let _pathCharOrSlashTable = dart.JsSymbol('_pathCharOrSlashTable');
+ let _uriEncode = dart.JsSymbol('_uriEncode');
+ let _pathCharTable = dart.JsSymbol('_pathCharTable');
+ let _queryCharTable = dart.JsSymbol('_queryCharTable');
+ let _isHexDigit = dart.JsSymbol('_isHexDigit');
+ let _LOWER_CASE_F = dart.JsSymbol('_LOWER_CASE_F');
+ let _hexValue = dart.JsSymbol('_hexValue');
+ let _isUnreservedChar = dart.JsSymbol('_isUnreservedChar');
+ let _unreservedTable = dart.JsSymbol('_unreservedTable');
+ let _schemeTable = dart.JsSymbol('_schemeTable');
+ let _genDelimitersTable = dart.JsSymbol('_genDelimitersTable');
let _merge = dart.JsSymbol('_merge');
+ let _DOT = dart.JsSymbol('_DOT');
let _hasDotSegments = dart.JsSymbol('_hasDotSegments');
let _removeDotSegments = dart.JsSymbol('_removeDotSegments');
let _toWindowsFilePath = dart.JsSymbol('_toWindowsFilePath');
let _toFilePath = dart.JsSymbol('_toFilePath');
let _isPathAbsolute = dart.JsSymbol('_isPathAbsolute');
- let _addIfNonEmpty$ = dart.JsSymbol('_addIfNonEmpty');
- let _uriEncode$ = dart.JsSymbol('_uriEncode');
- let _hexCharPairToByte$ = dart.JsSymbol('_hexCharPairToByte');
- let _uriDecode$ = dart.JsSymbol('_uriDecode');
- let _isAlphabeticCharacter$ = dart.JsSymbol('_isAlphabeticCharacter');
+ let _addIfNonEmpty = dart.JsSymbol('_addIfNonEmpty');
+ let _unreserved2396Table = dart.JsSymbol('_unreserved2396Table');
+ let _uriDecode = dart.JsSymbol('_uriDecode');
+ let _encodeFullTable = dart.JsSymbol('_encodeFullTable');
+ let _SPACE = dart.JsSymbol('_SPACE');
+ let _PLUS = dart.JsSymbol('_PLUS');
+ let _hexCharPairToByte = dart.JsSymbol('_hexCharPairToByte');
class Uri extends Object {
get authority() {
if (!dart.notNull(this.hasAuthority))
@@ -1687,10 +1725,10 @@ var core;
}
get port() {
if (this[_port] === null)
- return _defaultPort(this.scheme);
+ return Uri[_defaultPort](this.scheme);
return this[_port];
}
- static [_defaultPort$](scheme) {
+ static [_defaultPort](scheme) {
if (dart.equals(scheme, "http"))
return 80;
if (dart.equals(scheme, "https"))
@@ -1709,7 +1747,7 @@ var core;
static parse(uri) {
// Function isRegName: (int) → bool
function isRegName(ch) {
- return dart.notNull(ch) < 128 && dart.notNull(!dart.equals(dart.dbinary(Uri._regNameTable.get(dart.notNull(ch) >> 4), '&', 1 << (dart.notNull(ch) & 15)), 0));
+ return dart.notNull(ch) < 128 && dart.notNull(!dart.equals(dart.dbinary(Uri[_regNameTable].get(dart.notNull(ch) >> 4), '&', 1 << (dart.notNull(ch) & 15)), 0));
}
let EOI = -1;
let scheme = "";
@@ -1734,15 +1772,15 @@ var core;
char = uri.codeUnitAt(index);
while (dart.notNull(index) < dart.notNull(uri.length)) {
char = uri.codeUnitAt(index);
- if (char === Uri._SLASH || char === Uri._QUESTION || char === Uri._NUMBER_SIGN) {
+ if (char === Uri[_SLASH] || char === Uri[_QUESTION] || char === Uri[_NUMBER_SIGN]) {
break;
}
- if (char === Uri._AT_SIGN) {
+ if (char === Uri[_AT_SIGN]) {
lastAt = index;
lastColon = -1;
- } else if (char === Uri._COLON) {
+ } else if (char === Uri[_COLON]) {
lastColon = index;
- } else if (char === Uri._LEFT_BRACKET) {
+ } else if (char === Uri[_LEFT_BRACKET]) {
lastColon = -1;
let endBracket = uri.indexOf(']', dart.notNull(index) + 1);
if (endBracket === -1) {
@@ -1759,7 +1797,7 @@ var core;
let hostStart = authStart;
let hostEnd = index;
if (dart.notNull(lastAt) >= 0) {
- userinfo = _makeUserInfo(uri, authStart, lastAt);
+ userinfo = Uri[_makeUserInfo](uri, authStart, lastAt);
hostStart = dart.notNull(lastAt) + 1;
}
if (dart.notNull(lastColon) >= 0) {
@@ -1768,16 +1806,16 @@ var core;
portNumber = 0;
for (let i = dart.notNull(lastColon) + 1; dart.notNull(i) < dart.notNull(index); i = dart.notNull(i) + 1) {
let digit = uri.codeUnitAt(i);
- if (dart.notNull(Uri._ZERO) > dart.notNull(digit) || dart.notNull(Uri._NINE) < dart.notNull(digit)) {
- _fail(uri, i, "Invalid port number");
+ if (dart.notNull(Uri[_ZERO]) > dart.notNull(digit) || dart.notNull(Uri[_NINE]) < dart.notNull(digit)) {
+ Uri[_fail](uri, i, "Invalid port number");
}
- portNumber = dart.notNull(portNumber) * 10 + (dart.notNull(digit) - dart.notNull(Uri._ZERO));
+ portNumber = dart.notNull(portNumber) * 10 + (dart.notNull(digit) - dart.notNull(Uri[_ZERO]));
}
}
- port = _makePort(portNumber, scheme);
+ port = Uri[_makePort](portNumber, scheme);
hostEnd = lastColon;
}
- host = _makeHost(uri, hostStart, hostEnd, true);
+ host = Uri[_makeHost](uri, hostStart, hostEnd, true);
if (dart.notNull(index) < dart.notNull(uri.length)) {
char = uri.codeUnitAt(index);
}
@@ -1789,18 +1827,18 @@ var core;
let i = index;
while (dart.notNull(i) < dart.notNull(uri.length)) {
char = uri.codeUnitAt(i);
- if (char === Uri._QUESTION || char === Uri._NUMBER_SIGN) {
+ if (char === Uri[_QUESTION] || char === Uri[_NUMBER_SIGN]) {
state = NOT_IN_PATH;
break;
}
- if (char === Uri._SLASH) {
+ if (char === Uri[_SLASH]) {
state = i === 0 ? ALLOW_AUTH : IN_PATH;
break;
}
- if (char === Uri._COLON) {
+ if (char === Uri[_COLON]) {
if (i === 0)
- _fail(uri, 0, "Invalid empty scheme");
- scheme = _makeScheme(uri, i);
+ Uri[_fail](uri, 0, "Invalid empty scheme");
+ scheme = Uri[_makeScheme](uri, i);
i = dart.notNull(i) + 1;
pathStart = i;
if (i === uri.length) {
@@ -1808,9 +1846,9 @@ var core;
state = NOT_IN_PATH;
} else {
char = uri.codeUnitAt(i);
- if (char === Uri._QUESTION || char === Uri._NUMBER_SIGN) {
+ if (char === Uri[_QUESTION] || char === Uri[_NUMBER_SIGN]) {
state = NOT_IN_PATH;
- } else if (char === Uri._SLASH) {
+ } else if (char === Uri[_SLASH]) {
state = ALLOW_AUTH;
} else {
state = IN_PATH;
@@ -1823,19 +1861,19 @@ var core;
}
index = i;
if (state === ALLOW_AUTH) {
- dart.assert(char === Uri._SLASH);
+ dart.assert(char === Uri[_SLASH]);
index = dart.notNull(index) + 1;
if (index === uri.length) {
char = EOI;
state = NOT_IN_PATH;
} else {
char = uri.codeUnitAt(index);
- if (char === Uri._SLASH) {
+ if (char === Uri[_SLASH]) {
index = dart.notNull(index) + 1;
parseAuth();
pathStart = index;
}
- if (char === Uri._QUESTION || char === Uri._NUMBER_SIGN || char === EOI) {
+ if (char === Uri[_QUESTION] || char === Uri[_NUMBER_SIGN] || char === EOI) {
state = NOT_IN_PATH;
} else {
state = IN_PATH;
@@ -1846,7 +1884,7 @@ var core;
if (state === IN_PATH) {
while ((index = dart.notNull(index) + 1) < dart.notNull(uri.length)) {
char = uri.codeUnitAt(index);
- if (char === Uri._QUESTION || char === Uri._NUMBER_SIGN) {
+ if (char === Uri[_QUESTION] || char === Uri[_NUMBER_SIGN]) {
break;
}
char = EOI;
@@ -1856,21 +1894,21 @@ var core;
dart.assert(state === NOT_IN_PATH);
let isFile = dart.equals(scheme, "file");
let ensureLeadingSlash = host !== null;
- path = _makePath(uri, pathStart, index, null, ensureLeadingSlash, isFile);
- if (char === Uri._QUESTION) {
+ path = Uri[_makePath](uri, pathStart, index, null, ensureLeadingSlash, isFile);
+ if (char === Uri[_QUESTION]) {
let numberSignIndex = uri.indexOf('#', dart.notNull(index) + 1);
if (dart.notNull(numberSignIndex) < 0) {
- query = _makeQuery(uri, dart.notNull(index) + 1, uri.length, null);
+ query = Uri[_makeQuery](uri, dart.notNull(index) + 1, uri.length, null);
} else {
- query = _makeQuery(uri, dart.notNull(index) + 1, numberSignIndex, null);
- fragment = _makeFragment(uri, dart.notNull(numberSignIndex) + 1, uri.length);
+ query = Uri[_makeQuery](uri, dart.notNull(index) + 1, numberSignIndex, null);
+ fragment = Uri[_makeFragment](uri, dart.notNull(numberSignIndex) + 1, uri.length);
}
- } else if (char === Uri._NUMBER_SIGN) {
- fragment = _makeFragment(uri, dart.notNull(index) + 1, uri.length);
+ } else if (char === Uri[_NUMBER_SIGN]) {
+ fragment = Uri[_makeFragment](uri, dart.notNull(index) + 1, uri.length);
}
return new Uri._internal(scheme, userinfo, host, port, path, query, fragment);
}
- static [_fail$](uri, index, message) {
+ static [_fail](uri, index, message) {
throw new FormatException(message, uri, index);
}
Uri$_internal(scheme, userInfo$, host$, port$, path$, query$, fragment$) {
@@ -1894,33 +1932,33 @@ var core;
let query = opts && 'query' in opts ? opts.query : null;
let queryParameters = opts && 'queryParameters' in opts ? opts.queryParameters : null;
let fragment = opts && 'fragment' in opts ? opts.fragment : null;
- scheme = _makeScheme(scheme, _stringOrNullLength(scheme));
- userInfo = _makeUserInfo(userInfo, 0, _stringOrNullLength(userInfo));
- host = _makeHost(host, 0, _stringOrNullLength(host), false);
+ scheme = Uri[_makeScheme](scheme, Uri[_stringOrNullLength](scheme));
+ userInfo = Uri[_makeUserInfo](userInfo, 0, Uri[_stringOrNullLength](userInfo));
+ host = Uri[_makeHost](host, 0, Uri[_stringOrNullLength](host), false);
if (dart.equals(query, ""))
query = null;
- query = _makeQuery(query, 0, _stringOrNullLength(query), queryParameters);
- fragment = _makeFragment(fragment, 0, _stringOrNullLength(fragment));
- port = _makePort(port, scheme);
+ query = Uri[_makeQuery](query, 0, Uri[_stringOrNullLength](query), queryParameters);
+ fragment = Uri[_makeFragment](fragment, 0, Uri[_stringOrNullLength](fragment));
+ port = Uri[_makePort](port, scheme);
let isFile = dart.equals(scheme, "file");
if (dart.notNull(host === null) && (dart.notNull(userInfo.isNotEmpty) || port !== null || dart.notNull(isFile))) {
host = "";
}
let ensureLeadingSlash = host !== null;
- path = _makePath(path, 0, _stringOrNullLength(path), pathSegments, ensureLeadingSlash, isFile);
+ path = Uri[_makePath](path, 0, Uri[_stringOrNullLength](path), pathSegments, ensureLeadingSlash, isFile);
return new Uri._internal(scheme, userInfo, host, port, path, query, fragment);
}
Uri$http(authority, unencodedPath, queryParameters) {
if (queryParameters === void 0)
queryParameters = null;
- return _makeHttpUri("http", authority, unencodedPath, queryParameters);
+ return Uri[_makeHttpUri]("http", authority, unencodedPath, queryParameters);
}
Uri$https(authority, unencodedPath, queryParameters) {
if (queryParameters === void 0)
queryParameters = null;
- return _makeHttpUri("https", authority, unencodedPath, queryParameters);
+ return Uri[_makeHttpUri]("https", authority, unencodedPath, queryParameters);
}
- static [_makeHttpUri$](scheme, authority, unencodedPath, queryParameters) {
+ static [_makeHttpUri](scheme, authority, unencodedPath, queryParameters) {
let userInfo = "";
let host = null;
let port = null;
@@ -1928,7 +1966,7 @@ var core;
let hostStart = 0;
let hasUserInfo = false;
for (let i = 0; dart.notNull(i) < dart.notNull(authority.length); i = dart.notNull(i) + 1) {
- if (authority.codeUnitAt(i) === Uri._AT_SIGN) {
+ if (authority.codeUnitAt(i) === Uri[_AT_SIGN]) {
hasUserInfo = true;
userInfo = authority.substring(0, i);
hostStart = dart.notNull(i) + 1;
@@ -1936,23 +1974,23 @@ var core;
}
}
let hostEnd = hostStart;
- if (dart.notNull(hostStart) < dart.notNull(authority.length) && authority.codeUnitAt(hostStart) === Uri._LEFT_BRACKET) {
+ if (dart.notNull(hostStart) < dart.notNull(authority.length) && authority.codeUnitAt(hostStart) === Uri[_LEFT_BRACKET]) {
for (; dart.notNull(hostEnd) < dart.notNull(authority.length); hostEnd = dart.notNull(hostEnd) + 1) {
- if (authority.codeUnitAt(hostEnd) === Uri._RIGHT_BRACKET)
+ if (authority.codeUnitAt(hostEnd) === Uri[_RIGHT_BRACKET])
break;
}
if (hostEnd === authority.length) {
throw new FormatException("Invalid IPv6 host entry.", authority, hostStart);
}
- parseIPv6Address(authority, dart.notNull(hostStart) + 1, hostEnd);
+ Uri.parseIPv6Address(authority, dart.notNull(hostStart) + 1, hostEnd);
hostEnd = dart.notNull(hostEnd) + 1;
- if (hostEnd !== authority.length && authority.codeUnitAt(hostEnd) !== Uri._COLON) {
+ if (hostEnd !== authority.length && authority.codeUnitAt(hostEnd) !== Uri[_COLON]) {
throw new FormatException("Invalid end of authority", authority, hostEnd);
}
}
let hasPort = false;
for (; dart.notNull(hostEnd) < dart.notNull(authority.length); hostEnd = dart.notNull(hostEnd) + 1) {
- if (authority.codeUnitAt(hostEnd) === Uri._COLON) {
+ if (authority.codeUnitAt(hostEnd) === Uri[_COLON]) {
let portString = authority.substring(dart.notNull(hostEnd) + 1);
if (portString.isNotEmpty)
port = int.parse(portString);
@@ -1965,8 +2003,8 @@ var core;
}
Uri$file(path, opts) {
let windows = opts && 'windows' in opts ? opts.windows : null;
- windows = windows === null ? Uri[_isWindows$] : windows;
- return dart.as(windows ? _makeWindowsFileUrl(path) : _makeFileUri(path), Uri);
+ windows = windows === null ? Uri[_isWindows] : windows;
+ return dart.as(windows ? Uri[_makeWindowsFileUrl](path) : Uri[_makeFileUri](path), Uri);
}
static get base() {
let uri = _js_helper.Primitives.currentUri();
@@ -1974,10 +2012,10 @@ var core;
return Uri.parse(uri);
throw new UnsupportedError("'Uri.base' is not supported");
}
- static get [_isWindows$]() {
+ static get [_isWindows]() {
return false;
}
- static [_checkNonWindowsPathReservedCharacters$](segments, argumentError) {
+ static [_checkNonWindowsPathReservedCharacters](segments, argumentError) {
segments.forEach(dart.closureWrap((segment) => {
if (dart.dinvoke(segment, 'contains', "/")) {
if (argumentError) {
@@ -1988,7 +2026,7 @@ var core;
}
}, "(String) → void"));
}
- static [_checkWindowsPathReservedCharacters$](segments, argumentError, firstSegment) {
+ static [_checkWindowsPathReservedCharacters](segments, argumentError, firstSegment) {
if (firstSegment === void 0)
firstSegment = 0;
segments.skip(firstSegment).forEach(dart.closureWrap((segment) => {
@@ -2001,8 +2039,8 @@ var core;
}
}, "(String) → void"));
}
- static [_checkWindowsDriveLetter$](charCode, argumentError) {
- if (dart.notNull(Uri._UPPER_CASE_A) <= dart.notNull(charCode) && dart.notNull(charCode) <= dart.notNull(Uri._UPPER_CASE_Z) || dart.notNull(Uri._LOWER_CASE_A) <= dart.notNull(charCode) && dart.notNull(charCode) <= dart.notNull(Uri._LOWER_CASE_Z)) {
+ static [_checkWindowsDriveLetter](charCode, argumentError) {
+ if (dart.notNull(Uri[_UPPER_CASE_A]) <= dart.notNull(charCode) && dart.notNull(charCode) <= dart.notNull(Uri[_UPPER_CASE_Z]) || dart.notNull(Uri[_LOWER_CASE_A]) <= dart.notNull(charCode) && dart.notNull(charCode) <= dart.notNull(Uri[_LOWER_CASE_Z])) {
return;
}
if (argumentError) {
@@ -2011,7 +2049,7 @@ var core;
throw new UnsupportedError(String['+']("Illegal drive letter ", new String.fromCharCode(charCode)));
}
}
- static [_makeFileUri$](path) {
+ static [_makeFileUri](path) {
let sep = "/";
if (path.startsWith(sep)) {
return new Uri({scheme: "file", pathSegments: path.split(sep)});
@@ -2019,13 +2057,13 @@ var core;
return new Uri({pathSegments: path.split(sep)});
}
}
- static [_makeWindowsFileUrl$](path) {
+ static [_makeWindowsFileUrl](path) {
if (path.startsWith("\\\\?\\")) {
if (path.startsWith("\\\\?\\UNC\\")) {
path = `\\${path.substring(7)}`;
} else {
path = path.substring(4);
- if (dart.notNull(path.length) < 3 || path.codeUnitAt(1) !== Uri._COLON || path.codeUnitAt(2) !== Uri._BACKSLASH) {
+ if (dart.notNull(path.length) < 3 || path.codeUnitAt(1) !== Uri[_COLON] || path.codeUnitAt(2) !== Uri[_BACKSLASH]) {
throw new ArgumentError("Windows paths with \\\\?\\ prefix must be absolute");
}
}
@@ -2034,12 +2072,12 @@ var core;
}
let sep = "\\";
if (dart.notNull(path.length) > 1 && dart.notNull(dart.equals(path.get(1), ":"))) {
- _checkWindowsDriveLetter(path.codeUnitAt(0), true);
- if (path.length === 2 || path.codeUnitAt(2) !== Uri._BACKSLASH) {
+ Uri[_checkWindowsDriveLetter](path.codeUnitAt(0), true);
+ if (path.length === 2 || path.codeUnitAt(2) !== Uri[_BACKSLASH]) {
throw new ArgumentError("Windows paths with drive letter must be absolute");
}
let pathSegments = path.split(sep);
- _checkWindowsPathReservedCharacters(pathSegments, true, 1);
+ Uri[_checkWindowsPathReservedCharacters](pathSegments, true, 1);
return new Uri({scheme: "file", pathSegments: pathSegments});
}
if (dart.notNull(path.length) > 0 && dart.notNull(dart.equals(path.get(0), sep))) {
@@ -2048,16 +2086,16 @@ var core;
let hostPart = pathStart === -1 ? path.substring(2) : path.substring(2, pathStart);
let pathPart = pathStart === -1 ? "" : path.substring(dart.notNull(pathStart) + 1);
let pathSegments = pathPart.split(sep);
- _checkWindowsPathReservedCharacters(pathSegments, true);
+ Uri[_checkWindowsPathReservedCharacters](pathSegments, true);
return new Uri({scheme: "file", host: hostPart, pathSegments: pathSegments});
} else {
let pathSegments = path.split(sep);
- _checkWindowsPathReservedCharacters(pathSegments, true);
+ Uri[_checkWindowsPathReservedCharacters](pathSegments, true);
return new Uri({scheme: "file", pathSegments: pathSegments});
}
} else {
let pathSegments = path.split(sep);
- _checkWindowsPathReservedCharacters(pathSegments, true);
+ Uri[_checkWindowsPathReservedCharacters](pathSegments, true);
return new Uri({pathSegments: pathSegments});
}
}
@@ -2073,27 +2111,27 @@ var core;
let fragment = opts && 'fragment' in opts ? opts.fragment : null;
let schemeChanged = false;
if (scheme !== null) {
- scheme = _makeScheme(scheme, scheme.length);
+ scheme = Uri[_makeScheme](scheme, scheme.length);
schemeChanged = true;
} else {
scheme = this.scheme;
}
let isFile = dart.equals(scheme, "file");
if (userInfo !== null) {
- userInfo = _makeUserInfo(userInfo, 0, userInfo.length);
+ userInfo = Uri[_makeUserInfo](userInfo, 0, userInfo.length);
} else {
userInfo = this.userInfo;
}
if (port !== null) {
- port = _makePort(port, scheme);
+ port = Uri[_makePort](port, scheme);
} else {
port = this[_port];
if (schemeChanged) {
- port = _makePort(port, scheme);
+ port = Uri[_makePort](port, scheme);
}
}
if (host !== null) {
- host = _makeHost(host, 0, host.length, false);
+ host = Uri[_makeHost](host, 0, host.length, false);
} else if (this.hasAuthority) {
host = this.host;
} else if (dart.notNull(userInfo.isNotEmpty) || port !== null || dart.notNull(isFile)) {
@@ -2101,7 +2139,7 @@ var core;
}
let ensureLeadingSlash = host !== null;
if (dart.notNull(path !== null) || dart.notNull(pathSegments !== null)) {
- path = _makePath(path, 0, _stringOrNullLength(path), pathSegments, ensureLeadingSlash, isFile);
+ path = Uri[_makePath](path, 0, Uri[_stringOrNullLength](path), pathSegments, ensureLeadingSlash, isFile);
} else {
path = this.path;
if ((dart.notNull(isFile) || dart.notNull(ensureLeadingSlash) && !dart.notNull(path.isEmpty)) && !dart.notNull(path.startsWith('/'))) {
@@ -2109,12 +2147,12 @@ var core;
}
}
if (dart.notNull(query !== null) || dart.notNull(queryParameters !== null)) {
- query = _makeQuery(query, 0, _stringOrNullLength(query), queryParameters);
+ query = Uri[_makeQuery](query, 0, Uri[_stringOrNullLength](query), queryParameters);
} else if (this.hasQuery) {
query = this.query;
}
if (fragment !== null) {
- fragment = _makeFragment(fragment, 0, fragment.length);
+ fragment = Uri[_makeFragment](fragment, 0, fragment.length);
} else if (this.hasFragment) {
fragment = this.fragment;
}
@@ -2122,56 +2160,56 @@ var core;
}
get pathSegments() {
if (this[_pathSegments] === null) {
- let pathToSplit = !dart.notNull(this.path.isEmpty) && this.path.codeUnitAt(0) === Uri._SLASH ? this.path.substring(1) : this.path;
+ let pathToSplit = !dart.notNull(this.path.isEmpty) && this.path.codeUnitAt(0) === Uri[_SLASH] ? this.path.substring(1) : this.path;
this[_pathSegments] = dart.as(new collection.UnmodifiableListView(dart.equals(pathToSplit, "") ? /* Unimplemented const */new List.from([]) : pathToSplit.split("/").map(Uri.decodeComponent).toList({growable: false})), List$(String));
}
return this[_pathSegments];
}
get queryParameters() {
if (this[_queryParameters] === null) {
- this[_queryParameters] = dart.as(new collection.UnmodifiableMapView(splitQueryString(this.query)), Map$(String, String));
+ this[_queryParameters] = dart.as(new collection.UnmodifiableMapView(Uri.splitQueryString(this.query)), Map$(String, String));
}
return this[_queryParameters];
}
- static [_makePort$](port, scheme) {
- if (port !== null && port === _defaultPort(scheme))
+ static [_makePort](port, scheme) {
+ if (port !== null && port === Uri[_defaultPort](scheme))
return null;
return port;
}
- static [_makeHost$](host, start, end, strictIPv6) {
+ static [_makeHost](host, start, end, strictIPv6) {
if (host === null)
return null;
if (start === end)
return "";
- if (host.codeUnitAt(start) === Uri._LEFT_BRACKET) {
- if (host.codeUnitAt(dart.notNull(end) - 1) !== Uri._RIGHT_BRACKET) {
- _fail(host, start, 'Missing end `]` to match `[` in host');
+ if (host.codeUnitAt(start) === Uri[_LEFT_BRACKET]) {
+ if (host.codeUnitAt(dart.notNull(end) - 1) !== Uri[_RIGHT_BRACKET]) {
+ Uri[_fail](host, start, 'Missing end `]` to match `[` in host');
}
- parseIPv6Address(host, dart.notNull(start) + 1, dart.notNull(end) - 1);
+ Uri.parseIPv6Address(host, dart.notNull(start) + 1, dart.notNull(end) - 1);
return host.substring(start, end).toLowerCase();
}
if (!dart.notNull(strictIPv6)) {
for (let i = start; dart.notNull(i) < dart.notNull(end); i = dart.notNull(i) + 1) {
- if (host.codeUnitAt(i) === Uri._COLON) {
- parseIPv6Address(host, start, end);
+ if (host.codeUnitAt(i) === Uri[_COLON]) {
+ Uri.parseIPv6Address(host, start, end);
return `[${host}]`;
}
}
}
- return _normalizeRegName(host, start, end);
+ return Uri[_normalizeRegName](host, start, end);
}
- static [_isRegNameChar$](char) {
- return dart.notNull(char) < 127 && dart.notNull(!dart.equals(dart.dbinary(Uri._regNameTable.get(dart.notNull(char) >> 4), '&', 1 << (dart.notNull(char) & 15)), 0));
+ static [_isRegNameChar](char) {
+ return dart.notNull(char) < 127 && dart.notNull(!dart.equals(dart.dbinary(Uri[_regNameTable].get(dart.notNull(char) >> 4), '&', 1 << (dart.notNull(char) & 15)), 0));
}
- static [_normalizeRegName$](host, start, end) {
+ static [_normalizeRegName](host, start, end) {
let buffer = null;
let sectionStart = start;
let index = start;
let isNormalized = true;
while (dart.notNull(index) < dart.notNull(end)) {
let char = host.codeUnitAt(index);
- if (char === Uri._PERCENT) {
- let replacement = _normalizeEscape(host, index, true);
+ if (char === Uri[_PERCENT]) {
+ let replacement = Uri[_normalizeEscape](host, index, true);
if (dart.notNull(replacement === null) && dart.notNull(isNormalized)) {
index = 3;
continue;
@@ -2193,8 +2231,8 @@ var core;
index = sourceLength;
sectionStart = index;
isNormalized = true;
- } else if (_isRegNameChar(char)) {
- if (dart.notNull(isNormalized) && dart.notNull(Uri._UPPER_CASE_A) <= dart.notNull(char) && dart.notNull(Uri._UPPER_CASE_Z) >= dart.notNull(char)) {
+ } else if (Uri[_isRegNameChar](char)) {
+ if (dart.notNull(isNormalized) && dart.notNull(Uri[_UPPER_CASE_A]) <= dart.notNull(char) && dart.notNull(Uri[_UPPER_CASE_Z]) >= dart.notNull(char)) {
if (buffer === null)
buffer = new StringBuffer();
if (dart.notNull(sectionStart) < dart.notNull(index)) {
@@ -2204,8 +2242,8 @@ var core;
isNormalized = false;
}
index = dart.notNull(index) + 1;
- } else if (_isGeneralDelimiter(char)) {
- _fail(host, index, "Invalid character");
+ } else if (Uri[_isGeneralDelimiter](char)) {
+ Uri[_fail](host, index, "Invalid character");
} else {
let sourceLength = 1;
if ((dart.notNull(char) & 64512) === 55296 && dart.notNull(index) + 1 < dart.notNull(end)) {
@@ -2221,7 +2259,7 @@ var core;
if (!dart.notNull(isNormalized))
slice = slice.toLowerCase();
buffer.write(slice);
- buffer.write(_escapeChar(char));
+ buffer.write(Uri[_escapeChar](char));
index = sourceLength;
sectionStart = index;
}
@@ -2236,20 +2274,20 @@ var core;
}
return buffer.toString();
}
- static [_makeScheme$](scheme, end) {
+ static [_makeScheme](scheme, end) {
if (end === 0)
return "";
let firstCodeUnit = scheme.codeUnitAt(0);
- if (!dart.notNull(_isAlphabeticCharacter(firstCodeUnit))) {
- _fail(scheme, 0, "Scheme not starting with alphabetic character");
+ if (!dart.notNull(Uri[_isAlphabeticCharacter](firstCodeUnit))) {
+ Uri[_fail](scheme, 0, "Scheme not starting with alphabetic character");
}
- let allLowercase = dart.notNull(firstCodeUnit) >= dart.notNull(Uri._LOWER_CASE_A);
+ let allLowercase = dart.notNull(firstCodeUnit) >= dart.notNull(Uri[_LOWER_CASE_A]);
for (let i = 0; dart.notNull(i) < dart.notNull(end); i = dart.notNull(i) + 1) {
let codeUnit = scheme.codeUnitAt(i);
- if (!dart.notNull(_isSchemeCharacter(codeUnit))) {
- _fail(scheme, i, "Illegal scheme character");
+ if (!dart.notNull(Uri[_isSchemeCharacter](codeUnit))) {
+ Uri[_fail](scheme, i, "Illegal scheme character");
}
- if (dart.notNull(codeUnit) < dart.notNull(Uri._LOWER_CASE_A) || dart.notNull(codeUnit) > dart.notNull(Uri._LOWER_CASE_Z)) {
+ if (dart.notNull(codeUnit) < dart.notNull(Uri[_LOWER_CASE_A]) || dart.notNull(codeUnit) > dart.notNull(Uri[_LOWER_CASE_Z])) {
allLowercase = false;
}
}
@@ -2258,12 +2296,12 @@ var core;
scheme = scheme.toLowerCase();
return scheme;
}
- static [_makeUserInfo$](userInfo, start, end) {
+ static [_makeUserInfo](userInfo, start, end) {
if (userInfo === null)
return "";
- return _normalize(userInfo, start, end, dart.as(Uri._userinfoTable, List$(int)));
+ return Uri[_normalize](userInfo, start, end, dart.as(Uri[_userinfoTable], List$(int)));
}
- static [_makePath$](path, start, end, pathSegments, ensureLeadingSlash, isFile) {
+ static [_makePath](path, start, end, pathSegments, ensureLeadingSlash, isFile) {
if (dart.notNull(path === null) && dart.notNull(pathSegments === null))
return isFile ? "/" : "";
if (dart.notNull(path !== null) && dart.notNull(pathSegments !== null)) {
@@ -2271,26 +2309,26 @@ var core;
}
let result = null;
if (path !== null) {
- result = _normalize(path, start, end, dart.as(Uri._pathCharOrSlashTable, List$(int)));
+ result = Uri[_normalize](path, start, end, dart.as(Uri[_pathCharOrSlashTable], List$(int)));
} else {
- result = pathSegments.map(dart.closureWrap((s) => _uriEncode(dart.as(Uri._pathCharTable, List$(int)), dart.as(s, String)), "(String) → dynamic")).join("/");
+ result = pathSegments.map(dart.closureWrap((s) => Uri[_uriEncode](dart.as(Uri[_pathCharTable], List$(int)), dart.as(s, String)), "(String) → dynamic")).join("/");
}
if (dart.dload(result, 'isEmpty')) {
if (isFile)
return "/";
- } else if ((dart.notNull(isFile) || dart.notNull(ensureLeadingSlash)) && dart.notNull(!dart.equals(dart.dinvoke(result, 'codeUnitAt', 0), Uri._SLASH))) {
+ } else if ((dart.notNull(isFile) || dart.notNull(ensureLeadingSlash)) && dart.notNull(!dart.equals(dart.dinvoke(result, 'codeUnitAt', 0), Uri[_SLASH]))) {
return `/${result}`;
}
return dart.as(result, String);
}
- static [_makeQuery$](query, start, end, queryParameters) {
+ static [_makeQuery](query, start, end, queryParameters) {
if (dart.notNull(query === null) && dart.notNull(queryParameters === null))
return null;
if (dart.notNull(query !== null) && dart.notNull(queryParameters !== null)) {
throw new ArgumentError('Both query and queryParameters specified');
}
if (query !== null)
- return _normalize(query, start, end, dart.as(Uri._queryCharTable, List$(int)));
+ return Uri[_normalize](query, start, end, dart.as(Uri[_queryCharTable], List$(int)));
let result = new StringBuffer();
let first = true;
queryParameters.forEach(dart.closureWrap(((key, value) => {
@@ -2306,59 +2344,59 @@ var core;
}).bind(this), "(String, String) → void"));
return result.toString();
}
- static [_makeFragment$](fragment, start, end) {
+ static [_makeFragment](fragment, start, end) {
if (fragment === null)
return null;
- return _normalize(fragment, start, end, dart.as(Uri._queryCharTable, List$(int)));
+ return Uri[_normalize](fragment, start, end, dart.as(Uri[_queryCharTable], List$(int)));
}
- static [_stringOrNullLength$](s) {
+ static [_stringOrNullLength](s) {
return s === null ? 0 : s.length;
}
- static [_isHexDigit$](char) {
- if (dart.notNull(Uri._NINE) >= dart.notNull(char))
- return dart.notNull(Uri._ZERO) <= dart.notNull(char);
+ static [_isHexDigit](char) {
+ if (dart.notNull(Uri[_NINE]) >= dart.notNull(char))
+ return dart.notNull(Uri[_ZERO]) <= dart.notNull(char);
char = 32;
- return dart.notNull(Uri._LOWER_CASE_A) <= dart.notNull(char) && dart.notNull(Uri._LOWER_CASE_F) >= dart.notNull(char);
+ return dart.notNull(Uri[_LOWER_CASE_A]) <= dart.notNull(char) && dart.notNull(Uri[_LOWER_CASE_F]) >= dart.notNull(char);
}
- static [_hexValue$](char) {
- dart.assert(_isHexDigit(char));
- if (dart.notNull(Uri._NINE) >= dart.notNull(char))
- return dart.notNull(char) - dart.notNull(Uri._ZERO);
+ static [_hexValue](char) {
+ dart.assert(Uri[_isHexDigit](char));
+ if (dart.notNull(Uri[_NINE]) >= dart.notNull(char))
+ return dart.notNull(char) - dart.notNull(Uri[_ZERO]);
char = 32;
- return dart.notNull(char) - (dart.notNull(Uri._LOWER_CASE_A) - 10);
+ return dart.notNull(char) - (dart.notNull(Uri[_LOWER_CASE_A]) - 10);
}
- static [_normalizeEscape$](source, index, lowerCase) {
- dart.assert(source.codeUnitAt(index) === Uri._PERCENT);
+ static [_normalizeEscape](source, index, lowerCase) {
+ dart.assert(source.codeUnitAt(index) === Uri[_PERCENT]);
if (dart.notNull(index) + 2 >= dart.notNull(source.length)) {
return "%";
}
let firstDigit = source.codeUnitAt(dart.notNull(index) + 1);
let secondDigit = source.codeUnitAt(dart.notNull(index) + 2);
- if (!dart.notNull(_isHexDigit(firstDigit)) || !dart.notNull(_isHexDigit(secondDigit))) {
+ if (!dart.notNull(Uri[_isHexDigit](firstDigit)) || !dart.notNull(Uri[_isHexDigit](secondDigit))) {
return "%";
}
- let value = dart.notNull(_hexValue(firstDigit)) * 16 + dart.notNull(_hexValue(secondDigit));
- if (_isUnreservedChar(value)) {
- if (dart.notNull(lowerCase) && dart.notNull(Uri._UPPER_CASE_A) <= dart.notNull(value) && dart.notNull(Uri._UPPER_CASE_Z) >= dart.notNull(value)) {
+ let value = dart.notNull(Uri[_hexValue](firstDigit)) * 16 + dart.notNull(Uri[_hexValue](secondDigit));
+ if (Uri[_isUnreservedChar](value)) {
+ if (dart.notNull(lowerCase) && dart.notNull(Uri[_UPPER_CASE_A]) <= dart.notNull(value) && dart.notNull(Uri[_UPPER_CASE_Z]) >= dart.notNull(value)) {
value = 32;
}
return new String.fromCharCode(value);
}
- if (dart.notNull(firstDigit) >= dart.notNull(Uri._LOWER_CASE_A) || dart.notNull(secondDigit) >= dart.notNull(Uri._LOWER_CASE_A)) {
+ if (dart.notNull(firstDigit) >= dart.notNull(Uri[_LOWER_CASE_A]) || dart.notNull(secondDigit) >= dart.notNull(Uri[_LOWER_CASE_A])) {
return source.substring(index, dart.notNull(index) + 3).toUpperCase();
}
return null;
}
- static [_isUnreservedChar$](ch) {
- return dart.notNull(ch) < 127 && dart.notNull(!dart.equals(dart.dbinary(Uri._unreservedTable.get(dart.notNull(ch) >> 4), '&', 1 << (dart.notNull(ch) & 15)), 0));
+ static [_isUnreservedChar](ch) {
+ return dart.notNull(ch) < 127 && dart.notNull(!dart.equals(dart.dbinary(Uri[_unreservedTable].get(dart.notNull(ch) >> 4), '&', 1 << (dart.notNull(ch) & 15)), 0));
}
- static [_escapeChar$](char) {
+ static [_escapeChar](char) {
dart.assert(dart.dbinary(char, '<=', 1114111));
let hexDigits = "0123456789ABCDEF";
let codeUnits = null;
if (dart.dbinary(char, '<', 128)) {
codeUnits = new List(3);
- codeUnits.set(0, Uri._PERCENT);
+ codeUnits.set(0, Uri[_PERCENT]);
codeUnits.set(1, hexDigits.codeUnitAt(dart.as(dart.dbinary(char, '>>', 4), int)));
codeUnits.set(2, hexDigits.codeUnitAt(dart.as(dart.dbinary(char, '&', 15), int)));
} else {
@@ -2376,7 +2414,7 @@ var core;
let index = 0;
while ((encodedBytes = dart.notNull(encodedBytes) - 1) >= 0) {
let byte = dart.as(dart.dbinary(dart.dbinary(dart.dbinary(char, '>>', 6 * dart.notNull(encodedBytes)), '&', 63), '|', flag), int);
- codeUnits.set(index, Uri._PERCENT);
+ codeUnits.set(index, Uri[_PERCENT]);
codeUnits.set(dart.notNull(index) + 1, hexDigits.codeUnitAt(dart.notNull(byte) >> 4));
codeUnits.set(dart.notNull(index) + 2, hexDigits.codeUnitAt(dart.notNull(byte) & 15));
index = 3;
@@ -2385,7 +2423,7 @@ var core;
}
return new String.fromCharCodes(dart.as(codeUnits, Iterable$(int)));
}
- static [_normalize$](component, start, end, charTable) {
+ static [_normalize](component, start, end, charTable) {
let buffer = null;
let sectionStart = start;
let index = start;
@@ -2396,8 +2434,8 @@ var core;
} else {
let replacement = null;
let sourceLength = null;
- if (char === Uri._PERCENT) {
- replacement = _normalizeEscape(component, index, false);
+ if (char === Uri[_PERCENT]) {
+ replacement = Uri[_normalizeEscape](component, index, false);
if (replacement === null) {
index = 3;
continue;
@@ -2408,8 +2446,8 @@ var core;
} else {
sourceLength = 3;
}
- } else if (_isGeneralDelimiter(char)) {
- _fail(component, index, "Invalid character");
+ } else if (Uri[_isGeneralDelimiter](char)) {
+ Uri[_fail](component, index, "Invalid character");
} else {
sourceLength = 1;
if ((dart.notNull(char) & 64512) === 55296) {
@@ -2421,7 +2459,7 @@ var core;
}
}
}
- replacement = _escapeChar(char);
+ replacement = Uri[_escapeChar](char);
}
if (buffer === null)
buffer = new StringBuffer();
@@ -2439,11 +2477,11 @@ var core;
}
return buffer.toString();
}
- static [_isSchemeCharacter$](ch) {
- return dart.notNull(ch) < 128 && dart.notNull(!dart.equals(dart.dbinary(Uri._schemeTable.get(dart.notNull(ch) >> 4), '&', 1 << (dart.notNull(ch) & 15)), 0));
+ static [_isSchemeCharacter](ch) {
+ return dart.notNull(ch) < 128 && dart.notNull(!dart.equals(dart.dbinary(Uri[_schemeTable].get(dart.notNull(ch) >> 4), '&', 1 << (dart.notNull(ch) & 15)), 0));
}
- static [_isGeneralDelimiter$](ch) {
- return dart.notNull(ch) <= dart.notNull(Uri._RIGHT_BRACKET) && dart.notNull(!dart.equals(dart.dbinary(Uri._genDelimitersTable.get(dart.notNull(ch) >> 4), '&', 1 << (dart.notNull(ch) & 15)), 0));
+ static [_isGeneralDelimiter](ch) {
+ return dart.notNull(ch) <= dart.notNull(Uri[_RIGHT_BRACKET]) && dart.notNull(!dart.equals(dart.dbinary(Uri[_genDelimitersTable].get(dart.notNull(ch) >> 4), '&', 1 << (dart.notNull(ch) & 15)), 0));
}
get isAbsolute() {
return dart.notNull(!dart.equals(this.scheme, "")) && dart.notNull(dart.equals(this.fragment, ""));
@@ -2464,7 +2502,7 @@ var core;
break;
}
let delta = dart.notNull(baseEnd) - dart.notNull(newEnd);
- if ((delta === 2 || delta === 3) && base.codeUnitAt(dart.notNull(newEnd) + 1) === Uri._DOT && (delta === 2 || base.codeUnitAt(dart.notNull(newEnd) + 2) === Uri._DOT)) {
+ if ((delta === 2 || delta === 3) && base.codeUnitAt(dart.notNull(newEnd) + 1) === Uri[_DOT] && (delta === 2 || base.codeUnitAt(dart.notNull(newEnd) + 2) === Uri[_DOT])) {
break;
}
baseEnd = newEnd;
@@ -2473,7 +2511,7 @@ var core;
return String['+'](base.substring(0, dart.notNull(baseEnd) + 1), reference.substring(dart.notNull(refStart) - 3 * dart.notNull(backCount)));
}
[_hasDotSegments](path) {
- if (dart.notNull(path.length) > 0 && path.codeUnitAt(0) === Uri._DOT)
+ if (dart.notNull(path.length) > 0 && path.codeUnitAt(0) === Uri[_DOT])
return true;
let index = path.indexOf("/.");
return index !== -1;
@@ -2525,7 +2563,7 @@ var core;
if (reference.hasAuthority) {
targetUserInfo = reference.userInfo;
targetHost = reference.host;
- targetPort = _makePort(reference.hasPort ? reference.port : null, targetScheme);
+ targetPort = Uri[_makePort](reference.hasPort ? reference.port : null, targetScheme);
targetPath = this[_removeDotSegments](reference.path);
if (reference.hasQuery)
targetQuery = reference.query;
@@ -2589,14 +2627,14 @@ var core;
throw new UnsupportedError("Cannot extract a file path from a URI with a fragment component");
}
if (windows === null)
- windows = _isWindows;
+ windows = Uri[_isWindows];
return windows ? this[_toWindowsFilePath]() : this[_toFilePath]();
}
[_toFilePath]() {
if (!dart.equals(this.host, "")) {
throw new UnsupportedError("Cannot extract a non-Windows file path from a file URI " + "with an authority");
}
- _checkNonWindowsPathReservedCharacters(this.pathSegments, false);
+ Uri[_checkNonWindowsPathReservedCharacters](this.pathSegments, false);
let result = new StringBuffer();
if (this[_isPathAbsolute])
result.write("/");
@@ -2606,12 +2644,12 @@ var core;
[_toWindowsFilePath]() {
let hasDriveLetter = false;
let segments = this.pathSegments;
- if (dart.notNull(segments.length) > 0 && segments.get(0).length === 2 && segments.get(0).codeUnitAt(1) === Uri._COLON) {
- _checkWindowsDriveLetter(segments.get(0).codeUnitAt(0), false);
- _checkWindowsPathReservedCharacters(segments, false, 1);
+ if (dart.notNull(segments.length) > 0 && segments.get(0).length === 2 && segments.get(0).codeUnitAt(1) === Uri[_COLON]) {
+ Uri[_checkWindowsDriveLetter](segments.get(0).codeUnitAt(0), false);
+ Uri[_checkWindowsPathReservedCharacters](segments, false, 1);
hasDriveLetter = true;
} else {
- _checkWindowsPathReservedCharacters(segments, false);
+ Uri[_checkWindowsPathReservedCharacters](segments, false);
}
let result = new StringBuffer();
if (dart.notNull(this[_isPathAbsolute]) && !dart.notNull(hasDriveLetter))
@@ -2645,7 +2683,7 @@ var core;
}
toString() {
let sb = new StringBuffer();
- _addIfNonEmpty(sb, this.scheme, this.scheme, ':');
+ Uri[_addIfNonEmpty](sb, this.scheme, this.scheme, ':');
if (dart.notNull(this.hasAuthority) || dart.notNull(this.path.startsWith("//")) || dart.notNull(dart.equals(this.scheme, "file"))) {
sb.write("//");
this[_writeAuthority](sb);
@@ -2674,31 +2712,31 @@ var core;
}
return combine(this.scheme, combine(this.userInfo, combine(this.host, combine(this.port, combine(this.path, combine(this.query, combine(this.fragment, 1)))))));
}
- static [_addIfNonEmpty$](sb, test, first, second) {
+ static [_addIfNonEmpty](sb, test, first, second) {
if (!dart.equals("", test)) {
sb.write(first);
sb.write(second);
}
}
static encodeComponent(component) {
- return _uriEncode(dart.as(Uri._unreserved2396Table, List$(int)), component);
+ return Uri[_uriEncode](dart.as(Uri[_unreserved2396Table], List$(int)), component);
}
static encodeQueryComponent(component, opts) {
let encoding = opts && 'encoding' in opts ? opts.encoding : convert.UTF8;
- return _uriEncode(dart.as(Uri._unreservedTable, List$(int)), component, {encoding: encoding, spaceToPlus: true});
+ return Uri[_uriEncode](dart.as(Uri[_unreservedTable], List$(int)), component, {encoding: encoding, spaceToPlus: true});
}
static decodeComponent(encodedComponent) {
- return _uriDecode(encodedComponent);
+ return Uri[_uriDecode](encodedComponent);
}
static decodeQueryComponent(encodedComponent, opts) {
let encoding = opts && 'encoding' in opts ? opts.encoding : convert.UTF8;
- return _uriDecode(encodedComponent, {plusToSpace: true, encoding: encoding});
+ return Uri[_uriDecode](encodedComponent, {plusToSpace: true, encoding: encoding});
}
static encodeFull(uri) {
- return _uriEncode(dart.as(Uri._encodeFullTable, List$(int)), uri);
+ return Uri[_uriEncode](dart.as(Uri[_encodeFullTable], List$(int)), uri);
}
static decodeFull(uri) {
- return _uriDecode(uri);
+ return Uri[_uriDecode](uri);
}
static splitQueryString(query, opts) {
let encoding = opts && 'encoding' in opts ? opts.encoding : convert.UTF8;
@@ -2706,12 +2744,12 @@ var core;
let index = dart.as(dart.dinvoke(element, 'indexOf', "="), int);
if (index === -1) {
if (!dart.equals(element, "")) {
- dart.dsetindex(map, decodeQueryComponent(dart.as(element, String), {encoding: encoding}), "");
+ dart.dsetindex(map, Uri.decodeQueryComponent(dart.as(element, String), {encoding: encoding}), "");
}
} else if (index !== 0) {
let key = dart.dinvoke(element, 'substring', 0, index);
let value = dart.dinvoke(element, 'substring', dart.notNull(index) + 1);
- dart.dsetindex(map, Uri.decodeQueryComponent(dart.as(key, String), {encoding: encoding}), decodeQueryComponent(dart.as(value, String), {encoding: encoding}));
+ dart.dsetindex(map, Uri.decodeQueryComponent(dart.as(key, String), {encoding: encoding}), Uri.decodeQueryComponent(dart.as(value, String), {encoding: encoding}));
}
return map;
}, "(dynamic, String) → dynamic")), Map$(String, String));
@@ -2763,10 +2801,10 @@ var core;
let wildcardSeen = false;
let partStart = start;
for (let i = start; dart.notNull(i) < dart.notNull(end); i = dart.notNull(i) + 1) {
- if (host.codeUnitAt(i) === Uri._COLON) {
+ if (host.codeUnitAt(i) === Uri[_COLON]) {
if (i === start) {
i = dart.notNull(i) + 1;
- if (host.codeUnitAt(i) !== Uri._COLON) {
+ if (host.codeUnitAt(i) !== Uri[_COLON]) {
error('invalid start colon.', i);
}
partStart = i;
@@ -2795,7 +2833,7 @@ var core;
parts.add(parseHex(partStart, end));
} catch (e) {
try {
- let last = parseIPv4Address(host.substring(partStart, end));
+ let last = Uri.parseIPv4Address(host.substring(partStart, end));
parts.add(dart.notNull(last.get(0)) << 8 | dart.notNull(last.get(1)));
parts.add(dart.notNull(last.get(2)) << 8 | dart.notNull(last.get(3)));
} catch (e) {
@@ -2830,7 +2868,7 @@ var core;
}
return dart.as(bytes, List$(int));
}
- static [_uriEncode$](canonicalTable, text, opts) {
+ static [_uriEncode](canonicalTable, text, opts) {
let encoding = opts && 'encoding' in opts ? opts.encoding : convert.UTF8;
let spaceToPlus = opts && 'spaceToPlus' in opts ? opts.spaceToPlus : false;
// Function byteToHex: (dynamic, dynamic) → dynamic
@@ -2845,16 +2883,16 @@ var core;
let byte = bytes.get(i);
if (dart.notNull(byte) < 128 && (dart.notNull(canonicalTable.get(dart.notNull(byte) >> 4)) & 1 << (dart.notNull(byte) & 15)) !== 0) {
result.writeCharCode(byte);
- } else if (dart.notNull(spaceToPlus) && byte === Uri._SPACE) {
- result.writeCharCode(Uri._PLUS);
+ } else if (dart.notNull(spaceToPlus) && byte === Uri[_SPACE]) {
+ result.writeCharCode(Uri[_PLUS]);
} else {
- result.writeCharCode(Uri._PERCENT);
+ result.writeCharCode(Uri[_PERCENT]);
byteToHex(byte, result);
}
}
return result.toString();
}
- static [_hexCharPairToByte$](s, pos) {
+ static [_hexCharPairToByte](s, pos) {
let byte = 0;
for (let i = 0; dart.notNull(i) < 2; i = dart.notNull(i) + 1) {
let charCode = s.codeUnitAt(dart.notNull(pos) + dart.notNull(i));
@@ -2871,13 +2909,13 @@ var core;
}
return byte;
}
- static [_uriDecode$](text, opts) {
+ static [_uriDecode](text, opts) {
let plusToSpace = opts && 'plusToSpace' in opts ? opts.plusToSpace : false;
let encoding = opts && 'encoding' in opts ? opts.encoding : convert.UTF8;
let simple = true;
for (let i = 0; dart.notNull(i) < dart.notNull(text.length) && dart.notNull(simple); i = dart.notNull(i) + 1) {
let codeUnit = text.codeUnitAt(i);
- simple = codeUnit !== Uri._PERCENT && codeUnit !== Uri._PLUS;
+ simple = codeUnit !== Uri[_PERCENT] && codeUnit !== Uri[_PLUS];
}
let bytes = null;
if (simple) {
@@ -2893,14 +2931,14 @@ var core;
if (dart.notNull(codeUnit) > 127) {
throw new ArgumentError("Illegal percent encoding in URI");
}
- if (codeUnit === Uri._PERCENT) {
+ if (codeUnit === Uri[_PERCENT]) {
if (dart.notNull(i) + 3 > dart.notNull(text.length)) {
throw new ArgumentError('Truncated URI');
}
- bytes.add(_hexCharPairToByte(text, dart.notNull(i) + 1));
+ bytes.add(Uri[_hexCharPairToByte](text, dart.notNull(i) + 1));
i = 2;
- } else if (dart.notNull(plusToSpace) && codeUnit === Uri._PLUS) {
- bytes.add(Uri._SPACE);
+ } else if (dart.notNull(plusToSpace) && codeUnit === Uri[_PLUS]) {
+ bytes.add(Uri[_SPACE]);
} else {
bytes.add(codeUnit);
}
@@ -2908,11 +2946,11 @@ var core;
}
return encoding.decode(bytes);
}
- static [_isAlphabeticCharacter$](codeUnit) {
- return dart.notNull(codeUnit) >= dart.notNull(Uri._LOWER_CASE_A) && dart.notNull(codeUnit) <= dart.notNull(Uri._LOWER_CASE_Z) || dart.notNull(codeUnit) >= dart.notNull(Uri._UPPER_CASE_A) && dart.notNull(codeUnit) <= dart.notNull(Uri._UPPER_CASE_Z);
+ static [_isAlphabeticCharacter](codeUnit) {
+ return dart.notNull(codeUnit) >= dart.notNull(Uri[_LOWER_CASE_A]) && dart.notNull(codeUnit) <= dart.notNull(Uri[_LOWER_CASE_Z]) || dart.notNull(codeUnit) >= dart.notNull(Uri[_UPPER_CASE_A]) && dart.notNull(codeUnit) <= dart.notNull(Uri[_UPPER_CASE_Z]);
}
}
- dart.defineNamedConstructor(Uri, '_internal');
+ dart.defineNamedConstructor(Uri, _internal$);
dart.defineNamedConstructor(Uri, 'http');
dart.defineNamedConstructor(Uri, 'https');
dart.defineNamedConstructor(Uri, 'file');
« no previous file with comments | « lib/runtime/dart/convert.js ('k') | lib/runtime/dart/isolate.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698