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

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

Issue 1090313002: fixes #52, fields shadowing getters/setters or other fields (Closed) Base URL: git@github.com:dart-lang/dev_compiler.git@master
Patch Set: Created 5 years, 8 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/_isolate_helper.js ('k') | lib/runtime/dart/_native_typed_data.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/runtime/dart/_js_helper.js
diff --git a/lib/runtime/dart/_js_helper.js b/lib/runtime/dart/_js_helper.js
index efa950c41d78445f1b285f4ca04c3774dfe356dc..3586435c99da0d330c6298b2177a2729b6f194d4 100644
--- a/lib/runtime/dart/_js_helper.js
+++ b/lib/runtime/dart/_js_helper.js
@@ -13,14 +13,22 @@ var _js_helper;
NoInline() {
}
}
+ let value$ = Symbol('value');
class IrRepresentation extends core.Object {
+ get value() {
+ return this[value$];
+ }
IrRepresentation(value) {
- this.value = value;
+ this[value$] = value;
}
}
+ let name$ = Symbol('name');
class Native extends core.Object {
+ get name() {
+ return this[name$];
+ }
Native(name) {
- this.name = name;
+ this[name$] = name;
}
}
let _ = Symbol('_');
@@ -62,17 +70,21 @@ var _js_helper;
return ConstantMap;
});
let ConstantMap = ConstantMap$();
+ let length$ = Symbol('length');
let _jsObject = Symbol('_jsObject');
let _keys = Symbol('_keys');
let _fetch = Symbol('_fetch');
let ConstantStringMap$ = dart.generic(function(K, V) {
class ConstantStringMap extends ConstantMap$(K, V) {
[_](length, jsObject, keys) {
- this.length = length;
+ this[length$] = length;
this[_jsObject] = jsObject;
this[_keys] = keys;
super[_]();
}
+ get length() {
+ return this[length$];
+ }
containsValue(needle) {
return this.values[core.$any](value => dart.equals(value, needle));
}
@@ -467,6 +479,7 @@ var _js_helper;
let match = nativeAnchoredRegExp.exec('');
return dart.as(dart.dsend(dart.dload(match, 'length'), '-', 2), core.int);
}
+ let pattern = Symbol('pattern');
let _nativeGlobalRegExp = Symbol('_nativeGlobalRegExp');
let _nativeAnchoredRegExp = Symbol('_nativeAnchoredRegExp');
let _isMultiLine = Symbol('_isMultiLine');
@@ -474,13 +487,16 @@ var _js_helper;
let _execGlobal = Symbol('_execGlobal');
let _execAnchored = Symbol('_execAnchored');
class JSSyntaxRegExp extends core.Object {
+ get pattern() {
+ return this[pattern];
+ }
toString() {
return `RegExp/${this.pattern}/`;
}
JSSyntaxRegExp(source, opts) {
let multiLine = opts && 'multiLine' in opts ? opts.multiLine : false;
let caseSensitive = opts && 'caseSensitive' in opts ? opts.caseSensitive : true;
- this.pattern = source;
+ this[pattern] = source;
this[_nativeRegExp] = JSSyntaxRegExp.makeNative(source, multiLine, caseSensitive, false);
this[_nativeGlobalRegExp] = null;
this[_nativeAnchoredRegExp] = null;
@@ -666,11 +682,14 @@ var _js_helper;
function firstMatchAfter(regExp, string, start) {
return regExp[_execGlobal](string, start);
}
+ let start$ = Symbol('start');
+ let input$ = Symbol('input');
+ let pattern$ = Symbol('pattern');
class StringMatch extends core.Object {
StringMatch(start, input, pattern) {
- this.start = start;
- this.input = input;
- this.pattern = pattern;
+ this[start$] = start;
+ this[input$] = input;
+ this[pattern$] = pattern;
}
get end() {
return dart.notNull(this.start) + dart.notNull(this.pattern.length);
@@ -694,6 +713,15 @@ var _js_helper;
}
return result;
}
+ get start() {
+ return this[start$];
+ }
+ get input() {
+ return this[input$];
+ }
+ get pattern() {
+ return this[pattern$];
+ }
}
StringMatch[dart.implements] = () => [core.Match];
// Function allMatchesInStringUnchecked: (String, String, int) → List<Match>
@@ -895,11 +923,23 @@ var _js_helper;
}
}
TypeImpl[dart.implements] = () => [core.Type];
+ let owner$ = Symbol('owner');
+ let name$0 = Symbol('name');
+ let bound$ = Symbol('bound');
class TypeVariable extends core.Object {
+ get owner() {
+ return this[owner$];
+ }
+ get name() {
+ return this[name$0];
+ }
+ get bound() {
+ return this[bound$];
+ }
TypeVariable(owner, name, bound) {
- this.owner = owner;
- this.name = name;
- this.bound = bound;
+ this[owner$] = owner;
+ this[name$0] = name;
+ this[bound$] = bound;
}
}
// Function getMangledTypeName: (TypeImpl) → dynamic
@@ -1520,12 +1560,40 @@ var _js_helper;
JSInvocationMirror.METHOD = 0;
JSInvocationMirror.GETTER = 1;
JSInvocationMirror.SETTER = 2;
+ let mangledName$ = Symbol('mangledName');
+ let jsFunction$ = Symbol('jsFunction');
+ let isIntercepted$ = Symbol('isIntercepted');
+ let cachedInterceptor$ = Symbol('cachedInterceptor');
class CachedInvocation extends core.Object {
+ get mangledName() {
+ return this[mangledName$];
+ }
+ set mangledName(value) {
+ this[mangledName$] = value;
+ }
+ get jsFunction() {
+ return this[jsFunction$];
+ }
+ set jsFunction(value) {
+ this[jsFunction$] = value;
+ }
+ get isIntercepted() {
+ return this[isIntercepted$];
+ }
+ set isIntercepted(value) {
+ this[isIntercepted$] = value;
+ }
+ get cachedInterceptor() {
+ return this[cachedInterceptor$];
+ }
+ set cachedInterceptor(value) {
+ this[cachedInterceptor$] = value;
+ }
CachedInvocation(mangledName, jsFunction, isIntercepted, cachedInterceptor) {
- this.mangledName = mangledName;
- this.jsFunction = jsFunction;
- this.isIntercepted = isIntercepted;
- this.cachedInterceptor = cachedInterceptor;
+ this[mangledName$] = mangledName;
+ this[jsFunction$] = jsFunction;
+ this[isIntercepted$] = isIntercepted;
+ this[cachedInterceptor$] = cachedInterceptor;
}
get isNoSuchMethod() {
return false;
@@ -1548,9 +1616,13 @@ var _js_helper;
return this.jsFunction.apply(receiver, arguments$);
}
}
+ let info = Symbol('info');
class CachedCatchAllInvocation extends CachedInvocation {
+ get info() {
+ return this[info];
+ }
CachedCatchAllInvocation(name, jsFunction, isIntercepted, cachedInterceptor) {
- this.info = new ReflectionInfo(jsFunction);
+ this[info] = new ReflectionInfo(jsFunction);
super.CachedInvocation(name, jsFunction, isIntercepted, cachedInterceptor);
}
get isGetterStub() {
@@ -1591,9 +1663,16 @@ var _js_helper;
return this.jsFunction.apply(receiver, arguments$);
}
}
+ let interceptor$ = Symbol('interceptor');
class CachedNoSuchMethodInvocation extends core.Object {
+ get interceptor() {
+ return this[interceptor$];
+ }
+ set interceptor(value) {
+ this[interceptor$] = value;
+ }
CachedNoSuchMethodInvocation(interceptor) {
- this.interceptor = interceptor;
+ this[interceptor$] = interceptor;
}
get isNoSuchMethod() {
return true;
@@ -1606,16 +1685,51 @@ var _js_helper;
return dart.dsend(receiver, 'noSuchMethod', invocation);
}
}
+ let jsFunction$0 = Symbol('jsFunction');
+ let data$ = Symbol('data');
+ let isAccessor$ = Symbol('isAccessor');
+ let requiredParameterCount$ = Symbol('requiredParameterCount');
+ let optionalParameterCount$ = Symbol('optionalParameterCount');
+ let areOptionalParametersNamed$ = Symbol('areOptionalParametersNamed');
+ let functionType$ = Symbol('functionType');
+ let cachedSortedIndices = Symbol('cachedSortedIndices');
class ReflectionInfo extends core.Object {
+ get jsFunction() {
+ return this[jsFunction$0];
+ }
+ get data() {
+ return this[data$];
+ }
+ get isAccessor() {
+ return this[isAccessor$];
+ }
+ get requiredParameterCount() {
+ return this[requiredParameterCount$];
+ }
+ get optionalParameterCount() {
+ return this[optionalParameterCount$];
+ }
+ get areOptionalParametersNamed() {
+ return this[areOptionalParametersNamed$];
+ }
+ get functionType() {
+ return this[functionType$];
+ }
+ get cachedSortedIndices() {
+ return this[cachedSortedIndices];
+ }
+ set cachedSortedIndices(value) {
+ this[cachedSortedIndices] = value;
+ }
internal(jsFunction, data, isAccessor, requiredParameterCount, optionalParameterCount, areOptionalParametersNamed, functionType) {
- this.jsFunction = jsFunction;
- this.data = data;
- this.isAccessor = isAccessor;
- this.requiredParameterCount = requiredParameterCount;
- this.optionalParameterCount = optionalParameterCount;
- this.areOptionalParametersNamed = areOptionalParametersNamed;
- this.functionType = functionType;
- this.cachedSortedIndices = null;
+ this[jsFunction$0] = jsFunction;
+ this[data$] = data;
+ this[isAccessor$] = isAccessor;
+ this[requiredParameterCount$] = requiredParameterCount;
+ this[optionalParameterCount$] = optionalParameterCount;
+ this[areOptionalParametersNamed$] = areOptionalParametersNamed;
+ this[functionType$] = functionType;
+ this[cachedSortedIndices] = null;
}
ReflectionInfo(jsFunction) {
let data = dart.as(jsFunction.$reflectionInfo, core.List);
@@ -2935,19 +3049,31 @@ var _js_helper;
function getFallThroughError() {
return new FallThroughErrorImplementation();
}
+ let types$ = Symbol('types');
class Creates extends core.Object {
+ get types() {
+ return this[types$];
+ }
Creates(types) {
- this.types = types;
+ this[types$] = types;
}
}
+ let types$0 = Symbol('types');
class Returns extends core.Object {
+ get types() {
+ return this[types$0];
+ }
Returns(types) {
- this.types = types;
+ this[types$0] = types;
}
}
+ let name$1 = Symbol('name');
class JSName extends core.Object {
+ get name() {
+ return this[name$1];
+ }
JSName(name) {
- this.name = name;
+ this[name$1] = name;
}
}
// Function boolConversionCheck: (dynamic) → dynamic
@@ -3219,13 +3345,17 @@ var _js_helper;
return JavaScriptIndexingBehavior;
}
});
+ let message$ = Symbol('message');
class TypeErrorImplementation extends core.Error {
+ get message() {
+ return this[message$];
+ }
TypeErrorImplementation(value, type) {
- this.message = `type '${Primitives.objectTypeName(value)}' is not a subtype ` + `of type '${type}'`;
+ this[message$] = `type '${Primitives.objectTypeName(value)}' is not a subtype ` + `of type '${type}'`;
super.Error();
}
fromMessage(message) {
- this.message = message;
+ this[message$] = message;
super.Error();
}
toString() {
@@ -3234,9 +3364,13 @@ var _js_helper;
}
TypeErrorImplementation[dart.implements] = () => [core.TypeError];
dart.defineNamedConstructor(TypeErrorImplementation, 'fromMessage');
+ let message = Symbol('message');
class CastErrorImplementation extends core.Error {
+ get message() {
+ return this[message];
+ }
CastErrorImplementation(actualType, expectedType) {
- this.message = `CastError: Casting value of type ${actualType} to` + ` incompatible type ${expectedType}`;
+ this[message] = `CastError: Casting value of type ${actualType} to` + ` incompatible type ${expectedType}`;
super.Error();
}
toString() {
@@ -3273,18 +3407,29 @@ var _js_helper;
function throwCyclicInit(staticName) {
throw new core.CyclicInitializationError(`Cyclic initialization for static ${staticName}`);
}
+ let message$0 = Symbol('message');
class RuntimeError extends core.Error {
+ get message() {
+ return this[message$0];
+ }
RuntimeError(message) {
- this.message = message;
+ this[message$0] = message;
super.Error();
}
toString() {
return `RuntimeError: ${this.message}`;
}
}
+ let libraryName$ = Symbol('libraryName');
class DeferredNotLoadedError extends core.Error {
+ get libraryName() {
+ return this[libraryName$];
+ }
+ set libraryName(value) {
+ this[libraryName$] = value;
+ }
DeferredNotLoadedError(libraryName) {
- this.libraryName = libraryName;
+ this[libraryName$] = libraryName;
super.Error();
}
toString() {
@@ -3296,17 +3441,33 @@ var _js_helper;
RuntimeType() {
}
}
+ let returnType$ = Symbol('returnType');
+ let parameterTypes$ = Symbol('parameterTypes');
+ let optionalParameterTypes$ = Symbol('optionalParameterTypes');
+ let namedParameters$ = Symbol('namedParameters');
let _isTest = Symbol('_isTest');
let _extractFunctionTypeObjectFrom = Symbol('_extractFunctionTypeObjectFrom');
let _asCheck = Symbol('_asCheck');
let _check = Symbol('_check');
let _assertCheck = Symbol('_assertCheck');
class RuntimeFunctionType extends RuntimeType {
+ get returnType() {
+ return this[returnType$];
+ }
+ get parameterTypes() {
+ return this[parameterTypes$];
+ }
+ get optionalParameterTypes() {
+ return this[optionalParameterTypes$];
+ }
+ get namedParameters() {
+ return this[namedParameters$];
+ }
RuntimeFunctionType(returnType, parameterTypes, optionalParameterTypes, namedParameters) {
- this.returnType = returnType;
- this.parameterTypes = parameterTypes;
- this.optionalParameterTypes = optionalParameterTypes;
- this.namedParameters = namedParameters;
+ this[returnType$] = returnType;
+ this[parameterTypes$] = parameterTypes;
+ this[optionalParameterTypes$] = optionalParameterTypes;
+ this[namedParameters$] = namedParameters;
super.RuntimeType();
}
get isVoid() {
@@ -3522,9 +3683,13 @@ var _js_helper;
throw new RuntimeError("Cannot convert " + `'${JSON.stringify(rti)}' to RuntimeType.`);
}
}
+ let name$2 = Symbol('name');
class RuntimeTypePlain extends RuntimeType {
+ get name() {
+ return this[name$2];
+ }
RuntimeTypePlain(name) {
- this.name = name;
+ this[name$2] = name;
super.RuntimeType();
}
toRti() {
@@ -3538,11 +3703,26 @@ var _js_helper;
return this.name;
}
}
+ let name$3 = Symbol('name');
+ let arguments$0 = Symbol('arguments');
+ let rti$ = Symbol('rti');
class RuntimeTypeGeneric extends RuntimeType {
+ get name() {
+ return this[name$3];
+ }
+ get arguments() {
+ return this[arguments$0];
+ }
+ get rti() {
+ return this[rti$];
+ }
+ set rti(value) {
+ this[rti$] = value;
+ }
RuntimeTypeGeneric(name, arguments$, rti) {
- this.name = name;
- this.arguments = arguments$;
- this.rti = rti;
+ this[name$3] = name;
+ this[arguments$0] = arguments$;
+ this[rti$] = rti;
super.RuntimeType();
}
toRti() {
« no previous file with comments | « lib/runtime/dart/_isolate_helper.js ('k') | lib/runtime/dart/_native_typed_data.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698