| Index: frogsh
|
| diff --git a/frogsh b/frogsh
|
| index 6debb3a803ad6c7314b2e04246ba438d21becd32..6ad7e68a4bccfe15c1cf8c37e1defbd8700f0405 100755
|
| --- a/frogsh
|
| +++ b/frogsh
|
| @@ -561,9 +561,9 @@ ListIterator.prototype.next = function() {
|
| return this._array.$index(this._pos++);
|
| }
|
| // ********** Code for ImmutableList **************
|
| -function ImmutableList(length) {
|
| - this._length = length;
|
| - ListFactory$E.call(this, length);
|
| +function ImmutableList(length0) {
|
| + this._length = length0;
|
| + ListFactory$E.call(this, length0);
|
| // Initializers done
|
| }
|
| $inherits(ImmutableList, ListFactory$E);
|
| @@ -578,7 +578,7 @@ ImmutableList.ImmutableList$from$factory = function(other) {
|
| ImmutableList.prototype.get$length = function() {
|
| return this._length;
|
| }
|
| -ImmutableList.prototype.set$length = function(length) {
|
| +ImmutableList.prototype.set$length = function(length0) {
|
| $throw(const$0/*const IllegalAccessException()*/);
|
| }
|
| Object.defineProperty(ImmutableList.prototype, "length", {
|
| @@ -655,8 +655,8 @@ JSSyntaxRegExp.prototype.firstMatch = function(str) {
|
| }
|
| // ********** Code for MatchImplementation **************
|
| function MatchImplementation() {}
|
| -MatchImplementation.prototype.$index = function(group) {
|
| - return this._groups.$index(group);
|
| +MatchImplementation.prototype.$index = function(group0) {
|
| + return this._groups.$index(group0);
|
| }
|
| // ********** Code for _AllMatchesIterable **************
|
| function _AllMatchesIterable() {}
|
| @@ -674,9 +674,9 @@ _AllMatchesIterator.prototype.next = function() {
|
| if (!this.hasNext()) {
|
| $throw(const$9/*const NoMoreElementsException()*/);
|
| }
|
| - var next = this._next;
|
| + var next0 = this._next;
|
| this._next = null;
|
| - return next;
|
| + return next0;
|
| }
|
| _AllMatchesIterator.prototype.hasNext = function() {
|
| if (this._done) {
|
| @@ -848,11 +848,11 @@ HashMapImplementation.HashMapImplementation$from$factory = function(other) {
|
| HashMapImplementation._computeLoadLimit = function(capacity) {
|
| return $truncdiv((capacity * 3), 4);
|
| }
|
| -HashMapImplementation._firstProbe = function(hashCode, length) {
|
| - return hashCode & (length - 1);
|
| +HashMapImplementation._firstProbe = function(hashCode, length0) {
|
| + return hashCode & (length0 - 1);
|
| }
|
| -HashMapImplementation._nextProbe = function(currentProbe, numberOfProbes, length) {
|
| - return (currentProbe + numberOfProbes) & (length - 1);
|
| +HashMapImplementation._nextProbe = function(currentProbe, numberOfProbes, length0) {
|
| + return (currentProbe + numberOfProbes) & (length0 - 1);
|
| }
|
| HashMapImplementation.prototype._probeForAdding = function(key) {
|
| var hash = HashMapImplementation._firstProbe(key.hashCode(), this._keys.length);
|
| @@ -957,9 +957,9 @@ Object.defineProperty(HashMapImplementation.prototype, "length", {
|
| get: HashMapImplementation.prototype.get$length,
|
| });
|
| HashMapImplementation.prototype.forEach = function(f) {
|
| - var length = this._keys.length;
|
| + var length0 = this._keys.length;
|
| for (var i = 0;
|
| - i < length; i++) {
|
| + i < length0; i++) {
|
| if ((this._keys.$index(i) != null) && (this._keys.$index(i) !== HashMapImplementation._deletedKey)) {
|
| f(this._keys.$index(i), this._values.$index(i));
|
| }
|
| @@ -1003,11 +1003,11 @@ $inherits(HashMapImplementation$E$E, HashMapImplementation);
|
| HashMapImplementation$E$E._computeLoadLimit = function(capacity) {
|
| return $truncdiv((capacity * 3), 4);
|
| }
|
| -HashMapImplementation$E$E._firstProbe = function(hashCode, length) {
|
| - return hashCode & (length - 1);
|
| +HashMapImplementation$E$E._firstProbe = function(hashCode, length0) {
|
| + return hashCode & (length0 - 1);
|
| }
|
| -HashMapImplementation$E$E._nextProbe = function(currentProbe, numberOfProbes, length) {
|
| - return (currentProbe + numberOfProbes) & (length - 1);
|
| +HashMapImplementation$E$E._nextProbe = function(currentProbe, numberOfProbes, length0) {
|
| + return (currentProbe + numberOfProbes) & (length0 - 1);
|
| }
|
| HashMapImplementation$E$E.prototype._probeForAdding = function(key) {
|
| var hash = HashMapImplementation._firstProbe(key.hashCode(), this._keys.length);
|
| @@ -1101,9 +1101,9 @@ HashMapImplementation$E$E.prototype.isEmpty = function() {
|
| return this._numberOfEntries == 0;
|
| }
|
| HashMapImplementation$E$E.prototype.forEach = function(f) {
|
| - var length = this._keys.length;
|
| + var length0 = this._keys.length;
|
| for (var i = 0;
|
| - i < length; i++) {
|
| + i < length0; i++) {
|
| if ((this._keys.$index(i) != null) && (this._keys.$index(i) !== HashMapImplementation._deletedKey)) {
|
| f(this._keys.$index(i), this._values.$index(i));
|
| }
|
| @@ -5114,8 +5114,8 @@ Parser.prototype.parseLibraryTags = function(token) {
|
| return this.expect(const$360/*const SourceString(";")*/, token);
|
| }
|
| // ********** Code for BodyParser **************
|
| -function BodyParser(listener) {
|
| - Parser.call(this, listener);
|
| +function BodyParser(listener0) {
|
| + Parser.call(this, listener0);
|
| // Initializers done
|
| }
|
| $inherits(BodyParser, Parser);
|
| @@ -5386,10 +5386,10 @@ DeclarationBuilder.prototype.build = function() {
|
| return (this.builderFunction)(this);
|
| }
|
| // ********** Code for PartialFunctionElement **************
|
| -function PartialFunctionElement(name, beginToken, endToken) {
|
| +function PartialFunctionElement(name0, beginToken, endToken) {
|
| this.beginToken = beginToken;
|
| this.endToken = endToken;
|
| - Element.call(this, name);
|
| + Element.call(this, name0);
|
| // Initializers done
|
| }
|
| $inherits(PartialFunctionElement, Element);
|
| @@ -5442,10 +5442,10 @@ ExpressionContext.prototype.popAll = function() {
|
| return result;
|
| }
|
| // ********** Code for BodyListener **************
|
| -function BodyListener(canceler, logger) {
|
| +function BodyListener(canceler0, logger) {
|
| this.logger = logger;
|
| this.expressionContext = new ExpressionContext(null);
|
| - Listener.call(this, canceler);
|
| + Listener.call(this, canceler0);
|
| // Initializers done
|
| }
|
| $inherits(BodyListener, Listener);
|
| @@ -5576,9 +5576,9 @@ Token.prototype.toString = function() {
|
| return Strings.String$fromCharCodes$factory([this.kind]);
|
| }
|
| // ********** Code for KeywordToken **************
|
| -function KeywordToken(value, charOffset) {
|
| +function KeywordToken(value, charOffset0) {
|
| this.value = value;
|
| - Token.call(this, 107/*null.KEYWORD_TOKEN*/, charOffset);
|
| + Token.call(this, 107/*null.KEYWORD_TOKEN*/, charOffset0);
|
| // Initializers done
|
| }
|
| $inherits(KeywordToken, Token);
|
| @@ -5587,9 +5587,9 @@ KeywordToken.prototype.toString = function() {
|
| return this.value.syntax;
|
| }
|
| // ********** Code for StringToken **************
|
| -function StringToken(kind, value, charOffset) {
|
| - this.value = new StringWrapper(value);
|
| - Token.call(this, kind, charOffset);
|
| +function StringToken(kind0, value0, charOffset0) {
|
| + this.value = new StringWrapper(value0);
|
| + Token.call(this, kind0, charOffset0);
|
| // Initializers done
|
| }
|
| $inherits(StringToken, Token);
|
| @@ -5627,8 +5627,8 @@ Keyword.get$keywords = function() {
|
| }
|
| Keyword.computeKeywordMap = function() {
|
| var result = new LinkedHashMapImplementation$String$Keyword();
|
| - for (var $i = const$347/*Keyword.values*/.iterator(); $i.hasNext(); ) {
|
| - var keyword = $i.next();
|
| + for (var $i0 = const$347/*Keyword.values*/.iterator(); $i0.hasNext(); ) {
|
| + var keyword = $i0.next();
|
| result.$setindex(keyword.syntax, keyword);
|
| }
|
| return result;
|
| @@ -5888,8 +5888,8 @@ Identifier.prototype.get$beginToken = function() {
|
| return this.token;
|
| }
|
| // ********** Code for Operator **************
|
| -function Operator(token) {
|
| - Identifier.call(this, token);
|
| +function Operator(token0) {
|
| + Identifier.call(this, token0);
|
| // Initializers done
|
| }
|
| $inherits(Operator, Identifier);
|
| @@ -5972,8 +5972,8 @@ Element.prototype.hashCode = function() {
|
| // ********** Code for top level **************
|
| // ********** Library ssa **************
|
| // ********** Code for SsaBuilderTask **************
|
| -function SsaBuilderTask(pipeline) {
|
| - CompilerTask.call(this, pipeline);
|
| +function SsaBuilderTask(pipeline0) {
|
| + CompilerTask.call(this, pipeline0);
|
| // Initializers done
|
| }
|
| $inherits(SsaBuilderTask, CompilerTask);
|
| @@ -6078,8 +6078,8 @@ SsaBuilder.prototype.visitTypeAnnotation = function(node) {
|
|
|
| }
|
| // ********** Code for SsaCodeGeneratorTask **************
|
| -function SsaCodeGeneratorTask(pipeline) {
|
| - CompilerTask.call(this, pipeline);
|
| +function SsaCodeGeneratorTask(pipeline0) {
|
| + CompilerTask.call(this, pipeline0);
|
| // Initializers done
|
| }
|
| $inherits(SsaCodeGeneratorTask, CompilerTask);
|
| @@ -6090,8 +6090,8 @@ SsaCodeGeneratorTask.prototype.generate = function(tree, graph) {
|
| var $this = this; // closure support
|
| return this.measure((function () {
|
| var function_ = tree;
|
| - var name = function_.name;
|
| - var code = $this.generateMethod(name.get$source(), graph);
|
| + var name0 = function_.name;
|
| + var code = $this.generateMethod(name0.get$source(), graph);
|
| return code;
|
| })
|
| );
|
| @@ -6260,7 +6260,7 @@ HBaseVisitor.prototype.visitBasicBlock = function(node) {
|
| instruction = instruction.next;
|
| }
|
| }
|
| -HBaseVisitor.prototype.visitInstruction = function(HInstruction) {
|
| +HBaseVisitor.prototype.visitInstruction = function(HInstruction0) {
|
|
|
| }
|
| HBaseVisitor.prototype.visitAdd = function(node) {
|
| @@ -6405,9 +6405,9 @@ HInstruction.prototype.isValid = function() {
|
| return validator.isValid;
|
| }
|
| // ********** Code for HInvoke **************
|
| -function HInvoke(selector, inputs) {
|
| +function HInvoke(selector, inputs0) {
|
| this.selector = selector;
|
| - HInstruction.call(this, inputs);
|
| + HInstruction.call(this, inputs0);
|
| // Initializers done
|
| }
|
| $inherits(HInvoke, HInstruction);
|
| @@ -6421,8 +6421,8 @@ HInvoke.prototype.accept = function(visitor) {
|
| return visitor.visitInvoke(this);
|
| }
|
| // ********** Code for HAdd **************
|
| -function HAdd(inputs) {
|
| - HInvoke.call(this, const$370/*const SourceString('+')*/, inputs);
|
| +function HAdd(inputs0) {
|
| + HInvoke.call(this, const$370/*const SourceString('+')*/, inputs0);
|
| // Initializers done
|
| }
|
| $inherits(HAdd, HInvoke);
|
| @@ -6477,8 +6477,8 @@ HReturn.prototype.accept = function(visitor) {
|
| return visitor.visitReturn(this);
|
| }
|
| // ********** Code for SsaOptimizerTask **************
|
| -function SsaOptimizerTask(pipeline) {
|
| - CompilerTask.call(this, pipeline);
|
| +function SsaOptimizerTask(pipeline0) {
|
| + CompilerTask.call(this, pipeline0);
|
| // Initializers done
|
| }
|
| $inherits(SsaOptimizerTask, CompilerTask);
|
| @@ -6636,9 +6636,9 @@ HValidator.prototype.visitInstruction = function(instruction) {
|
| // ********** Code for top level **************
|
| // ********** Library leg **************
|
| // ********** Code for WorldPipeline **************
|
| -function WorldPipeline(world, script) {
|
| +function WorldPipeline(world, script0) {
|
| this.world = world;
|
| - Pipeline.call(this, script);
|
| + Pipeline.call(this, script0);
|
| // Initializers done
|
| }
|
| $inherits(WorldPipeline, Pipeline);
|
| @@ -6654,8 +6654,8 @@ WorldPipeline.prototype.run = function() {
|
| this.world.legCode = code;
|
| this.world.jsBytesWritten = code.length;
|
| var $list = this.tasks;
|
| - for (var $i = 0;$i < $list.length; $i++) {
|
| - var task = $list.$index($i);
|
| + for (var $i0 = 0;$i0 < $list.length; $i0++) {
|
| + var task = $list.$index($i0);
|
| this.log(('' + task.get$name() + ' took ' + task.get$timing() + 'msec'));
|
| }
|
| }
|
| @@ -6758,8 +6758,8 @@ PipelineCancelledException.prototype.toString = function() {
|
| return (this.reason != null) ? ('' + banner + ': ' + this.reason + '') : ('' + banner + '');
|
| }
|
| // ********** Code for ResolverTask **************
|
| -function ResolverTask(pipeline) {
|
| - CompilerTask.call(this, pipeline);
|
| +function ResolverTask(pipeline0) {
|
| + CompilerTask.call(this, pipeline0);
|
| // Initializers done
|
| }
|
| $inherits(ResolverTask, CompilerTask);
|
| @@ -6776,11 +6776,11 @@ ResolverTask.prototype.resolve = function(tree) {
|
| );
|
| }
|
| // ********** Code for ResolverVisitor **************
|
| -function ResolverVisitor(pipeline, types) {
|
| +function ResolverVisitor(pipeline0, types) {
|
| this.types = types;
|
| - this.context = new Context(null, pipeline.universe.scope, pipeline.universe.elements);
|
| + this.context = new Context(null, pipeline0.universe.scope, pipeline0.universe.elements);
|
| this.elements = new HashMapImplementation$Node$Element();
|
| - this.pipeline = pipeline;
|
| + this.pipeline = pipeline0;
|
| // Initializers done
|
| }
|
| ResolverVisitor.prototype.fail = function(node) {
|
| @@ -6845,12 +6845,12 @@ ResolverVisitor.prototype.visitExpressionStatement = function(node) {
|
| ResolverVisitor.prototype.visitFunctionExpression = function(node) {
|
| var returnType = this.getType(node.returnType);
|
| var parameterTypes = [];
|
| - var elements = $map([]);
|
| + var elements0 = $map([]);
|
| for (var link = node.parameters.nodes;
|
| !link.isEmpty(); link = link.get$tail()) {
|
| var parameter = link.get$head();
|
| var parameterElement = this.visit(parameter);
|
| - elements.$setindex(parameter.get$name(), parameterElement);
|
| + elements0.$setindex(parameter.get$name(), parameterElement);
|
| parameterTypes.add(parameterElement.type);
|
| }
|
| var type = new FunctionType(returnType, LinkFactory.Link$fromList$factory(parameterTypes));
|
| @@ -6860,7 +6860,7 @@ ResolverVisitor.prototype.visitFunctionExpression = function(node) {
|
| element = this.context.lookup(name.get$source());
|
| element.type = type;
|
| }
|
| - this.visitIn(node.body, new Context(this.context, element, elements));
|
| + this.visitIn(node.body, new Context(this.context, element, elements0));
|
| return element;
|
| }
|
| ResolverVisitor.prototype.visitIdentifier = function(node) {
|
| @@ -6909,10 +6909,10 @@ ResolverVisitor.prototype.visitTypeAnnotation = function(node) {
|
|
|
| }
|
| // ********** Code for Context **************
|
| -function Context(parent, element, elements) {
|
| +function Context(parent, element, elements0) {
|
| this.parent = parent;
|
| this.element = element;
|
| - this.elements = (elements == null) ? $map([]) : elements;
|
| + this.elements = (elements0 == null) ? $map([]) : elements0;
|
| // Initializers done
|
| }
|
| Context.prototype.get$parent = function() { return this.parent; };
|
| @@ -6929,8 +6929,8 @@ Context.prototype.lookup = function(name) {
|
| }
|
| }
|
| // ********** Code for ScannerTask **************
|
| -function ScannerTask(pipeline) {
|
| - CompilerTask.call(this, pipeline);
|
| +function ScannerTask(pipeline0) {
|
| + CompilerTask.call(this, pipeline0);
|
| // Initializers done
|
| }
|
| $inherits(ScannerTask, CompilerTask);
|
| @@ -6964,8 +6964,8 @@ leg_Script.prototype.get$text = function() {
|
| return this.file.get$text();
|
| }
|
| // ********** Code for TypeCheckerTask **************
|
| -function TypeCheckerTask(pipeline) {
|
| - CompilerTask.call(this, pipeline);
|
| +function TypeCheckerTask(pipeline0) {
|
| + CompilerTask.call(this, pipeline0);
|
| // Initializers done
|
| }
|
| $inherits(TypeCheckerTask, CompilerTask);
|
| @@ -7166,16 +7166,16 @@ CodeWriter.prototype._indent = function() {
|
| this._buf.add(' '/*CodeWriter.INDENTATION*/);
|
| }
|
| }
|
| -CodeWriter.prototype.comment = function(text) {
|
| +CodeWriter.prototype.comment = function(text0) {
|
| if (this.writeComments) {
|
| - this.writeln(text);
|
| + this.writeln(text0);
|
| }
|
| }
|
| -CodeWriter.prototype.write = function(text) {
|
| - if (text.length == 0) return;
|
| +CodeWriter.prototype.write = function(text0) {
|
| + if (text0.length == 0) return;
|
| if (this._pendingIndent) this._indent();
|
| - if (text.indexOf('\n', 0) != -1) {
|
| - var lines = text.split('\n');
|
| + if (text0.indexOf('\n', 0) != -1) {
|
| + var lines = text0.split('\n');
|
| for (var i = 0;
|
| i < lines.length - 1; i++) {
|
| this.writeln(lines.$index(i));
|
| @@ -7183,27 +7183,27 @@ CodeWriter.prototype.write = function(text) {
|
| this.write(lines.$index(lines.length - 1));
|
| }
|
| else {
|
| - this._buf.add(text);
|
| + this._buf.add(text0);
|
| }
|
| }
|
| -CodeWriter.prototype.writeln = function(text) {
|
| - if (text != null) {
|
| - this.write(text);
|
| +CodeWriter.prototype.writeln = function(text0) {
|
| + if (text0 != null) {
|
| + this.write(text0);
|
| }
|
| - if (!text.endsWith('\n')) this._buf.add('\n'/*CodeWriter.NEWLINE*/);
|
| + if (!text0.endsWith('\n')) this._buf.add('\n'/*CodeWriter.NEWLINE*/);
|
| this._pendingIndent = true;
|
| }
|
| -CodeWriter.prototype.enterBlock = function(text) {
|
| - this.writeln(text);
|
| +CodeWriter.prototype.enterBlock = function(text0) {
|
| + this.writeln(text0);
|
| this._indentation++;
|
| }
|
| -CodeWriter.prototype.exitBlock = function(text) {
|
| +CodeWriter.prototype.exitBlock = function(text0) {
|
| this._indentation--;
|
| - this.writeln(text);
|
| + this.writeln(text0);
|
| }
|
| -CodeWriter.prototype.nextBlock = function(text) {
|
| +CodeWriter.prototype.nextBlock = function(text0) {
|
| this._indentation--;
|
| - this.writeln(text);
|
| + this.writeln(text0);
|
| this._indentation++;
|
| }
|
| // ********** Code for WorldGenerator **************
|
| @@ -7462,8 +7462,8 @@ WorldGenerator.prototype._writeGlobals = function() {
|
| }
|
| }
|
| }
|
| -WorldGenerator.prototype._orderValues = function(map) {
|
| - var values = map.getValues();
|
| +WorldGenerator.prototype._orderValues = function(map0) {
|
| + var values = map0.getValues();
|
| values.sort(this.get$_compareMembers());
|
| return values;
|
| }
|
| @@ -7494,12 +7494,23 @@ function BlockScope(enclosingMethod, parent, reentrant) {
|
| this.reentrant = reentrant;
|
| this._vars = $map([]);
|
| // Initializers done
|
| - if (this.parent != null && $eq(this.parent.enclosingMethod, this.enclosingMethod)) {
|
| + if (this.get$isMethodScope()) {
|
| + this._closedOver = new HashSetImplementation$String();
|
| + }
|
| + else {
|
| this.reentrant = this.reentrant || this.parent.reentrant;
|
| }
|
| }
|
| BlockScope.prototype.get$parent = function() { return this.parent; };
|
| BlockScope.prototype.set$parent = function(value) { return this.parent = value; };
|
| +BlockScope.prototype.get$isMethodScope = function() {
|
| + return this.parent == null || $ne(this.parent.enclosingMethod, this.enclosingMethod);
|
| +}
|
| +BlockScope.prototype.get$methodScope = function() {
|
| + var s = this;
|
| + while (!s.get$isMethodScope()) s = s.get$parent();
|
| + return s;
|
| +}
|
| BlockScope.prototype.lookup = function(name) {
|
| var ret = this._vars.$index(name);
|
| if ($ne(ret, null)) return ret;
|
| @@ -7507,16 +7518,26 @@ BlockScope.prototype.lookup = function(name) {
|
| $ne(s, null); s = s.get$parent()) {
|
| ret = s._vars.$index(name);
|
| if ($ne(ret, null)) {
|
| - if (this.enclosingMethod.captures != null && s.reentrant && $ne(s.enclosingMethod, this.enclosingMethod)) {
|
| - this.enclosingMethod.captures.add(name);
|
| + if ($ne(s.enclosingMethod, this.enclosingMethod)) {
|
| + s.get$methodScope()._closedOver.add(ret.code);
|
| + if (this.enclosingMethod.captures != null && s.reentrant) {
|
| + this.enclosingMethod.captures.add(ret.code);
|
| + }
|
| }
|
| return ret;
|
| }
|
| }
|
| }
|
| -BlockScope.prototype._isDefined = function(name) {
|
| - if (this._vars.containsKey(name)) return true;
|
| - if (this.parent != null) return this.parent._isDefined(name);
|
| +BlockScope.prototype._isDefinedInParent = function(name) {
|
| + if (this.get$isMethodScope() && this._closedOver.contains(name)) return true;
|
| + for (var s = this.parent;
|
| + $ne(s, null); s = s.get$parent()) {
|
| + if (s._vars.containsKey(name)) return true;
|
| + if (s.get$isMethodScope() && s._closedOver.contains(name)) return true;
|
| + }
|
| + var type = this.enclosingMethod.method.declaringType;
|
| + if (type.resolveMember(name) != null) return true;
|
| + if (type.get$library().lookup(name, null) != null) return true;
|
| return false;
|
| }
|
| BlockScope.prototype.create = function(name, type, location) {
|
| @@ -7529,11 +7550,9 @@ BlockScope.prototype.create = function(name, type, location) {
|
| world.internalError(('conflict with temporary name "' + name + '"'));
|
| }
|
| }
|
| - if (this.parent != null) {
|
| - var index = 0;
|
| - while (this.parent._isDefined(jsName)) {
|
| - jsName = ('' + name + '' + index++ + '');
|
| - }
|
| + var index = 0;
|
| + while (this._isDefinedInParent(jsName)) {
|
| + jsName = ('' + name + '' + index++ + '');
|
| }
|
| var ret = new Value(type, jsName, false, false, false);
|
| this._vars.$setindex(name, ret);
|
| @@ -8883,12 +8902,12 @@ function Arguments(nodes, values) {
|
| // Initializers done
|
| }
|
| Arguments.Arguments$bare$factory = function(arity) {
|
| - var values = [];
|
| + var values0 = [];
|
| for (var i = 0;
|
| i < arity; i++) {
|
| - values.add(new Value(world.varType, ('\$' + i + ''), false, false, false));
|
| + values0.add(new Value(world.varType, ('\$' + i + ''), false, false, false));
|
| }
|
| - return new Arguments(null, values);
|
| + return new Arguments(null, values0);
|
| }
|
| Arguments.get$EMPTY = function() {
|
| if (Arguments._empty == null) {
|
| @@ -9025,27 +9044,27 @@ Library.prototype.addImport = function(fullname, prefix) {
|
| Library.prototype.addNative = function(fullname) {
|
| this.natives.add(world.reader.readFile(fullname));
|
| }
|
| -Library.prototype.getOrAddFunctionType = function(name, func, inType) {
|
| +Library.prototype.getOrAddFunctionType = function(name0, func, inType) {
|
| var def = new FunctionTypeDefinition(func, null, func.span);
|
| - var type = new DefinedType(name, this, def, false);
|
| + var type = new DefinedType(name0, this, def, false);
|
| type.addMethod('\$call', func);
|
| type.members.$index('\$call').resolve(inType);
|
| return type;
|
| }
|
| -Library.prototype.addType = function(name, definition, isClass) {
|
| - if (this.types.containsKey(name)) {
|
| - var existingType = this.types.$index(name);
|
| +Library.prototype.addType = function(name0, definition, isClass) {
|
| + if (this.types.containsKey(name0)) {
|
| + var existingType = this.types.$index(name0);
|
| if (this.get$isCore() && existingType.get$definition() == null) {
|
| existingType.setDefinition(definition);
|
| }
|
| else {
|
| - world.warning(('duplicate definition of ' + name + ''), definition.span);
|
| + world.warning(('duplicate definition of ' + name0 + ''), definition.span);
|
| }
|
| }
|
| else {
|
| - this.types.$setindex(name, new DefinedType(name, this, definition, isClass));
|
| + this.types.$setindex(name0, new DefinedType(name0, this, definition, isClass));
|
| }
|
| - return this.types.$index(name);
|
| + return this.types.$index(name0);
|
| }
|
| Library.prototype.findType = function(type) {
|
| var result = this.findTypeByName(type.name.name);
|
| @@ -9061,22 +9080,22 @@ Library.prototype.findType = function(type) {
|
| }
|
| return result;
|
| }
|
| -Library.prototype.findTypeByName = function(name) {
|
| - var ret = this.types.$index(name);
|
| +Library.prototype.findTypeByName = function(name0) {
|
| + var ret = this.types.$index(name0);
|
| var $list = this.imports;
|
| for (var $i = 0;$i < $list.length; $i++) {
|
| var imported = $list.$index($i);
|
| var newRet = null;
|
| if (imported.prefix == null) {
|
| - newRet = imported.get$library().types.$index(name);
|
| + newRet = imported.get$library().types.$index(name0);
|
| }
|
| - else if (imported.prefix == name) {
|
| + else if (imported.prefix == name0) {
|
| newRet = imported.get$library().topType;
|
| }
|
| if ($ne(newRet, null)) {
|
| if ($ne(ret, null) && $ne(ret, newRet)) {
|
| - world.error(('conflicting types for "' + name + '"'), ret.get$span());
|
| - world.error(('conflicting types for "' + name + '"'), newRet.get$span());
|
| + world.error(('conflicting types for "' + name0 + '"'), ret.get$span());
|
| + world.error(('conflicting types for "' + name0 + '"'), newRet.get$span());
|
| }
|
| else {
|
| ret = newRet;
|
| @@ -9085,18 +9104,18 @@ Library.prototype.findTypeByName = function(name) {
|
| }
|
| return ret;
|
| }
|
| -Library.prototype.lookup = function(name, span) {
|
| - var retType = this.findTypeByName(name);
|
| +Library.prototype.lookup = function(name0, span0) {
|
| + var retType = this.findTypeByName(name0);
|
| var ret = null;
|
| if ($ne(retType, null)) {
|
| ret = retType.get$typeMember();
|
| }
|
| - var newRet = this.topType.getMember(name);
|
| + var newRet = this.topType.getMember(name0);
|
| if ($ne(newRet, null)) {
|
| if ($ne(ret, null) && $ne(ret, newRet)) {
|
| - world.error(('conflicting members for "' + name + '"'), span);
|
| - world.error(('conflicting members for "' + name + '"'), ret.get$span());
|
| - world.error(('conflicting members for "' + name + '"'), newRet.get$span());
|
| + world.error(('conflicting members for "' + name0 + '"'), span0);
|
| + world.error(('conflicting members for "' + name0 + '"'), ret.get$span());
|
| + world.error(('conflicting members for "' + name0 + '"'), newRet.get$span());
|
| }
|
| else {
|
| ret = newRet;
|
| @@ -9106,12 +9125,12 @@ Library.prototype.lookup = function(name, span) {
|
| for (var $i = 0;$i < $list.length; $i++) {
|
| var imported = $list.$index($i);
|
| if (imported.prefix == null) {
|
| - newRet = imported.get$library().topType.getMember(name);
|
| + newRet = imported.get$library().topType.getMember(name0);
|
| if ($ne(newRet, null)) {
|
| if ($ne(ret, null) && $ne(ret, newRet)) {
|
| - world.error(('conflicting members for "' + name + '"'), span);
|
| - world.error(('conflicting members for "' + name + '"'), ret.get$span());
|
| - world.error(('conflicting members for "' + name + '"'), newRet.get$span());
|
| + world.error(('conflicting members for "' + name0 + '"'), span0);
|
| + world.error(('conflicting members for "' + name0 + '"'), ret.get$span());
|
| + world.error(('conflicting members for "' + name0 + '"'), newRet.get$span());
|
| }
|
| else {
|
| ret = newRet;
|
| @@ -9326,8 +9345,8 @@ Member.prototype.get$name = function() { return this.name; };
|
| Member.prototype.get$jsname = function() {
|
| return this._jsname == null ? this.name : this._jsname;
|
| }
|
| -Member.prototype.set$jsname = function(name) {
|
| - return this._jsname = name;
|
| +Member.prototype.set$jsname = function(name0) {
|
| + return this._jsname = name0;
|
| }
|
| Member.prototype.get$library = function() {
|
| return this.declaringType.get$library();
|
| @@ -9402,9 +9421,9 @@ Member.prototype.get$generatedFactoryName = function() {
|
| }
|
| }
|
| // ********** Code for TypeMember **************
|
| -function TypeMember(type) {
|
| - this.type = type;
|
| - Member.call(this, type.name, type.library.topType);
|
| +function TypeMember(type0) {
|
| + this.type = type0;
|
| + Member.call(this, type0.name, type0.library.topType);
|
| // Initializers done
|
| }
|
| $inherits(TypeMember, Member);
|
| @@ -9439,12 +9458,12 @@ TypeMember.prototype.invoke = function(gen, node, target, args) {
|
| world.error('can not invoke type', this.type.definition);
|
| }
|
| // ********** Code for FieldMember **************
|
| -function FieldMember(name, declaringType, definition, value) {
|
| +function FieldMember(name0, declaringType0, definition, value) {
|
| this._providePropertySyntax = false
|
| this.definition = definition;
|
| this.value = value;
|
| this.isNative = false;
|
| - Member.call(this, name, declaringType);
|
| + Member.call(this, name0, declaringType0);
|
| // Initializers done
|
| }
|
| $inherits(FieldMember, Member);
|
| @@ -9567,15 +9586,15 @@ FieldMember.prototype.get_ = function(gen, node, target) {
|
| }
|
| return new Value(this.type, ('' + target.code + '.' + this.get$jsname() + ''), false, true, false);
|
| }
|
| -FieldMember.prototype.set_ = function(gen, node, target, value) {
|
| +FieldMember.prototype.set_ = function(gen, node, target, value0) {
|
| var lhs = this.get_(gen, node, target);
|
| - value = value.convertTo(this.type, node);
|
| - return new Value(this.type, ('' + lhs.code + ' = ' + value.code + ''), false, true, false);
|
| + value0 = value0.convertTo(this.type, node);
|
| + return new Value(this.type, ('' + lhs.code + ' = ' + value0.code + ''), false, true, false);
|
| }
|
| // ********** Code for PropertyMember **************
|
| -function PropertyMember(name, declaringType) {
|
| +function PropertyMember(name0, declaringType0) {
|
| this._provideFieldSyntax = false
|
| - Member.call(this, name, declaringType);
|
| + Member.call(this, name0, declaringType0);
|
| // Initializers done
|
| }
|
| $inherits(PropertyMember, Member);
|
| @@ -9643,16 +9662,16 @@ PropertyMember.prototype.resolve = function(inType) {
|
| world._addMember(this);
|
| }
|
| // ********** Code for ConcreteMember **************
|
| -function ConcreteMember(name, declaringType, baseMember) {
|
| +function ConcreteMember(name0, declaringType0, baseMember) {
|
| this.baseMember = baseMember;
|
| - Member.call(this, name, declaringType);
|
| + Member.call(this, name0, declaringType0);
|
| // Initializers done
|
| this.parameters = [];
|
| - this.returnType = this.baseMember.get$returnType().resolveTypeParams(declaringType);
|
| + this.returnType = this.baseMember.get$returnType().resolveTypeParams(declaringType0);
|
| var $list = this.baseMember.get$parameters();
|
| for (var $i = 0;$i < $list.length; $i++) {
|
| var p = $list.$index($i);
|
| - var newType = p.type.resolveTypeParams(declaringType);
|
| + var newType = p.type.resolveTypeParams(declaringType0);
|
| if ($ne(newType, p.type)) {
|
| this.parameters.add(p.copyWithNewType(newType));
|
| }
|
| @@ -9751,7 +9770,7 @@ ConcreteMember.prototype.invoke = function(gen, node, target, args) {
|
| return new Value(this.returnType, code, false, true, false);
|
| }
|
| // ********** Code for MethodMember **************
|
| -function MethodMember(name, declaringType, definition) {
|
| +function MethodMember(name0, declaringType0, definition) {
|
| this.isStatic = false
|
| this.isAbstract = false
|
| this.isConst = false
|
| @@ -9761,7 +9780,7 @@ function MethodMember(name, declaringType, definition) {
|
| this._provideFieldSyntax = false
|
| this._provideOptionalParamInfo = false
|
| this.definition = definition;
|
| - Member.call(this, name, declaringType);
|
| + Member.call(this, name0, declaringType0);
|
| // Initializers done
|
| }
|
| $inherits(MethodMember, Member);
|
| @@ -9845,11 +9864,11 @@ MethodMember.prototype.canInvoke = function(args) {
|
| }
|
| return true;
|
| }
|
| -MethodMember.prototype.indexOfParameter = function(name) {
|
| +MethodMember.prototype.indexOfParameter = function(name0) {
|
| for (var i = 0;
|
| i < this.parameters.length; i++) {
|
| var p = this.parameters.$index(i);
|
| - if (p.get$isOptional() && $eq(p.get$name(), name)) {
|
| + if (p.get$isOptional() && $eq(p.get$name(), name0)) {
|
| return i;
|
| }
|
| }
|
| @@ -9874,7 +9893,7 @@ MethodMember.prototype.provideFieldSyntax = function() {
|
| MethodMember.prototype.providePropertySyntax = function() {
|
| return this._providePropertySyntax = true;
|
| }
|
| -MethodMember.prototype.set_ = function(gen, Node, target, value) {
|
| +MethodMember.prototype.set_ = function(gen, Node0, target, value) {
|
| world.error('can not set method', this.definition);
|
| }
|
| MethodMember.prototype.get_ = function(gen, node, target) {
|
| @@ -9979,17 +9998,17 @@ MethodMember.prototype.invoke = function(gen, node, target, args) {
|
| var seen = new HashSetImplementation$String();
|
| for (var i = bareCount;
|
| i < args.get$length(); i++) {
|
| - var name = args.getName(i);
|
| - if (seen.contains(name)) {
|
| - return this._argError(node, target, args, ('duplicate argument "' + name + '"'));
|
| + var name0 = args.getName(i);
|
| + if (seen.contains(name0)) {
|
| + return this._argError(node, target, args, ('duplicate argument "' + name0 + '"'));
|
| }
|
| - seen.add(name);
|
| - var p = this.indexOfParameter(name);
|
| + seen.add(name0);
|
| + var p = this.indexOfParameter(name0);
|
| if (p < 0) {
|
| - return this._argError(node, target, args, ('method does not have optional parameter "' + name + '"'));
|
| + return this._argError(node, target, args, ('method does not have optional parameter "' + name0 + '"'));
|
| }
|
| else if (p < bareCount) {
|
| - return this._argError(node, target, args, ('argument "' + name + '" passed as positional and named'));
|
| + return this._argError(node, target, args, ('argument "' + name0 + '" passed as positional and named'));
|
| }
|
| }
|
| world.internalError(('wrong named arguments calling ' + this.name + ''), node.span);
|
| @@ -10073,7 +10092,7 @@ MethodMember.prototype._invokeConstConstructor = function(node, code, target, ar
|
| this.generator._pushBlock(false);
|
| for (var j = 0;
|
| j < this.definition.formals.length; j++) {
|
| - var name = this.definition.formals.$index(j).get$name().get$name();
|
| + var name0 = this.definition.formals.$index(j).get$name().get$name();
|
| var value = null;
|
| if (j < args.get$length()) {
|
| value = args.values.$index(j);
|
| @@ -10084,7 +10103,7 @@ MethodMember.prototype._invokeConstConstructor = function(node, code, target, ar
|
| value = this.parameters.$index(j).get$value();
|
| }
|
| }
|
| - this.generator._scope._vars.$setindex(name, value);
|
| + this.generator._scope._vars.$setindex(name0, value);
|
| }
|
| var $list = this.definition.initializers;
|
| for (var $i = 0;$i < $list.length; $i++) {
|
| @@ -10728,8 +10747,8 @@ function InterpStack(previous, quote, isMultiline) {
|
| InterpStack.prototype.pop = function() {
|
| return this.previous;
|
| }
|
| -InterpStack.push = function(stack, quote, isMultiline) {
|
| - var newStack = new InterpStack(stack, quote, isMultiline);
|
| +InterpStack.push = function(stack, quote0, isMultiline0) {
|
| + var newStack = new InterpStack(stack, quote0, isMultiline0);
|
| if (stack != null) newStack.previous = stack;
|
| return newStack;
|
| }
|
| @@ -12615,7 +12634,7 @@ lang_Parser.prototype.functionBody = function(inExpression) {
|
| }
|
| this._lang_error('Expected function body (neither { nor => found)');
|
| }
|
| -lang_Parser.prototype.finishField = function(start, modifiers, type, name, value) {
|
| +lang_Parser.prototype.finishField = function(start, modifiers, type0, name, value) {
|
| var names = [name];
|
| var values = [value];
|
| while (this._maybeEat(11/*TokenKind.COMMA*/)) {
|
| @@ -12628,7 +12647,7 @@ lang_Parser.prototype.finishField = function(start, modifiers, type, name, value
|
| }
|
| }
|
| this._eatSemicolon();
|
| - return new VariableDefinition(modifiers, type, names, values, this._makeSpan(start));
|
| + return new VariableDefinition(modifiers, type0, names, values, this._makeSpan(start));
|
| }
|
| lang_Parser.prototype.finishDefinition = function(start, modifiers, di) {
|
| switch (this._peek()) {
|
| @@ -12683,7 +12702,7 @@ lang_Parser.prototype.factoryConstructorDeclaration = function() {
|
| typeParams = this.typeParameters();
|
| }
|
| var name = null;
|
| - var type = null;
|
| + var type0 = null;
|
| if (this._maybeEat(14/*TokenKind.DOT*/)) {
|
| name = this.identifier();
|
| }
|
| @@ -12701,8 +12720,8 @@ lang_Parser.prototype.factoryConstructorDeclaration = function() {
|
| if (names.length > 1) {
|
| this._lang_error('unsupported qualified name for factory', names.$index(0).get$span());
|
| }
|
| - type = new NameTypeReference(false, names.$index(0), null, names.$index(0).get$span());
|
| - var di = new DeclaredIdentifier(type, name, this._makeSpan(start));
|
| + type0 = new NameTypeReference(false, names.$index(0), null, names.$index(0).get$span());
|
| + var di = new DeclaredIdentifier(type0, name, this._makeSpan(start));
|
| return this.finishDefinition(start, [factoryToken], di);
|
| }
|
| lang_Parser.prototype.statement = function() {
|
| @@ -13049,15 +13068,15 @@ lang_Parser.prototype._makeType = function(expr) {
|
| return new NameTypeReference(false, expr.get$name(), null, expr.get$span());
|
| }
|
| else if ((expr instanceof DotExpression)) {
|
| - var type = this._makeType(expr.self);
|
| - if (type.names == null) {
|
| - type.names = [expr.get$name()];
|
| + var type0 = this._makeType(expr.self);
|
| + if (type0.names == null) {
|
| + type0.names = [expr.get$name()];
|
| }
|
| else {
|
| - type.names.add(expr.get$name());
|
| + type0.names.add(expr.get$name());
|
| }
|
| - type.span = expr.get$span();
|
| - return type;
|
| + type0.span = expr.get$span();
|
| + return type0;
|
| }
|
| else {
|
| this._lang_error('expected type reference');
|
| @@ -13067,33 +13086,33 @@ lang_Parser.prototype._makeType = function(expr) {
|
| lang_Parser.prototype.infixExpression = function(precedence) {
|
| return this.finishInfixExpression(this.unaryExpression(), precedence);
|
| }
|
| -lang_Parser.prototype._finishDeclaredId = function(type) {
|
| +lang_Parser.prototype._finishDeclaredId = function(type0) {
|
| var name = this.identifier();
|
| - return this.finishPostfixExpression(new DeclaredIdentifier(type, name, this._makeSpan(type.get$span().start)));
|
| + return this.finishPostfixExpression(new DeclaredIdentifier(type0, name, this._makeSpan(type0.get$span().start)));
|
| }
|
| lang_Parser.prototype._fixAsType = function(x) {
|
| if (this._maybeEat(53/*TokenKind.GT*/)) {
|
| var base = this._makeType(x.x);
|
| var typeParam = this._makeType(x.y);
|
| - var type = new GenericTypeReference(base, [typeParam], 0, this._makeSpan(x.span.start));
|
| - return this._finishDeclaredId(type);
|
| + var type0 = new GenericTypeReference(base, [typeParam], 0, this._makeSpan(x.span.start));
|
| + return this._finishDeclaredId(type0);
|
| }
|
| else {
|
| var base = this._makeType(x.x);
|
| var paramBase = this._makeType(x.y);
|
| var firstParam = this.addTypeArguments(paramBase, 1);
|
| - var type;
|
| + var type0;
|
| if (firstParam.depth <= 0) {
|
| - type = new GenericTypeReference(base, [firstParam], 0, this._makeSpan(x.span.start));
|
| + type0 = new GenericTypeReference(base, [firstParam], 0, this._makeSpan(x.span.start));
|
| }
|
| else if (this._maybeEat(11/*TokenKind.COMMA*/)) {
|
| - type = this._finishTypeArguments(base, 0, [firstParam]);
|
| + type0 = this._finishTypeArguments(base, 0, [firstParam]);
|
| }
|
| else {
|
| this._eat(53/*TokenKind.GT*/);
|
| - type = new GenericTypeReference(base, [firstParam], 0, this._makeSpan(x.span.start));
|
| + type0 = new GenericTypeReference(base, [firstParam], 0, this._makeSpan(x.span.start));
|
| }
|
| - return this._finishDeclaredId(type);
|
| + return this._finishDeclaredId(type0);
|
| }
|
| }
|
| lang_Parser.prototype.finishInfixExpression = function(x, precedence) {
|
| @@ -13419,8 +13438,8 @@ lang_Parser.prototype._parenOrLambda = function() {
|
| }
|
| }
|
| }
|
| -lang_Parser.prototype._typeAsIdentifier = function(type) {
|
| - return type.get$name();
|
| +lang_Parser.prototype._typeAsIdentifier = function(type0) {
|
| + return type0.get$name();
|
| }
|
| lang_Parser.prototype._specialIdentifier = function(includeOperators) {
|
| var start = this._peekToken.start;
|
| @@ -13536,17 +13555,17 @@ lang_Parser.parseHex = function(hex) {
|
| return result;
|
| }
|
| lang_Parser.prototype.finishNewExpression = function(start, isConst) {
|
| - var type = this.type(0);
|
| + var type0 = this.type(0);
|
| var name = null;
|
| if (this._maybeEat(14/*TokenKind.DOT*/)) {
|
| name = this.identifier();
|
| }
|
| var args = this.arguments();
|
| - return new lang_NewExpression(isConst, type, name, args, this._makeSpan(start));
|
| + return new lang_NewExpression(isConst, type0, name, args, this._makeSpan(start));
|
| }
|
| -lang_Parser.prototype.finishListLiteral = function(start, isConst, type) {
|
| +lang_Parser.prototype.finishListLiteral = function(start, isConst, type0) {
|
| if (this._maybeEat(56/*TokenKind.INDEX*/)) {
|
| - return new ListExpression(isConst, type, [], this._makeSpan(start));
|
| + return new ListExpression(isConst, type0, [], this._makeSpan(start));
|
| }
|
| var values = [];
|
| this._eat(4/*TokenKind.LBRACK*/);
|
| @@ -13558,9 +13577,9 @@ lang_Parser.prototype.finishListLiteral = function(start, isConst, type) {
|
| break;
|
| }
|
| }
|
| - return new ListExpression(isConst, type, values, this._makeSpan(start));
|
| + return new ListExpression(isConst, type0, values, this._makeSpan(start));
|
| }
|
| -lang_Parser.prototype.finishMapLiteral = function(start, isConst, type) {
|
| +lang_Parser.prototype.finishMapLiteral = function(start, isConst, type0) {
|
| var items = [];
|
| this._eat(6/*TokenKind.LBRACE*/);
|
| while (!this._maybeEat(7/*TokenKind.RBRACE*/)) {
|
| @@ -13573,7 +13592,7 @@ lang_Parser.prototype.finishMapLiteral = function(start, isConst, type) {
|
| break;
|
| }
|
| }
|
| - return new MapExpression(isConst, type, items, this._makeSpan(start));
|
| + return new MapExpression(isConst, type0, items, this._makeSpan(start));
|
| }
|
| lang_Parser.prototype.finishTypedLiteral = function(start, isConst) {
|
| var span = this._makeSpan(start);
|
| @@ -13733,7 +13752,7 @@ lang_Parser.prototype.formalParameter = function(inOptionalBlock) {
|
| var isThis = false;
|
| var isRest = false;
|
| var di = this.declaredIdentifier(false);
|
| - var type = di.type;
|
| + var type0 = di.type;
|
| var name = di.get$name();
|
| var value = null;
|
| if (this._maybeEat(20/*TokenKind.ASSIGN*/)) {
|
| @@ -13744,13 +13763,13 @@ lang_Parser.prototype.formalParameter = function(inOptionalBlock) {
|
| }
|
| else if (this._peekKind(2/*TokenKind.LPAREN*/)) {
|
| var formals = this.formalParameterList();
|
| - var func = new FunctionDefinition(null, type, name, formals, null, null, this._makeSpan(start));
|
| - type = new FunctionTypeReference(false, func, func.get$span());
|
| + var func = new FunctionDefinition(null, type0, name, formals, null, null, this._makeSpan(start));
|
| + type0 = new FunctionTypeReference(false, func, func.get$span());
|
| }
|
| if (inOptionalBlock && value == null) {
|
| value = new NullExpression(this._makeSpan(start));
|
| }
|
| - return new FormalNode(isThis, isRest, type, name, value, this._makeSpan(start));
|
| + return new FormalNode(isThis, isRest, type0, name, value, this._makeSpan(start));
|
| }
|
| lang_Parser.prototype.formalParameterList = function() {
|
| this._eat(2/*TokenKind.LPAREN*/);
|
| @@ -13785,22 +13804,22 @@ lang_Parser.prototype.identifier = function() {
|
| return new lang_Identifier(tok.get$text(), this._makeSpan(tok.start));
|
| }
|
| lang_Parser.prototype._makeFunction = function(expr, body) {
|
| - var name, type;
|
| + var name, type0;
|
| if ((expr instanceof CallExpression)) {
|
| if ((expr.target instanceof VarExpression)) {
|
| name = expr.target.get$name();
|
| - type = null;
|
| + type0 = null;
|
| }
|
| else if ((expr.target instanceof DeclaredIdentifier)) {
|
| name = expr.target.get$name();
|
| - type = expr.target.type;
|
| + type0 = expr.target.type;
|
| }
|
| else {
|
| this._lang_error('bad function');
|
| }
|
| var formals = this._makeFormals(expr.get$arguments());
|
| var span = new SourceSpan(expr.get$span().file, expr.get$span().start, body.get$span().end);
|
| - var func = new FunctionDefinition(null, type, name, formals, null, body, span);
|
| + var func = new FunctionDefinition(null, type0, name, formals, null, body, span);
|
| return new LambdaExpression(func, func.get$span());
|
| }
|
| else {
|
| @@ -13837,11 +13856,11 @@ lang_Parser.prototype._makeFormalsFromList = function(expr) {
|
| }
|
| return this._makeFormalsFromExpressions(expr.values, false);
|
| }
|
| -lang_Parser.prototype._makeFormals = function(arguments) {
|
| +lang_Parser.prototype._makeFormals = function(arguments0) {
|
| var expressions = [];
|
| for (var i = 0;
|
| - i < arguments.length; i++) {
|
| - var arg = arguments.$index(i);
|
| + i < arguments0.length; i++) {
|
| + var arg = arguments0.$index(i);
|
| if (arg.label != null) {
|
| this._lang_error('expected formal, but found ":"');
|
| }
|
| @@ -13862,7 +13881,7 @@ lang_Parser.prototype._makeFormalsFromExpressions = function(expressions, allowO
|
| var expr = expressions.$index(i++);
|
| if (this._isBin(expr, 53/*TokenKind.GT*/)) {
|
| typeParams.add(this._makeType(expr.x));
|
| - var type = new GenericTypeReference(baseType, typeParams, 0, this._makeSpan(baseType.get$span().start));
|
| + var type0 = new GenericTypeReference(baseType, typeParams, 0, this._makeSpan(baseType.get$span().start));
|
| var name = null;
|
| if ((expr.y instanceof VarExpression)) {
|
| var ve = expr.y;
|
| @@ -13871,7 +13890,7 @@ lang_Parser.prototype._makeFormalsFromExpressions = function(expressions, allowO
|
| else {
|
| this._lang_error('expected formal', expr.get$span());
|
| }
|
| - formal = new FormalNode(false, false, type, name, null, this._makeSpan(expressions.$index(0).get$span().start));
|
| + formal = new FormalNode(false, false, type0, name, null, this._makeSpan(expressions.$index(0).get$span().start));
|
| break;
|
| }
|
| else {
|
| @@ -13921,8 +13940,8 @@ function lang_Node(span) {
|
| lang_Node.prototype.get$span = function() { return this.span; };
|
| lang_Node.prototype.set$span = function(value) { return this.span = value; };
|
| // ********** Code for Definition **************
|
| -function Definition(span) {
|
| - lang_Statement.call(this, span);
|
| +function Definition(span0) {
|
| + lang_Statement.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(Definition, lang_Statement);
|
| @@ -13930,21 +13949,21 @@ Definition.prototype.get$typeParameters = function() {
|
| return null;
|
| }
|
| // ********** Code for lang_Statement **************
|
| -function lang_Statement(span) {
|
| - lang_Node.call(this, span);
|
| +function lang_Statement(span0) {
|
| + lang_Node.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(lang_Statement, lang_Node);
|
| // ********** Code for lang_Expression **************
|
| -function lang_Expression(span) {
|
| - lang_Node.call(this, span);
|
| +function lang_Expression(span0) {
|
| + lang_Node.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(lang_Expression, lang_Node);
|
| // ********** Code for TypeReference **************
|
| -function TypeReference(span, type) {
|
| +function TypeReference(span0, type) {
|
| this.type = type;
|
| - lang_Node.call(this, span);
|
| + lang_Node.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(TypeReference, lang_Node);
|
| @@ -14016,10 +14035,10 @@ TreeOutput.prototype.writeNodeList = function(label, list) {
|
| }
|
| }
|
| // ********** Code for DirectiveDefinition **************
|
| -function DirectiveDefinition(name, arguments, span) {
|
| +function DirectiveDefinition(name, arguments, span0) {
|
| this.name = name;
|
| this.arguments = arguments;
|
| - Definition.call(this, span);
|
| + Definition.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(DirectiveDefinition, Definition);
|
| @@ -14031,7 +14050,7 @@ DirectiveDefinition.prototype.visit = function(visitor) {
|
| return visitor.visitDirectiveDefinition(this);
|
| }
|
| // ********** Code for TypeDefinition **************
|
| -function TypeDefinition(isClass, name, typeParameters, extendsTypes, implementsTypes, nativeType, factoryType, body, span) {
|
| +function TypeDefinition(isClass, name, typeParameters, extendsTypes, implementsTypes, nativeType, factoryType, body, span0) {
|
| this.isClass = isClass;
|
| this.name = name;
|
| this.typeParameters = typeParameters;
|
| @@ -14040,7 +14059,7 @@ function TypeDefinition(isClass, name, typeParameters, extendsTypes, implementsT
|
| this.nativeType = nativeType;
|
| this.factoryType = factoryType;
|
| this.body = body;
|
| - Definition.call(this, span);
|
| + Definition.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(TypeDefinition, Definition);
|
| @@ -14054,10 +14073,10 @@ TypeDefinition.prototype.visit = function(visitor) {
|
| return visitor.visitTypeDefinition(this);
|
| }
|
| // ********** Code for FunctionTypeDefinition **************
|
| -function FunctionTypeDefinition(func, typeParameters, span) {
|
| +function FunctionTypeDefinition(func, typeParameters, span0) {
|
| this.func = func;
|
| this.typeParameters = typeParameters;
|
| - Definition.call(this, span);
|
| + Definition.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(FunctionTypeDefinition, Definition);
|
| @@ -14067,12 +14086,12 @@ FunctionTypeDefinition.prototype.visit = function(visitor) {
|
| return visitor.visitFunctionTypeDefinition(this);
|
| }
|
| // ********** Code for VariableDefinition **************
|
| -function VariableDefinition(modifiers, type, names, values, span) {
|
| +function VariableDefinition(modifiers, type, names, values, span0) {
|
| this.modifiers = modifiers;
|
| this.type = type;
|
| this.names = names;
|
| this.values = values;
|
| - Definition.call(this, span);
|
| + Definition.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(VariableDefinition, Definition);
|
| @@ -14080,14 +14099,14 @@ VariableDefinition.prototype.visit = function(visitor) {
|
| return visitor.visitVariableDefinition(this);
|
| }
|
| // ********** Code for FunctionDefinition **************
|
| -function FunctionDefinition(modifiers, returnType, name, formals, initializers, body, span) {
|
| +function FunctionDefinition(modifiers, returnType, name, formals, initializers, body, span0) {
|
| this.modifiers = modifiers;
|
| this.returnType = returnType;
|
| this.name = name;
|
| this.formals = formals;
|
| this.initializers = initializers;
|
| this.body = body;
|
| - Definition.call(this, span);
|
| + Definition.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(FunctionDefinition, Definition);
|
| @@ -14099,9 +14118,9 @@ FunctionDefinition.prototype.visit = function(visitor) {
|
| return visitor.visitFunctionDefinition(this);
|
| }
|
| // ********** Code for ReturnStatement **************
|
| -function ReturnStatement(value, span) {
|
| +function ReturnStatement(value, span0) {
|
| this.value = value;
|
| - lang_Statement.call(this, span);
|
| + lang_Statement.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(ReturnStatement, lang_Statement);
|
| @@ -14111,9 +14130,9 @@ ReturnStatement.prototype.visit = function(visitor) {
|
| return visitor.visitReturnStatement(this);
|
| }
|
| // ********** Code for ThrowStatement **************
|
| -function ThrowStatement(value, span) {
|
| +function ThrowStatement(value, span0) {
|
| this.value = value;
|
| - lang_Statement.call(this, span);
|
| + lang_Statement.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(ThrowStatement, lang_Statement);
|
| @@ -14123,9 +14142,9 @@ ThrowStatement.prototype.visit = function(visitor) {
|
| return visitor.visitThrowStatement(this);
|
| }
|
| // ********** Code for AssertStatement **************
|
| -function AssertStatement(test, span) {
|
| +function AssertStatement(test, span0) {
|
| this.test = test;
|
| - lang_Statement.call(this, span);
|
| + lang_Statement.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(AssertStatement, lang_Statement);
|
| @@ -14133,9 +14152,9 @@ AssertStatement.prototype.visit = function(visitor) {
|
| return visitor.visitAssertStatement(this);
|
| }
|
| // ********** Code for BreakStatement **************
|
| -function BreakStatement(label, span) {
|
| +function BreakStatement(label, span0) {
|
| this.label = label;
|
| - lang_Statement.call(this, span);
|
| + lang_Statement.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(BreakStatement, lang_Statement);
|
| @@ -14143,9 +14162,9 @@ BreakStatement.prototype.visit = function(visitor) {
|
| return visitor.visitBreakStatement(this);
|
| }
|
| // ********** Code for ContinueStatement **************
|
| -function ContinueStatement(label, span) {
|
| +function ContinueStatement(label, span0) {
|
| this.label = label;
|
| - lang_Statement.call(this, span);
|
| + lang_Statement.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(ContinueStatement, lang_Statement);
|
| @@ -14153,11 +14172,11 @@ ContinueStatement.prototype.visit = function(visitor) {
|
| return visitor.visitContinueStatement(this);
|
| }
|
| // ********** Code for IfStatement **************
|
| -function IfStatement(test, trueBranch, falseBranch, span) {
|
| +function IfStatement(test, trueBranch, falseBranch, span0) {
|
| this.test = test;
|
| this.trueBranch = trueBranch;
|
| this.falseBranch = falseBranch;
|
| - lang_Statement.call(this, span);
|
| + lang_Statement.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(IfStatement, lang_Statement);
|
| @@ -14165,10 +14184,10 @@ IfStatement.prototype.visit = function(visitor) {
|
| return visitor.visitIfStatement(this);
|
| }
|
| // ********** Code for WhileStatement **************
|
| -function WhileStatement(test, body, span) {
|
| +function WhileStatement(test, body, span0) {
|
| this.test = test;
|
| this.body = body;
|
| - lang_Statement.call(this, span);
|
| + lang_Statement.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(WhileStatement, lang_Statement);
|
| @@ -14176,10 +14195,10 @@ WhileStatement.prototype.visit = function(visitor) {
|
| return visitor.visitWhileStatement(this);
|
| }
|
| // ********** Code for DoStatement **************
|
| -function DoStatement(body, test, span) {
|
| +function DoStatement(body, test, span0) {
|
| this.body = body;
|
| this.test = test;
|
| - lang_Statement.call(this, span);
|
| + lang_Statement.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(DoStatement, lang_Statement);
|
| @@ -14187,12 +14206,12 @@ DoStatement.prototype.visit = function(visitor) {
|
| return visitor.visitDoStatement(this);
|
| }
|
| // ********** Code for ForStatement **************
|
| -function ForStatement(init, test, step, body, span) {
|
| +function ForStatement(init, test, step, body, span0) {
|
| this.init = init;
|
| this.test = test;
|
| this.step = step;
|
| this.body = body;
|
| - lang_Statement.call(this, span);
|
| + lang_Statement.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(ForStatement, lang_Statement);
|
| @@ -14200,11 +14219,11 @@ ForStatement.prototype.visit = function(visitor) {
|
| return visitor.visitForStatement(this);
|
| }
|
| // ********** Code for ForInStatement **************
|
| -function ForInStatement(item, list, body, span) {
|
| +function ForInStatement(item, list, body, span0) {
|
| this.item = item;
|
| this.list = list;
|
| this.body = body;
|
| - lang_Statement.call(this, span);
|
| + lang_Statement.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(ForInStatement, lang_Statement);
|
| @@ -14212,11 +14231,11 @@ ForInStatement.prototype.visit = function(visitor) {
|
| return visitor.visitForInStatement(this);
|
| }
|
| // ********** Code for TryStatement **************
|
| -function TryStatement(body, catches, finallyBlock, span) {
|
| +function TryStatement(body, catches, finallyBlock, span0) {
|
| this.body = body;
|
| this.catches = catches;
|
| this.finallyBlock = finallyBlock;
|
| - lang_Statement.call(this, span);
|
| + lang_Statement.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(TryStatement, lang_Statement);
|
| @@ -14224,10 +14243,10 @@ TryStatement.prototype.visit = function(visitor) {
|
| return visitor.visitTryStatement(this);
|
| }
|
| // ********** Code for SwitchStatement **************
|
| -function SwitchStatement(test, cases, span) {
|
| +function SwitchStatement(test, cases, span0) {
|
| this.test = test;
|
| this.cases = cases;
|
| - lang_Statement.call(this, span);
|
| + lang_Statement.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(SwitchStatement, lang_Statement);
|
| @@ -14235,9 +14254,9 @@ SwitchStatement.prototype.visit = function(visitor) {
|
| return visitor.visitSwitchStatement(this);
|
| }
|
| // ********** Code for BlockStatement **************
|
| -function BlockStatement(body, span) {
|
| +function BlockStatement(body, span0) {
|
| this.body = body;
|
| - lang_Statement.call(this, span);
|
| + lang_Statement.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(BlockStatement, lang_Statement);
|
| @@ -14245,10 +14264,10 @@ BlockStatement.prototype.visit = function(visitor) {
|
| return visitor.visitBlockStatement(this);
|
| }
|
| // ********** Code for LabeledStatement **************
|
| -function LabeledStatement(name, body, span) {
|
| +function LabeledStatement(name, body, span0) {
|
| this.name = name;
|
| this.body = body;
|
| - lang_Statement.call(this, span);
|
| + lang_Statement.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(LabeledStatement, lang_Statement);
|
| @@ -14258,9 +14277,9 @@ LabeledStatement.prototype.visit = function(visitor) {
|
| return visitor.visitLabeledStatement(this);
|
| }
|
| // ********** Code for lang_ExpressionStatement **************
|
| -function lang_ExpressionStatement(body, span) {
|
| +function lang_ExpressionStatement(body, span0) {
|
| this.body = body;
|
| - lang_Statement.call(this, span);
|
| + lang_Statement.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(lang_ExpressionStatement, lang_Statement);
|
| @@ -14268,8 +14287,8 @@ lang_ExpressionStatement.prototype.visit = function(visitor) {
|
| return visitor.visitExpressionStatement(this);
|
| }
|
| // ********** Code for EmptyStatement **************
|
| -function EmptyStatement(span) {
|
| - lang_Statement.call(this, span);
|
| +function EmptyStatement(span0) {
|
| + lang_Statement.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(EmptyStatement, lang_Statement);
|
| @@ -14277,8 +14296,8 @@ EmptyStatement.prototype.visit = function(visitor) {
|
| return visitor.visitEmptyStatement(this);
|
| }
|
| // ********** Code for DietStatement **************
|
| -function DietStatement(span) {
|
| - lang_Statement.call(this, span);
|
| +function DietStatement(span0) {
|
| + lang_Statement.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(DietStatement, lang_Statement);
|
| @@ -14286,9 +14305,9 @@ DietStatement.prototype.visit = function(visitor) {
|
| return visitor.visitDietStatement(this);
|
| }
|
| // ********** Code for NativeStatement **************
|
| -function NativeStatement(body, span) {
|
| +function NativeStatement(body, span0) {
|
| this.body = body;
|
| - lang_Statement.call(this, span);
|
| + lang_Statement.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(NativeStatement, lang_Statement);
|
| @@ -14296,9 +14315,9 @@ NativeStatement.prototype.visit = function(visitor) {
|
| return visitor.visitNativeStatement(this);
|
| }
|
| // ********** Code for LambdaExpression **************
|
| -function LambdaExpression(func, span) {
|
| +function LambdaExpression(func, span0) {
|
| this.func = func;
|
| - lang_Expression.call(this, span);
|
| + lang_Expression.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(LambdaExpression, lang_Expression);
|
| @@ -14306,10 +14325,10 @@ LambdaExpression.prototype.visit = function(visitor) {
|
| return visitor.visitLambdaExpression(this);
|
| }
|
| // ********** Code for CallExpression **************
|
| -function CallExpression(target, arguments, span) {
|
| +function CallExpression(target, arguments, span0) {
|
| this.target = target;
|
| this.arguments = arguments;
|
| - lang_Expression.call(this, span);
|
| + lang_Expression.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(CallExpression, lang_Expression);
|
| @@ -14319,10 +14338,10 @@ CallExpression.prototype.visit = function(visitor) {
|
| return visitor.visitCallExpression(this);
|
| }
|
| // ********** Code for IndexExpression **************
|
| -function IndexExpression(target, index, span) {
|
| +function IndexExpression(target, index, span0) {
|
| this.target = target;
|
| this.index = index;
|
| - lang_Expression.call(this, span);
|
| + lang_Expression.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(IndexExpression, lang_Expression);
|
| @@ -14330,11 +14349,11 @@ IndexExpression.prototype.visit = function(visitor) {
|
| return visitor.visitIndexExpression(this);
|
| }
|
| // ********** Code for BinaryExpression **************
|
| -function BinaryExpression(op, x, y, span) {
|
| +function BinaryExpression(op, x, y, span0) {
|
| this.op = op;
|
| this.x = x;
|
| this.y = y;
|
| - lang_Expression.call(this, span);
|
| + lang_Expression.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(BinaryExpression, lang_Expression);
|
| @@ -14342,10 +14361,10 @@ BinaryExpression.prototype.visit = function(visitor) {
|
| return visitor.visitBinaryExpression(this);
|
| }
|
| // ********** Code for UnaryExpression **************
|
| -function UnaryExpression(op, self, span) {
|
| +function UnaryExpression(op, self, span0) {
|
| this.op = op;
|
| this.self = self;
|
| - lang_Expression.call(this, span);
|
| + lang_Expression.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(UnaryExpression, lang_Expression);
|
| @@ -14353,10 +14372,10 @@ UnaryExpression.prototype.visit = function(visitor) {
|
| return visitor.visitUnaryExpression(this);
|
| }
|
| // ********** Code for PostfixExpression **************
|
| -function PostfixExpression(body, op, span) {
|
| +function PostfixExpression(body, op, span0) {
|
| this.body = body;
|
| this.op = op;
|
| - lang_Expression.call(this, span);
|
| + lang_Expression.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(PostfixExpression, lang_Expression);
|
| @@ -14364,12 +14383,12 @@ PostfixExpression.prototype.visit = function(visitor) {
|
| return visitor.visitPostfixExpression$1(this);
|
| }
|
| // ********** Code for lang_NewExpression **************
|
| -function lang_NewExpression(isConst, type, name, arguments, span) {
|
| +function lang_NewExpression(isConst, type, name, arguments, span0) {
|
| this.isConst = isConst;
|
| this.type = type;
|
| this.name = name;
|
| this.arguments = arguments;
|
| - lang_Expression.call(this, span);
|
| + lang_Expression.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(lang_NewExpression, lang_Expression);
|
| @@ -14383,11 +14402,11 @@ lang_NewExpression.prototype.visit = function(visitor) {
|
| return visitor.visitNewExpression(this);
|
| }
|
| // ********** Code for ListExpression **************
|
| -function ListExpression(isConst, type, values, span) {
|
| +function ListExpression(isConst, type, values, span0) {
|
| this.isConst = isConst;
|
| this.type = type;
|
| this.values = values;
|
| - lang_Expression.call(this, span);
|
| + lang_Expression.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(ListExpression, lang_Expression);
|
| @@ -14397,11 +14416,11 @@ ListExpression.prototype.visit = function(visitor) {
|
| return visitor.visitListExpression(this);
|
| }
|
| // ********** Code for MapExpression **************
|
| -function MapExpression(isConst, type, items, span) {
|
| +function MapExpression(isConst, type, items, span0) {
|
| this.isConst = isConst;
|
| this.type = type;
|
| this.items = items;
|
| - lang_Expression.call(this, span);
|
| + lang_Expression.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(MapExpression, lang_Expression);
|
| @@ -14411,11 +14430,11 @@ MapExpression.prototype.visit = function(visitor) {
|
| return visitor.visitMapExpression(this);
|
| }
|
| // ********** Code for ConditionalExpression **************
|
| -function ConditionalExpression(test, trueBranch, falseBranch, span) {
|
| +function ConditionalExpression(test, trueBranch, falseBranch, span0) {
|
| this.test = test;
|
| this.trueBranch = trueBranch;
|
| this.falseBranch = falseBranch;
|
| - lang_Expression.call(this, span);
|
| + lang_Expression.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(ConditionalExpression, lang_Expression);
|
| @@ -14423,11 +14442,11 @@ ConditionalExpression.prototype.visit = function(visitor) {
|
| return visitor.visitConditionalExpression(this);
|
| }
|
| // ********** Code for IsExpression **************
|
| -function IsExpression(isTrue, x, type, span) {
|
| +function IsExpression(isTrue, x, type, span0) {
|
| this.isTrue = isTrue;
|
| this.x = x;
|
| this.type = type;
|
| - lang_Expression.call(this, span);
|
| + lang_Expression.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(IsExpression, lang_Expression);
|
| @@ -14435,9 +14454,9 @@ IsExpression.prototype.visit = function(visitor) {
|
| return visitor.visitIsExpression(this);
|
| }
|
| // ********** Code for ParenExpression **************
|
| -function ParenExpression(body, span) {
|
| +function ParenExpression(body, span0) {
|
| this.body = body;
|
| - lang_Expression.call(this, span);
|
| + lang_Expression.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(ParenExpression, lang_Expression);
|
| @@ -14445,10 +14464,10 @@ ParenExpression.prototype.visit = function(visitor) {
|
| return visitor.visitParenExpression(this);
|
| }
|
| // ********** Code for DotExpression **************
|
| -function DotExpression(self, name, span) {
|
| +function DotExpression(self, name, span0) {
|
| this.self = self;
|
| this.name = name;
|
| - lang_Expression.call(this, span);
|
| + lang_Expression.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(DotExpression, lang_Expression);
|
| @@ -14458,9 +14477,9 @@ DotExpression.prototype.visit = function(visitor) {
|
| return visitor.visitDotExpression(this);
|
| }
|
| // ********** Code for VarExpression **************
|
| -function VarExpression(name, span) {
|
| +function VarExpression(name, span0) {
|
| this.name = name;
|
| - lang_Expression.call(this, span);
|
| + lang_Expression.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(VarExpression, lang_Expression);
|
| @@ -14470,8 +14489,8 @@ VarExpression.prototype.visit = function(visitor) {
|
| return visitor.visitVarExpression(this);
|
| }
|
| // ********** Code for ThisExpression **************
|
| -function ThisExpression(span) {
|
| - lang_Expression.call(this, span);
|
| +function ThisExpression(span0) {
|
| + lang_Expression.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(ThisExpression, lang_Expression);
|
| @@ -14479,8 +14498,8 @@ ThisExpression.prototype.visit = function(visitor) {
|
| return visitor.visitThisExpression(this);
|
| }
|
| // ********** Code for SuperExpression **************
|
| -function SuperExpression(span) {
|
| - lang_Expression.call(this, span);
|
| +function SuperExpression(span0) {
|
| + lang_Expression.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(SuperExpression, lang_Expression);
|
| @@ -14488,8 +14507,8 @@ SuperExpression.prototype.visit = function(visitor) {
|
| return visitor.visitSuperExpression(this);
|
| }
|
| // ********** Code for NullExpression **************
|
| -function NullExpression(span) {
|
| - lang_Expression.call(this, span);
|
| +function NullExpression(span0) {
|
| + lang_Expression.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(NullExpression, lang_Expression);
|
| @@ -14497,11 +14516,11 @@ NullExpression.prototype.visit = function(visitor) {
|
| return visitor.visitNullExpression(this);
|
| }
|
| // ********** Code for LiteralExpression **************
|
| -function LiteralExpression(value, type, text, span) {
|
| +function LiteralExpression(value, type, text, span0) {
|
| this.value = value;
|
| this.type = type;
|
| this.text = text;
|
| - lang_Expression.call(this, span);
|
| + lang_Expression.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(LiteralExpression, lang_Expression);
|
| @@ -14513,11 +14532,11 @@ LiteralExpression.prototype.visit = function(visitor) {
|
| return visitor.visitLiteralExpression(this);
|
| }
|
| // ********** Code for NameTypeReference **************
|
| -function NameTypeReference(isFinal, name, names, span) {
|
| +function NameTypeReference(isFinal, name, names, span0) {
|
| this.isFinal = isFinal;
|
| this.name = name;
|
| this.names = names;
|
| - TypeReference.call(this, span);
|
| + TypeReference.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(NameTypeReference, TypeReference);
|
| @@ -14527,11 +14546,11 @@ NameTypeReference.prototype.visit = function(visitor) {
|
| return visitor.visitNameTypeReference(this);
|
| }
|
| // ********** Code for GenericTypeReference **************
|
| -function GenericTypeReference(baseType, typeArguments, depth, span) {
|
| +function GenericTypeReference(baseType, typeArguments, depth, span0) {
|
| this.baseType = baseType;
|
| this.typeArguments = typeArguments;
|
| this.depth = depth;
|
| - TypeReference.call(this, span);
|
| + TypeReference.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(GenericTypeReference, TypeReference);
|
| @@ -14539,10 +14558,10 @@ GenericTypeReference.prototype.visit = function(visitor) {
|
| return visitor.visitGenericTypeReference(this);
|
| }
|
| // ********** Code for FunctionTypeReference **************
|
| -function FunctionTypeReference(isFinal, func, span) {
|
| +function FunctionTypeReference(isFinal, func, span0) {
|
| this.isFinal = isFinal;
|
| this.func = func;
|
| - TypeReference.call(this, span);
|
| + TypeReference.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(FunctionTypeReference, TypeReference);
|
| @@ -14550,10 +14569,10 @@ FunctionTypeReference.prototype.visit = function(visitor) {
|
| return visitor.visitFunctionTypeReference(this);
|
| }
|
| // ********** Code for ArgumentNode **************
|
| -function ArgumentNode(label, value, span) {
|
| +function ArgumentNode(label, value, span0) {
|
| this.label = label;
|
| this.value = value;
|
| - lang_Node.call(this, span);
|
| + lang_Node.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(ArgumentNode, lang_Node);
|
| @@ -14563,13 +14582,13 @@ ArgumentNode.prototype.visit = function(visitor) {
|
| return visitor.visitArgumentNode(this);
|
| }
|
| // ********** Code for FormalNode **************
|
| -function FormalNode(isThis, isRest, type, name, value, span) {
|
| +function FormalNode(isThis, isRest, type, name, value, span0) {
|
| this.isThis = isThis;
|
| this.isRest = isRest;
|
| this.type = type;
|
| this.name = name;
|
| this.value = value;
|
| - lang_Node.call(this, span);
|
| + lang_Node.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(FormalNode, lang_Node);
|
| @@ -14581,11 +14600,11 @@ FormalNode.prototype.visit = function(visitor) {
|
| return visitor.visitFormalNode(this);
|
| }
|
| // ********** Code for CatchNode **************
|
| -function CatchNode(exception, trace, body, span) {
|
| +function CatchNode(exception, trace, body, span0) {
|
| this.exception = exception;
|
| this.trace = trace;
|
| this.body = body;
|
| - lang_Node.call(this, span);
|
| + lang_Node.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(CatchNode, lang_Node);
|
| @@ -14595,11 +14614,11 @@ CatchNode.prototype.visit = function(visitor) {
|
| return visitor.visitCatchNode(this);
|
| }
|
| // ********** Code for CaseNode **************
|
| -function CaseNode(label, cases, statements, span) {
|
| +function CaseNode(label, cases, statements, span0) {
|
| this.label = label;
|
| this.cases = cases;
|
| this.statements = statements;
|
| - lang_Node.call(this, span);
|
| + lang_Node.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(CaseNode, lang_Node);
|
| @@ -14607,10 +14626,10 @@ CaseNode.prototype.visit = function(visitor) {
|
| return visitor.visitCaseNode(this);
|
| }
|
| // ********** Code for TypeParameter **************
|
| -function TypeParameter(name, extendsType, span) {
|
| +function TypeParameter(name, extendsType, span0) {
|
| this.name = name;
|
| this.extendsType = extendsType;
|
| - lang_Node.call(this, span);
|
| + lang_Node.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(TypeParameter, lang_Node);
|
| @@ -14620,9 +14639,9 @@ TypeParameter.prototype.visit = function(visitor) {
|
| return visitor.visitTypeParameter(this);
|
| }
|
| // ********** Code for lang_Identifier **************
|
| -function lang_Identifier(name, span) {
|
| +function lang_Identifier(name, span0) {
|
| this.name = name;
|
| - lang_Node.call(this, span);
|
| + lang_Node.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(lang_Identifier, lang_Node);
|
| @@ -14632,10 +14651,10 @@ lang_Identifier.prototype.visit = function(visitor) {
|
| return visitor.visitIdentifier(this);
|
| }
|
| // ********** Code for DeclaredIdentifier **************
|
| -function DeclaredIdentifier(type, name, span) {
|
| +function DeclaredIdentifier(type, name, span0) {
|
| this.type = type;
|
| this.name = name;
|
| - lang_Expression.call(this, span);
|
| + lang_Expression.call(this, span0);
|
| // Initializers done
|
| }
|
| $inherits(DeclaredIdentifier, lang_Expression);
|
| @@ -14926,7 +14945,7 @@ lang_Type.prototype.get$typeMember = function() {
|
| }
|
| return this._typeMember;
|
| }
|
| -lang_Type.prototype.getMember = function(name) {
|
| +lang_Type.prototype.getMember = function(name0) {
|
| return null;
|
| }
|
| lang_Type.prototype.get$isVar = function() {
|
| @@ -14986,8 +15005,8 @@ lang_Type.prototype.get$typeofName = function() {
|
| lang_Type.prototype.get$jsname = function() {
|
| return this._jsname == null ? this.name : this._jsname;
|
| }
|
| -lang_Type.prototype.set$jsname = function(name) {
|
| - return this._jsname = name;
|
| +lang_Type.prototype.set$jsname = function(name0) {
|
| + return this._jsname = name0;
|
| }
|
| lang_Type.prototype.getAllMembers = function() {
|
| return $map([]);
|
| @@ -15017,9 +15036,9 @@ lang_Type.union = function(x, y) {
|
| return world.varType;
|
| }
|
| // ********** Code for ParameterType **************
|
| -function ParameterType(name, typeParameter) {
|
| +function ParameterType(name0, typeParameter) {
|
| this.typeParameter = typeParameter;
|
| - lang_Type.call(this, name);
|
| + lang_Type.call(this, name0);
|
| // Initializers done
|
| }
|
| $inherits(ParameterType, lang_Type);
|
| @@ -15059,14 +15078,14 @@ ParameterType.prototype.resolve = function(inType) {
|
| }
|
| }
|
| // ********** Code for ConcreteType **************
|
| -function ConcreteType(name, genericType, typeArguments, typeArgsInOrder) {
|
| +function ConcreteType(name0, genericType, typeArguments, typeArgsInOrder) {
|
| this.genericType = genericType;
|
| this.typeArguments = typeArguments;
|
| this.typeArgsInOrder = typeArgsInOrder;
|
| this.constructors = $map([]);
|
| this.members = $map([]);
|
| this.factories = new FactoryMap();
|
| - lang_Type.call(this, name);
|
| + lang_Type.call(this, name0);
|
| // Initializers done
|
| }
|
| $inherits(ConcreteType, lang_Type);
|
| @@ -15142,9 +15161,9 @@ ConcreteType.prototype.isParentOf = function(child) {
|
| if ($eq(child.genericType, this.genericType)) {
|
| var $list = this.typeArguments.getKeys();
|
| for (var $i = this.typeArguments.getKeys().iterator(); $i.hasNext(); ) {
|
| - var name = $i.next();
|
| - var myType = this.typeArguments.$index(name);
|
| - var childType = child.typeArguments.$index(name);
|
| + var name0 = $i.next();
|
| + var myType = this.typeArguments.$index(name0);
|
| + var childType = child.typeArguments.$index(name0);
|
| if (!myType.isParentOf(childType)) return false;
|
| }
|
| return true;
|
| @@ -15213,7 +15232,7 @@ ConcreteType.prototype.addDirectSubtype = function(type) {
|
| this.genericType.addDirectSubtype(type);
|
| }
|
| // ********** Code for DefinedType **************
|
| -function DefinedType(name, library, definition, isClass) {
|
| +function DefinedType(name0, library, definition0, isClass) {
|
| this.isUsed = false
|
| this.isNativeType = false
|
| this.library = library;
|
| @@ -15223,9 +15242,9 @@ function DefinedType(name, library, definition, isClass) {
|
| this.members = $map([]);
|
| this.factories = new FactoryMap();
|
| this._resolvedMembers = $map([]);
|
| - lang_Type.call(this, name);
|
| + lang_Type.call(this, name0);
|
| // Initializers done
|
| - this.setDefinition(definition);
|
| + this.setDefinition(definition0);
|
| }
|
| $inherits(DefinedType, lang_Type);
|
| DefinedType.prototype.get$definition = function() { return this.definition; };
|
| @@ -15310,7 +15329,7 @@ DefinedType.prototype.markUsed = function() {
|
| }
|
| DefinedType.prototype._resolveInterfaces = function(types) {
|
| if (types == null) return [];
|
| - var interfaces = [];
|
| + var interfaces0 = [];
|
| for (var $i = 0;$i < types.length; $i++) {
|
| var type = types.$index($i);
|
| var resolvedInterface = this.resolveType(type, true);
|
| @@ -15318,9 +15337,9 @@ DefinedType.prototype._resolveInterfaces = function(types) {
|
| world.error(('can not implement "' + resolvedInterface.get$name() + '": ') + 'only native implementation allowed', type.get$span());
|
| }
|
| resolvedInterface.addDirectSubtype(this);
|
| - interfaces.add(resolvedInterface);
|
| + interfaces0.add(resolvedInterface);
|
| }
|
| - return interfaces;
|
| + return interfaces0;
|
| }
|
| DefinedType.prototype.isParentOf = function(child) {
|
| return this.get$isVar() || this.get$isObject() || $eq(child, this) || this.get$subtypes().some((function (s) {
|
| @@ -15427,20 +15446,20 @@ DefinedType.prototype.resolve = function() {
|
| })
|
| );
|
| }
|
| -DefinedType.prototype.addMethod = function(methodName, definition) {
|
| - if (methodName == null) methodName = definition.name.name;
|
| - var method = new MethodMember(methodName, this, definition);
|
| +DefinedType.prototype.addMethod = function(methodName, definition0) {
|
| + if (methodName == null) methodName = definition0.name.name;
|
| + var method = new MethodMember(methodName, this, definition0);
|
| if (method.get$isConstructor()) {
|
| if (this.constructors.containsKey(method.get$constructorName())) {
|
| - world.error(('duplicate constructor definition of ' + method.get$name() + ''), definition.span);
|
| + world.error(('duplicate constructor definition of ' + method.get$name() + ''), definition0.span);
|
| return;
|
| }
|
| this.constructors.$setindex(method.get$constructorName(), method);
|
| return;
|
| }
|
| - if (definition.modifiers != null && definition.modifiers.length == 1 && definition.modifiers.$index(0).kind == 74/*TokenKind.FACTORY*/) {
|
| + if (definition0.modifiers != null && definition0.modifiers.length == 1 && definition0.modifiers.$index(0).kind == 74/*TokenKind.FACTORY*/) {
|
| if (this.factories.getFactory(method.get$constructorName(), method.get$name()) != null) {
|
| - world.error(('duplicate factory definition of ' + method.get$name() + ''), definition.span);
|
| + world.error(('duplicate factory definition of ' + method.get$name() + ''), definition0.span);
|
| return;
|
| }
|
| this.factories.addFactory(method.get$constructorName(), method.get$name(), method);
|
| @@ -15454,43 +15473,43 @@ DefinedType.prototype.addMethod = function(methodName, definition) {
|
| this.members.$setindex(propName, prop);
|
| }
|
| if (!(prop instanceof PropertyMember)) {
|
| - world.error(('property conflicts with field name: ' + propName + ''), definition.span);
|
| + world.error(('property conflicts with field name: ' + propName + ''), definition0.span);
|
| return;
|
| }
|
| if (methodName[0] == 'g') {
|
| if (prop.getter != null) {
|
| - world.error(('duplicate getter definition for ' + propName + ''), definition.span);
|
| + world.error(('duplicate getter definition for ' + propName + ''), definition0.span);
|
| }
|
| prop.getter = method;
|
| }
|
| else {
|
| if (prop.setter != null) {
|
| - world.error(('duplicate setter definition for ' + propName + ''), definition.span);
|
| + world.error(('duplicate setter definition for ' + propName + ''), definition0.span);
|
| }
|
| prop.setter = method;
|
| }
|
| return;
|
| }
|
| if (this.members.containsKey(methodName)) {
|
| - world.error(('duplicate method definition of ' + method.get$name() + ''), definition.span);
|
| + world.error(('duplicate method definition of ' + method.get$name() + ''), definition0.span);
|
| return;
|
| }
|
| this.members.$setindex(methodName, method);
|
| }
|
| -DefinedType.prototype.addField = function(definition) {
|
| +DefinedType.prototype.addField = function(definition0) {
|
| for (var i = 0;
|
| - i < definition.names.length; i++) {
|
| - var name = definition.names.$index(i).get$name();
|
| - if (this.members.containsKey(name)) {
|
| - world.error(('duplicate field definition of ' + name + ''), definition.span);
|
| + i < definition0.names.length; i++) {
|
| + var name0 = definition0.names.$index(i).get$name();
|
| + if (this.members.containsKey(name0)) {
|
| + world.error(('duplicate field definition of ' + name0 + ''), definition0.span);
|
| return;
|
| }
|
| var value = null;
|
| - if (definition.values != null) {
|
| - value = definition.values.$index(i);
|
| + if (definition0.values != null) {
|
| + value = definition0.values.$index(i);
|
| }
|
| - var field = new FieldMember(name, this, definition, value);
|
| - this.members.$setindex(name, field);
|
| + var field = new FieldMember(name0, this, definition0, value);
|
| + this.members.$setindex(name0, field);
|
| if (this.isNativeType) {
|
| field.isNative = true;
|
| }
|
| @@ -15517,19 +15536,19 @@ DefinedType.prototype.getConstructor = function(constructorName) {
|
| if ($ne(ret, null)) return ret;
|
| return this._tryCreateDefaultConstructor(constructorName);
|
| }
|
| -DefinedType.prototype._tryCreateDefaultConstructor = function(name) {
|
| - if (name == '' && this.definition != null && this.isClass && this.constructors.get$length() == 0) {
|
| - var span = this.definition.span;
|
| +DefinedType.prototype._tryCreateDefaultConstructor = function(name0) {
|
| + if (name0 == '' && this.definition != null && this.isClass && this.constructors.get$length() == 0) {
|
| + var span0 = this.definition.span;
|
| var inits = null, body = null;
|
| if (this.isNativeType) {
|
| - body = new NativeStatement(null, span);
|
| + body = new NativeStatement(null, span0);
|
| inits = null;
|
| }
|
| else {
|
| body = null;
|
| - inits = [new CallExpression(new SuperExpression(span), [], span)];
|
| + inits = [new CallExpression(new SuperExpression(span0), [], span0)];
|
| }
|
| - var c = new FunctionDefinition(null, null, this.definition.get$name(), [], inits, body, span);
|
| + var c = new FunctionDefinition(null, null, this.definition.get$name(), [], inits, body, span0);
|
| this.addMethod(null, c);
|
| this.constructors.$index('').resolve(this);
|
| return this.constructors.$index('');
|
| @@ -15643,18 +15662,18 @@ DefinedType.prototype.resolveType = function(node, isRequired) {
|
| if (node == null) return world.varType;
|
| if (node.type != null) return node.type;
|
| if ((node instanceof NameTypeReference)) {
|
| - var name;
|
| + var name0;
|
| if (node.names != null) {
|
| - name = node.names.last().get$name();
|
| + name0 = node.names.last().get$name();
|
| }
|
| else {
|
| - name = node.get$name().get$name();
|
| + name0 = node.get$name().get$name();
|
| }
|
| if (this.typeParameters != null) {
|
| var $list = this.typeParameters;
|
| for (var $i = 0;$i < $list.length; $i++) {
|
| var tp = $list.$index($i);
|
| - if ($eq(tp.get$name(), name)) {
|
| + if ($eq(tp.get$name(), name0)) {
|
| node.type = tp;
|
| }
|
| }
|
| @@ -15697,9 +15716,9 @@ DefinedType.prototype.resolveType = function(node, isRequired) {
|
| node.type = baseType.getOrMakeConcreteType(typeArgs);
|
| }
|
| else if ((node instanceof FunctionTypeReference)) {
|
| - var name = '';
|
| - if (node.func.name != null) name = node.func.name.name;
|
| - node.type = this.library.getOrAddFunctionType(name, node.func, this);
|
| + var name0 = '';
|
| + if (node.func.name != null) name0 = node.func.name.name;
|
| + node.type = this.library.getOrAddFunctionType(name0, node.func, this);
|
| }
|
| else {
|
| world.internalError('unknown type reference', node.span);
|
| @@ -15765,12 +15784,12 @@ DefinedType.prototype._interfaceIsAssignableFrom = function(other) {
|
| return false;
|
| }
|
| DefinedType.prototype.getCallStub = function(args) {
|
| - var name = _getCallStubName('call', args);
|
| + var name0 = _getCallStubName('call', args);
|
| if (this.varStubs == null) this.varStubs = $map([]);
|
| - var stub = this.varStubs.$index(name);
|
| + var stub = this.varStubs.$index(name0);
|
| if (stub == null) {
|
| - stub = new VarFunctionStub(name, args);
|
| - this.varStubs.$setindex(name, stub);
|
| + stub = new VarFunctionStub(name0, args);
|
| + this.varStubs.$setindex(name0, stub);
|
| }
|
| return stub;
|
| }
|
| @@ -15924,102 +15943,102 @@ Value.prototype.invokeSpecial = function(name, args, returnType) {
|
| }
|
| // ********** Code for EvaluatedValue **************
|
| function EvaluatedValue() {}
|
| -EvaluatedValue._internal$ctor = function(type, actualValue, canonicalCode, original, code) {
|
| +EvaluatedValue._internal$ctor = function(type0, actualValue, canonicalCode, original, code0) {
|
| this.actualValue = actualValue;
|
| this.canonicalCode = canonicalCode;
|
| this.original = original;
|
| - Value.call(this, type, code, false, false, false);
|
| + Value.call(this, type0, code0, false, false, false);
|
| // Initializers done
|
| }
|
| EvaluatedValue._internal$ctor.prototype = EvaluatedValue.prototype;
|
| $inherits(EvaluatedValue, Value);
|
| -EvaluatedValue.EvaluatedValue$factory = function(type, actualValue, canonicalCode, original) {
|
| - return new EvaluatedValue._internal$ctor(type, actualValue, canonicalCode, original, EvaluatedValue.codeWithComments(canonicalCode, original));
|
| +EvaluatedValue.EvaluatedValue$factory = function(type0, actualValue0, canonicalCode0, original0) {
|
| + return new EvaluatedValue._internal$ctor(type0, actualValue0, canonicalCode0, original0, EvaluatedValue.codeWithComments(canonicalCode0, original0));
|
| }
|
| EvaluatedValue.prototype.get$actualValue = function() { return this.actualValue; };
|
| EvaluatedValue.prototype.set$actualValue = function(value) { return this.actualValue = value; };
|
| EvaluatedValue.prototype.get$isConst = function() {
|
| return true;
|
| }
|
| -EvaluatedValue.codeWithComments = function(canonicalCode, original) {
|
| - return (original != null && original.get$text() != canonicalCode) ? ('' + canonicalCode + '/*' + original.get$text() + '*/') : canonicalCode;
|
| +EvaluatedValue.codeWithComments = function(canonicalCode0, original0) {
|
| + return (original0 != null && original0.get$text() != canonicalCode0) ? ('' + canonicalCode0 + '/*' + original0.get$text() + '*/') : canonicalCode0;
|
| }
|
| // ********** Code for ConstListValue **************
|
| function ConstListValue() {}
|
| -ConstListValue._internal$ctor = function(type, values, actualValue, canonicalCode, original, code) {
|
| +ConstListValue._internal$ctor = function(type0, values, actualValue0, canonicalCode0, original0, code0) {
|
| this.values = values;
|
| - EvaluatedValue._internal$ctor.call(this, type, actualValue, canonicalCode, original, code);
|
| + EvaluatedValue._internal$ctor.call(this, type0, actualValue0, canonicalCode0, original0, code0);
|
| // Initializers done
|
| }
|
| ConstListValue._internal$ctor.prototype = ConstListValue.prototype;
|
| $inherits(ConstListValue, EvaluatedValue);
|
| -ConstListValue.ConstListValue$factory = function(type, values, actualValue, canonicalCode, original) {
|
| - return new ConstListValue._internal$ctor(type, values, actualValue, canonicalCode, original, EvaluatedValue.codeWithComments(canonicalCode, original));
|
| +ConstListValue.ConstListValue$factory = function(type0, values0, actualValue0, canonicalCode0, original0) {
|
| + return new ConstListValue._internal$ctor(type0, values0, actualValue0, canonicalCode0, original0, EvaluatedValue.codeWithComments(canonicalCode0, original0));
|
| }
|
| // ********** Code for ConstMapValue **************
|
| function ConstMapValue() {}
|
| -ConstMapValue._internal$ctor = function(type, values, actualValue, canonicalCode, original, code) {
|
| +ConstMapValue._internal$ctor = function(type0, values, actualValue0, canonicalCode0, original0, code0) {
|
| this.values = values;
|
| - EvaluatedValue._internal$ctor.call(this, type, actualValue, canonicalCode, original, code);
|
| + EvaluatedValue._internal$ctor.call(this, type0, actualValue0, canonicalCode0, original0, code0);
|
| // Initializers done
|
| }
|
| ConstMapValue._internal$ctor.prototype = ConstMapValue.prototype;
|
| $inherits(ConstMapValue, EvaluatedValue);
|
| -ConstMapValue.ConstMapValue$factory = function(type, keyValuePairs, actualValue, canonicalCode, original) {
|
| - var values = new HashMapImplementation$String$EvaluatedValue();
|
| +ConstMapValue.ConstMapValue$factory = function(type0, keyValuePairs, actualValue0, canonicalCode0, original0) {
|
| + var values0 = new HashMapImplementation$String$EvaluatedValue();
|
| for (var i = 0;
|
| i < keyValuePairs.length; i += 2) {
|
| - values.$setindex(keyValuePairs.$index(i).get$actualValue(), keyValuePairs.$index(i + 1));
|
| + values0.$setindex(keyValuePairs.$index(i).get$actualValue(), keyValuePairs.$index(i + 1));
|
| }
|
| - return new ConstMapValue._internal$ctor(type, values, actualValue, canonicalCode, original, EvaluatedValue.codeWithComments(canonicalCode, original));
|
| + return new ConstMapValue._internal$ctor(type0, values0, actualValue0, canonicalCode0, original0, EvaluatedValue.codeWithComments(canonicalCode0, original0));
|
| }
|
| // ********** Code for ConstObjectValue **************
|
| function ConstObjectValue() {}
|
| -ConstObjectValue._internal$ctor = function(type, fields, actualValue, canonicalCode, original, code) {
|
| +ConstObjectValue._internal$ctor = function(type0, fields, actualValue0, canonicalCode0, original0, code0) {
|
| this.fields = fields;
|
| - EvaluatedValue._internal$ctor.call(this, type, actualValue, canonicalCode, original, code);
|
| + EvaluatedValue._internal$ctor.call(this, type0, actualValue0, canonicalCode0, original0, code0);
|
| // Initializers done
|
| }
|
| ConstObjectValue._internal$ctor.prototype = ConstObjectValue.prototype;
|
| $inherits(ConstObjectValue, EvaluatedValue);
|
| -ConstObjectValue.ConstObjectValue$factory = function(type, fields, canonicalCode, original) {
|
| +ConstObjectValue.ConstObjectValue$factory = function(type0, fields0, canonicalCode0, original0) {
|
| var fieldValues = [];
|
| - var $list = fields.getKeys();
|
| - for (var $i = fields.getKeys().iterator(); $i.hasNext(); ) {
|
| + var $list = fields0.getKeys();
|
| + for (var $i = fields0.getKeys().iterator(); $i.hasNext(); ) {
|
| var f = $i.next();
|
| - fieldValues.add(('' + f + ' = ' + fields.$index(f).get$actualValue() + ''));
|
| + fieldValues.add(('' + f + ' = ' + fields0.$index(f).get$actualValue() + ''));
|
| }
|
| fieldValues.sort((function (a, b) {
|
| return a.compareTo(b);
|
| })
|
| );
|
| - var actualValue = ('const ' + type.get$jsname() + ' [') + Strings.join(fieldValues, ',') + ']';
|
| - return new ConstObjectValue._internal$ctor(type, fields, actualValue, canonicalCode, original, EvaluatedValue.codeWithComments(canonicalCode, original));
|
| + var actualValue0 = ('const ' + type0.get$jsname() + ' [') + Strings.join(fieldValues, ',') + ']';
|
| + return new ConstObjectValue._internal$ctor(type0, fields0, actualValue0, canonicalCode0, original0, EvaluatedValue.codeWithComments(canonicalCode0, original0));
|
| }
|
| // ********** Code for GlobalValue **************
|
| -function GlobalValue(type, code, isConst, field, name, exp, canonicalCode, original, dependencies) {
|
| +function GlobalValue(type0, code0, isConst0, field, name, exp, canonicalCode, original, dependencies) {
|
| this.field = field;
|
| this.name = name;
|
| this.exp = exp;
|
| this.canonicalCode = canonicalCode;
|
| this.original = original;
|
| this.dependencies = dependencies;
|
| - Value.call(this, type, code, false, !isConst, false);
|
| + Value.call(this, type0, code0, false, !isConst0, false);
|
| // Initializers done
|
| }
|
| $inherits(GlobalValue, Value);
|
| -GlobalValue.GlobalValue$fromStatic$factory = function(field, exp, dependencies) {
|
| - var code = (exp.get$isConst() ? exp.canonicalCode : exp.code);
|
| - var codeWithComment = ('' + code + '/*' + field.declaringType.name + '.' + field.get$name() + '*/');
|
| - return new GlobalValue(exp.type, codeWithComment, field.isFinal, field, null, exp, code, null, dependencies.filter((function (d) {
|
| +GlobalValue.GlobalValue$fromStatic$factory = function(field0, exp0, dependencies0) {
|
| + var code0 = (exp0.get$isConst() ? exp0.canonicalCode : exp0.code);
|
| + var codeWithComment = ('' + code0 + '/*' + field0.declaringType.name + '.' + field0.get$name() + '*/');
|
| + return new GlobalValue(exp0.type, codeWithComment, field0.isFinal, field0, null, exp0, code0, null, dependencies0.filter((function (d) {
|
| return (d instanceof GlobalValue);
|
| })
|
| ));
|
| }
|
| -GlobalValue.GlobalValue$fromConst$factory = function(uniqueId, exp, dependencies) {
|
| - var name = ("const\$" + uniqueId + "");
|
| - var codeWithComment = ("" + name + "/*" + exp.original.get$text() + "*/");
|
| - return new GlobalValue(exp.type, codeWithComment, true, null, name, exp, name, exp.original, dependencies.filter((function (d) {
|
| +GlobalValue.GlobalValue$fromConst$factory = function(uniqueId, exp0, dependencies0) {
|
| + var name0 = ("const\$" + uniqueId + "");
|
| + var codeWithComment = ("" + name0 + "/*" + exp0.original.get$text() + "*/");
|
| + return new GlobalValue(exp0.type, codeWithComment, true, null, name0, exp0, name0, exp0.original, dependencies0.filter((function (d) {
|
| return (d instanceof GlobalValue);
|
| })
|
| ));
|
| @@ -16578,17 +16597,17 @@ VarMethodStub.prototype.generateBody = function(code) {
|
| code.exitBlock('}');
|
| }
|
| }
|
| -VarMethodStub.prototype._useDirectCall = function(member, args) {
|
| - if ((member instanceof MethodMember) && $ne(member.declaringType.get$library(), world.get$dom())) {
|
| - var method = member;
|
| +VarMethodStub.prototype._useDirectCall = function(member0, args0) {
|
| + if ((member0 instanceof MethodMember) && $ne(member0.declaringType.get$library(), world.get$dom())) {
|
| + var method = member0;
|
| method.genParameterValues();
|
| - for (var i = args.get$length();
|
| + for (var i = args0.get$length();
|
| i < method.parameters.length; i++) {
|
| if (method.parameters.$index(i).get$value().code != 'null') {
|
| return false;
|
| }
|
| }
|
| - return method.namesInOrder(args);
|
| + return method.namesInOrder(args0);
|
| }
|
| else {
|
| return false;
|
| @@ -16608,9 +16627,9 @@ VarMethodSet.prototype.get$returnType = function() { return this.returnType; };
|
| VarMethodSet.prototype.get$baseName = function() {
|
| return this.members.$index(0).get$name();
|
| }
|
| -VarMethodSet.prototype.invoke = function(node, target, args) {
|
| +VarMethodSet.prototype.invoke = function(node, target, args0) {
|
| this._invokeMembers(node);
|
| - return VarMember.prototype.invoke.call(this, node, target, args);
|
| + return VarMember.prototype.invoke.call(this, node, target, args0);
|
| }
|
| VarMethodSet.prototype._invokeMembers = function(node) {
|
| if (this._fallbackStubs != null) return;
|
| @@ -16679,8 +16698,8 @@ function reduce(source, callback, initialValue) {
|
| }
|
| return current;
|
| }
|
| -function orderValuesByKeys(map) {
|
| - var keys = map.getKeys();
|
| +function orderValuesByKeys(map0) {
|
| + var keys = map0.getKeys();
|
| keys.sort((function (x, y) {
|
| return x.compareTo(y);
|
| })
|
| @@ -16688,7 +16707,7 @@ function orderValuesByKeys(map) {
|
| var values = [];
|
| for (var $i = keys.iterator(); $i.hasNext(); ) {
|
| var k = $i.next();
|
| - values.add(map.$index(k));
|
| + values.add(map0.$index(k));
|
| }
|
| return values;
|
| }
|
|
|
Chromium Code Reviews
Issue 8437043:
Fixes a few different issues related to block scope. (Closed)
Base URL: https://dart.googlecode.com/svn/experimental/frog