| Index: frog/frogsh
|
| diff --git a/frog/frogsh b/frog/frogsh
|
| index c095573e891439f66f40c77a8f91011af68181bd..8fd96d8fce869e99f216b9b024b8f00332c3d932 100755
|
| --- a/frog/frogsh
|
| +++ b/frog/frogsh
|
| @@ -2247,12 +2247,6 @@ Collections.filter = function(source, destination, f) {
|
| }
|
| // ********** Code for DateImplementation **************
|
| function DateImplementation() {}
|
| -DateImplementation.fromEpoch$ctor = function(value, timeZone) {
|
| - this.value = value;
|
| - this.timeZone = timeZone;
|
| - // Initializers done
|
| -}
|
| -DateImplementation.fromEpoch$ctor.prototype = DateImplementation.prototype;
|
| DateImplementation.now$ctor = function() {
|
| this.timeZone = new TimeZoneImplementation.local$ctor();
|
| this.value = DateImplementation._now();
|
| @@ -2260,6 +2254,12 @@ DateImplementation.now$ctor = function() {
|
| this._asJs();
|
| }
|
| DateImplementation.now$ctor.prototype = DateImplementation.prototype;
|
| +DateImplementation.fromEpoch$ctor = function(value, timeZone) {
|
| + this.value = value;
|
| + this.timeZone = timeZone;
|
| + // Initializers done
|
| +}
|
| +DateImplementation.fromEpoch$ctor.prototype = DateImplementation.prototype;
|
| DateImplementation.prototype.is$Date = function(){return this;};
|
| DateImplementation.prototype.is$Comparable = function(){return this;};
|
| DateImplementation.prototype.get$value = function() { return this.value; };
|
| @@ -2643,7 +2643,7 @@ function ArrayBasedScanner() {
|
| this.extraCharOffset = 0;
|
| this.tokenStart = -1;
|
| this.byteOffset = -1;
|
| - this.tokens = new Token(0/*null.EOF_TOKEN*/, -1);
|
| + this.tokens = new scanner_Token(0/*null.EOF_TOKEN*/, -1);
|
| // Initializers done
|
| AbstractScanner$S.call(this);
|
| this.tail = this.tokens;
|
| @@ -2680,7 +2680,7 @@ ArrayBasedScanner.prototype.appendKeywordToken = function(keyword) {
|
| this.tail = this.tail.next;
|
| }
|
| ArrayBasedScanner.prototype.appendEofToken = function() {
|
| - this.tail.next = new Token(0/*null.EOF_TOKEN*/, this.get$charOffset());
|
| + this.tail.next = new scanner_Token(0/*null.EOF_TOKEN*/, this.get$charOffset());
|
| this.tail = this.tail.next;
|
| }
|
| ArrayBasedScanner.prototype.beginToken = function() {
|
| @@ -2761,7 +2761,7 @@ function ArrayBasedScanner$SourceString() {
|
| this.extraCharOffset = 0;
|
| this.tokenStart = -1;
|
| this.byteOffset = -1;
|
| - this.tokens = new Token(0/*null.EOF_TOKEN*/, -1);
|
| + this.tokens = new scanner_Token(0/*null.EOF_TOKEN*/, -1);
|
| // Initializers done
|
| AbstractScanner$S.call(this);
|
| this.tail = this.tokens;
|
| @@ -3984,7 +3984,7 @@ function PartialParser(listener) {
|
| })
|
| ;
|
| this.parseTypeFunction = (function (t) {
|
| - return $this.parseType((t && t.is$Token()));
|
| + return $this.parseType((t && t.is$scanner_Token()));
|
| })
|
| ;
|
| this.endTypeArguments = (function (c, bt, et) {
|
| @@ -4000,7 +4000,7 @@ function PartialParser(listener) {
|
| })
|
| ;
|
| this.parseTypeVariableFunction = (function (t) {
|
| - return $this.parseTypeVariable((t && t.is$Token()));
|
| + return $this.parseTypeVariable((t && t.is$scanner_Token()));
|
| })
|
| ;
|
| this.endTypeVariables = (function (c, bt, et) {
|
| @@ -4204,7 +4204,7 @@ PartialParser.prototype.parseString = function(token) {
|
| return this.next(token);
|
| }
|
| else {
|
| - return (($0 = this.listener.expected$2('string', token)) && $0.is$Token());
|
| + return (($0 = this.listener.expected$2('string', token)) && $0.is$scanner_Token());
|
| }
|
| }
|
| PartialParser.prototype.parseIdentifier = function(token) {
|
| @@ -4289,7 +4289,7 @@ PartialParser.prototype.parseStuff = function(token, beginStuff, stuffParser, en
|
| beginStuff.call$1(begin);
|
| var count = 0;
|
| do {
|
| - token = (($0 = stuffParser.call$1(this.next(token))) && $0.is$Token());
|
| + token = (($0 = stuffParser.call$1(this.next(token))) && $0.is$scanner_Token());
|
| ++count;
|
| }
|
| while ($notnull_bool(this.optional(',', token)))
|
| @@ -4386,15 +4386,15 @@ PartialParser.prototype.handleNoTypeVariables$1 = function($0) {
|
| return this.handleNoTypeVariables.call$1($0);
|
| };
|
| PartialParser.prototype.parseClass$1 = function($0) {
|
| - return this.parseClass(($0 && $0.is$Token()));
|
| + return this.parseClass(($0 && $0.is$scanner_Token()));
|
| };
|
| -// ********** Code for Parser **************
|
| -function Parser(listener) {
|
| +// ********** Code for scanner_Parser **************
|
| +function scanner_Parser(listener) {
|
| // Initializers done
|
| PartialParser.call(this, listener);
|
| }
|
| -$inherits(Parser, PartialParser);
|
| -Parser.prototype.parseFunction = function(token) {
|
| +$inherits(scanner_Parser, PartialParser);
|
| +scanner_Parser.prototype.parseFunction = function(token) {
|
| this.listener.beginFunction$1(token);
|
| token = this.parseReturnTypeOpt(token);
|
| this.listener.beginFunctionName$1(token);
|
| @@ -4403,7 +4403,7 @@ Parser.prototype.parseFunction = function(token) {
|
| token = this.parseFormalParameters(token);
|
| return this.parseFunctionBody(token);
|
| }
|
| -Parser.prototype.parseFunctionBody = function(token) {
|
| +scanner_Parser.prototype.parseFunctionBody = function(token) {
|
| if ($notnull_bool(this.optional(';', token))) {
|
| this.listener.endFunctionBody$3(0, null, token);
|
| return token.next;
|
| @@ -4419,7 +4419,7 @@ Parser.prototype.parseFunctionBody = function(token) {
|
| this.listener.endFunctionBody$3(statementCount, begin, token);
|
| return this.expect('}', token);
|
| }
|
| -Parser.prototype.parseStatement = function(token) {
|
| +scanner_Parser.prototype.parseStatement = function(token) {
|
| this.checkEof(token);
|
| var value = token.get$stringValue();
|
| switch (true) {
|
| @@ -4457,10 +4457,10 @@ Parser.prototype.parseStatement = function(token) {
|
|
|
| }
|
| }
|
| -Parser.prototype.expectSemicolon = function(token) {
|
| +scanner_Parser.prototype.expectSemicolon = function(token) {
|
| return this.expect(';', token);
|
| }
|
| -Parser.prototype.parseReturnStatement = function(token) {
|
| +scanner_Parser.prototype.parseReturnStatement = function(token) {
|
| var begin = token;
|
| this.listener.beginReturnStatement$1(begin);
|
| $assert('return' === token.get$stringValue(), "'return' === token.stringValue", "parser.dart", 455, 12);
|
| @@ -4474,7 +4474,7 @@ Parser.prototype.parseReturnStatement = function(token) {
|
| }
|
| return this.expectSemicolon(token);
|
| }
|
| -Parser.prototype.peekAfterType = function(token) {
|
| +scanner_Parser.prototype.peekAfterType = function(token) {
|
| $assert(token.kind === 97/*null.IDENTIFIER_TOKEN*/, "token.kind === IDENTIFIER_TOKEN", "parser.dart", 468, 12);
|
| var peek = token.next;
|
| if (peek.kind === 46/*null.PERIOD_TOKEN*/) {
|
| @@ -4491,7 +4491,7 @@ Parser.prototype.peekAfterType = function(token) {
|
| }
|
| return peek;
|
| }
|
| -Parser.prototype.peekIdentifierAfterType = function(token) {
|
| +scanner_Parser.prototype.peekIdentifierAfterType = function(token) {
|
| var peek = this.peekAfterType(token);
|
| if (peek != null && peek.kind === 97/*null.IDENTIFIER_TOKEN*/) {
|
| return peek;
|
| @@ -4500,7 +4500,7 @@ Parser.prototype.peekIdentifierAfterType = function(token) {
|
| return null;
|
| }
|
| }
|
| -Parser.prototype.parseExpressionStatementOrDeclaration = function(token) {
|
| +scanner_Parser.prototype.parseExpressionStatementOrDeclaration = function(token) {
|
| var identifier = this.peekIdentifierAfterType(token);
|
| if (identifier != null) {
|
| $assert(identifier.kind === 97/*null.IDENTIFIER_TOKEN*/, "identifier.kind === IDENTIFIER_TOKEN", "parser.dart", 504, 14);
|
| @@ -4520,13 +4520,13 @@ Parser.prototype.parseExpressionStatementOrDeclaration = function(token) {
|
| }
|
| return this.parseExpressionStatement(token);
|
| }
|
| -Parser.prototype.parseExpressionStatement = function(token) {
|
| +scanner_Parser.prototype.parseExpressionStatement = function(token) {
|
| this.listener.beginExpressionStatement$1(token);
|
| token = this.parseExpression(token);
|
| this.listener.endExpressionStatement$1(token);
|
| return this.expectSemicolon(token);
|
| }
|
| -Parser.prototype.parseExpression = function(token) {
|
| +scanner_Parser.prototype.parseExpression = function(token) {
|
| token = this.parseConditionalExpression(token);
|
| if ($notnull_bool(this.isAssignmentOperator(token))) {
|
| var operator = token;
|
| @@ -4535,10 +4535,10 @@ Parser.prototype.parseExpression = function(token) {
|
| }
|
| return token;
|
| }
|
| -Parser.prototype.isAssignmentOperator = function(token) {
|
| +scanner_Parser.prototype.isAssignmentOperator = function(token) {
|
| return 2 === this.getPrecedence(token);
|
| }
|
| -Parser.prototype.parseConditionalExpression = function(token) {
|
| +scanner_Parser.prototype.parseConditionalExpression = function(token) {
|
| token = this.parseBinaryExpression(token, 4);
|
| if ($notnull_bool(this.optional('?', token))) {
|
| var question = token;
|
| @@ -4550,7 +4550,7 @@ Parser.prototype.parseConditionalExpression = function(token) {
|
| }
|
| return token;
|
| }
|
| -Parser.prototype.parseBinaryExpression = function(token, precedence) {
|
| +scanner_Parser.prototype.parseBinaryExpression = function(token, precedence) {
|
| $assert(precedence >= 4, "precedence >= 4", "parser.dart", 561, 12);
|
| token = this.parseUnaryExpression(token);
|
| var tokenLevel = this.getPrecedence(token);
|
| @@ -4565,7 +4565,7 @@ Parser.prototype.parseBinaryExpression = function(token, precedence) {
|
| }
|
| return token;
|
| }
|
| -Parser.prototype.getPrecedence = function(token) {
|
| +scanner_Parser.prototype.getPrecedence = function(token) {
|
| if (token == null) return 0;
|
| var value = token.get$stringValue();
|
| if (value == null) return 0;
|
| @@ -4736,7 +4736,7 @@ Parser.prototype.getPrecedence = function(token) {
|
|
|
| }
|
| }
|
| -Parser.prototype.parseUnaryExpression = function(token) {
|
| +scanner_Parser.prototype.parseUnaryExpression = function(token) {
|
| var value = token.get$stringValue();
|
| switch (true) {
|
| case value === '!':
|
| @@ -4772,7 +4772,7 @@ Parser.prototype.parseUnaryExpression = function(token) {
|
| }
|
| return token;
|
| }
|
| -Parser.prototype.parsePrimary = function(token) {
|
| +scanner_Parser.prototype.parsePrimary = function(token) {
|
| var kind = token.kind;
|
| switch (true) {
|
| case kind === 97/*null.IDENTIFIER_TOKEN*/:
|
| @@ -4817,30 +4817,30 @@ Parser.prototype.parsePrimary = function(token) {
|
|
|
| }
|
| }
|
| -Parser.prototype.parseLiteralInt = function(token) {
|
| +scanner_Parser.prototype.parseLiteralInt = function(token) {
|
| this.listener.handleLiteralInt$1(token);
|
| return token.next;
|
| }
|
| -Parser.prototype.parseLiteralDouble = function(token) {
|
| +scanner_Parser.prototype.parseLiteralDouble = function(token) {
|
| this.listener.handleLiteralDouble$1(token);
|
| return token.next;
|
| }
|
| -Parser.prototype.parseLiteralString = function(token) {
|
| +scanner_Parser.prototype.parseLiteralString = function(token) {
|
| this.listener.handleLiteralString$1(token);
|
| return token.next;
|
| }
|
| -Parser.prototype.parseLiteralBool = function(token) {
|
| +scanner_Parser.prototype.parseLiteralBool = function(token) {
|
| this.listener.handleLiteralBool$1(token);
|
| return token.next;
|
| }
|
| -Parser.prototype.parseSend = function(token) {
|
| +scanner_Parser.prototype.parseSend = function(token) {
|
| this.listener.beginSend$1(token);
|
| token = this.parseIdentifier(token);
|
| token = this.parseArgumentsOpt(token);
|
| this.listener.endSend$1(token);
|
| return token;
|
| }
|
| -Parser.prototype.parseArgumentsOpt = function(token) {
|
| +scanner_Parser.prototype.parseArgumentsOpt = function(token) {
|
| if (!$notnull_bool(this.optional('(', token))) {
|
| this.listener.handleNoArguments$1(token);
|
| return token;
|
| @@ -4849,7 +4849,7 @@ Parser.prototype.parseArgumentsOpt = function(token) {
|
| return this.parseArguments(token);
|
| }
|
| }
|
| -Parser.prototype.parseArguments = function(token) {
|
| +scanner_Parser.prototype.parseArguments = function(token) {
|
| var begin = token;
|
| this.listener.beginArguments$1(begin);
|
| $assert('(' === token.get$stringValue(), "'(' === token.stringValue", "parser.dart", 726, 12);
|
| @@ -4866,7 +4866,7 @@ Parser.prototype.parseArguments = function(token) {
|
| this.listener.endArguments$3(argumentCount, begin, token);
|
| return this.expect(')', token);
|
| }
|
| -Parser.prototype.parseVariablesDeclaration = function(token) {
|
| +scanner_Parser.prototype.parseVariablesDeclaration = function(token) {
|
| var count = 1;
|
| this.listener.beginVariablesDeclaration$1(token);
|
| token = this.parseFinalVarOrType(token);
|
| @@ -4878,7 +4878,7 @@ Parser.prototype.parseVariablesDeclaration = function(token) {
|
| this.listener.endVariablesDeclaration$2(count, token);
|
| return this.expectSemicolon(token);
|
| }
|
| -Parser.prototype.parseOptionallyInitializedIdentifier = function(token) {
|
| +scanner_Parser.prototype.parseOptionallyInitializedIdentifier = function(token) {
|
| this.listener.beginInitializedIdentifier$1(token);
|
| token = this.parseIdentifier(token);
|
| if ($notnull_bool(this.optional('=', token))) {
|
| @@ -4890,7 +4890,7 @@ Parser.prototype.parseOptionallyInitializedIdentifier = function(token) {
|
| this.listener.endInitializedIdentifier$0();
|
| return token;
|
| }
|
| -Parser.prototype.parseFinalVarOrType = function(token) {
|
| +scanner_Parser.prototype.parseFinalVarOrType = function(token) {
|
| var value = token.get$stringValue();
|
| switch (true) {
|
| case 'final' === value:
|
| @@ -4904,7 +4904,7 @@ Parser.prototype.parseFinalVarOrType = function(token) {
|
|
|
| }
|
| }
|
| -Parser.prototype.parseIfStatement = function(token) {
|
| +scanner_Parser.prototype.parseIfStatement = function(token) {
|
| var ifToken = token;
|
| this.listener.beginIfStatement$1(ifToken);
|
| token = this.expect('if', token);
|
| @@ -4919,7 +4919,7 @@ Parser.prototype.parseIfStatement = function(token) {
|
| this.listener.endIfStatement$2(ifToken, elseToken);
|
| return token;
|
| }
|
| -Parser.prototype.parseForStatement = function(token) {
|
| +scanner_Parser.prototype.parseForStatement = function(token) {
|
| var forToken = token;
|
| this.listener.beginForStatement$1(forToken);
|
| token = this.expect('for', token);
|
| @@ -4932,7 +4932,7 @@ Parser.prototype.parseForStatement = function(token) {
|
| this.listener.endForStatement$2(forToken, token);
|
| return token;
|
| }
|
| -Parser.prototype.parseBlock = function(token) {
|
| +scanner_Parser.prototype.parseBlock = function(token) {
|
| var begin = token;
|
| this.listener.beginBlock$1(begin);
|
| var statementCount = 0;
|
| @@ -4944,7 +4944,7 @@ Parser.prototype.parseBlock = function(token) {
|
| this.listener.endBlock$3(statementCount, begin, token);
|
| return this.expect('}', token);
|
| }
|
| -Parser.prototype.parseThrowStatement = function(token) {
|
| +scanner_Parser.prototype.parseThrowStatement = function(token) {
|
| var throwToken = token;
|
| this.listener.beginThrowStatement$1(throwToken);
|
| token = this.expect('throw', token);
|
| @@ -4958,8 +4958,8 @@ Parser.prototype.parseThrowStatement = function(token) {
|
| return this.expectSemicolon(token);
|
| }
|
| }
|
| -Parser.prototype.parseFunction$1 = function($0) {
|
| - return this.parseFunction(($0 && $0.is$Token()));
|
| +scanner_Parser.prototype.parseFunction$1 = function($0) {
|
| + return this.parseFunction(($0 && $0.is$scanner_Token()));
|
| };
|
| // ********** Code for ParserTask **************
|
| function ParserTask(compiler) {
|
| @@ -4976,7 +4976,7 @@ ParserTask.prototype.parse = function(element) {
|
| return (($0 = this.measure((function () {
|
| return element.parseNode($this.compiler, $this.compiler);
|
| })
|
| - )) && $0.is$Node());
|
| + )) && $0.is$tree_Node());
|
| }
|
| // ********** Code for Listener **************
|
| function Listener() {
|
| @@ -5196,214 +5196,214 @@ Listener.prototype.unexpected = function(token) {
|
| $throw(new ParserError(("Unexpected token '" + token + "' @ " + token.charOffset + "")));
|
| }
|
| Listener.prototype.beginArguments$1 = function($0) {
|
| - return this.beginArguments(($0 && $0.is$Token()));
|
| + return this.beginArguments(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.beginBlock$1 = function($0) {
|
| - return this.beginBlock(($0 && $0.is$Token()));
|
| + return this.beginBlock(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.beginClass$1 = function($0) {
|
| - return this.beginClass(($0 && $0.is$Token()));
|
| + return this.beginClass(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.beginExpressionStatement$1 = function($0) {
|
| - return this.beginExpressionStatement(($0 && $0.is$Token()));
|
| + return this.beginExpressionStatement(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.beginForStatement$1 = function($0) {
|
| - return this.beginForStatement(($0 && $0.is$Token()));
|
| + return this.beginForStatement(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.beginFormalParameter$1 = function($0) {
|
| - return this.beginFormalParameter(($0 && $0.is$Token()));
|
| + return this.beginFormalParameter(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.beginFormalParameters$1 = function($0) {
|
| - return this.beginFormalParameters(($0 && $0.is$Token()));
|
| + return this.beginFormalParameters(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.beginFunction$1 = function($0) {
|
| - return this.beginFunction(($0 && $0.is$Token()));
|
| + return this.beginFunction(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.beginFunctionBody$1 = function($0) {
|
| - return this.beginFunctionBody(($0 && $0.is$Token()));
|
| + return this.beginFunctionBody(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.beginFunctionName$1 = function($0) {
|
| - return this.beginFunctionName(($0 && $0.is$Token()));
|
| + return this.beginFunctionName(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.beginFunctionTypeAlias$1 = function($0) {
|
| - return this.beginFunctionTypeAlias(($0 && $0.is$Token()));
|
| + return this.beginFunctionTypeAlias(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.beginIfStatement$1 = function($0) {
|
| - return this.beginIfStatement(($0 && $0.is$Token()));
|
| + return this.beginIfStatement(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.beginInitializedIdentifier$1 = function($0) {
|
| - return this.beginInitializedIdentifier(($0 && $0.is$Token()));
|
| + return this.beginInitializedIdentifier(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.beginInitializer$1 = function($0) {
|
| - return this.beginInitializer(($0 && $0.is$Token()));
|
| + return this.beginInitializer(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.beginInterface$1 = function($0) {
|
| - return this.beginInterface(($0 && $0.is$Token()));
|
| + return this.beginInterface(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.beginLibraryTag$1 = function($0) {
|
| - return this.beginLibraryTag(($0 && $0.is$Token()));
|
| + return this.beginLibraryTag(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.beginReturnStatement$1 = function($0) {
|
| - return this.beginReturnStatement(($0 && $0.is$Token()));
|
| + return this.beginReturnStatement(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.beginSend$1 = function($0) {
|
| - return this.beginSend(($0 && $0.is$Token()));
|
| + return this.beginSend(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.beginThrowStatement$1 = function($0) {
|
| - return this.beginThrowStatement(($0 && $0.is$Token()));
|
| + return this.beginThrowStatement(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.beginTopLevelMember$1 = function($0) {
|
| - return this.beginTopLevelMember(($0 && $0.is$Token()));
|
| + return this.beginTopLevelMember(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.beginTypeArguments$1 = function($0) {
|
| - return this.beginTypeArguments(($0 && $0.is$Token()));
|
| + return this.beginTypeArguments(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.beginTypeVariable$1 = function($0) {
|
| - return this.beginTypeVariable(($0 && $0.is$Token()));
|
| + return this.beginTypeVariable(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.beginTypeVariables$1 = function($0) {
|
| - return this.beginTypeVariables(($0 && $0.is$Token()));
|
| + return this.beginTypeVariables(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.beginVariablesDeclaration$1 = function($0) {
|
| - return this.beginVariablesDeclaration(($0 && $0.is$Token()));
|
| + return this.beginVariablesDeclaration(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.endArguments$3 = function($0, $1, $2) {
|
| - return this.endArguments($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()));
|
| + return this.endArguments($assert_num($0), ($1 && $1.is$scanner_Token()), ($2 && $2.is$scanner_Token()));
|
| };
|
| Listener.prototype.endBlock$3 = function($0, $1, $2) {
|
| - return this.endBlock($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()));
|
| + return this.endBlock($assert_num($0), ($1 && $1.is$scanner_Token()), ($2 && $2.is$scanner_Token()));
|
| };
|
| Listener.prototype.endClass$5 = function($0, $1, $2, $3, $4) {
|
| - return this.endClass($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()), ($3 && $3.is$Token()), ($4 && $4.is$Token()));
|
| + return this.endClass($assert_num($0), ($1 && $1.is$scanner_Token()), ($2 && $2.is$scanner_Token()), ($3 && $3.is$scanner_Token()), ($4 && $4.is$scanner_Token()));
|
| };
|
| Listener.prototype.endExpressionStatement$1 = function($0) {
|
| - return this.endExpressionStatement(($0 && $0.is$Token()));
|
| + return this.endExpressionStatement(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.endForStatement$2 = function($0, $1) {
|
| - return this.endForStatement(($0 && $0.is$Token()), ($1 && $1.is$Token()));
|
| + return this.endForStatement(($0 && $0.is$scanner_Token()), ($1 && $1.is$scanner_Token()));
|
| };
|
| Listener.prototype.endFormalParameter$1 = function($0) {
|
| - return this.endFormalParameter(($0 && $0.is$Token()));
|
| + return this.endFormalParameter(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.endFormalParameters$3 = function($0, $1, $2) {
|
| - return this.endFormalParameters($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()));
|
| + return this.endFormalParameters($assert_num($0), ($1 && $1.is$scanner_Token()), ($2 && $2.is$scanner_Token()));
|
| };
|
| Listener.prototype.endFunctionBody$3 = function($0, $1, $2) {
|
| - return this.endFunctionBody($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()));
|
| + return this.endFunctionBody($assert_num($0), ($1 && $1.is$scanner_Token()), ($2 && $2.is$scanner_Token()));
|
| };
|
| Listener.prototype.endFunctionName$1 = function($0) {
|
| - return this.endFunctionName(($0 && $0.is$Token()));
|
| + return this.endFunctionName(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.endFunctionTypeAlias$1 = function($0) {
|
| - return this.endFunctionTypeAlias(($0 && $0.is$Token()));
|
| + return this.endFunctionTypeAlias(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.endIfStatement$2 = function($0, $1) {
|
| - return this.endIfStatement(($0 && $0.is$Token()), ($1 && $1.is$Token()));
|
| + return this.endIfStatement(($0 && $0.is$scanner_Token()), ($1 && $1.is$scanner_Token()));
|
| };
|
| Listener.prototype.endInitializedIdentifier$0 = function() {
|
| return this.endInitializedIdentifier();
|
| };
|
| Listener.prototype.endInitializer$1 = function($0) {
|
| - return this.endInitializer(($0 && $0.is$Token()));
|
| + return this.endInitializer(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.endInterface$1 = function($0) {
|
| - return this.endInterface(($0 && $0.is$Token()));
|
| + return this.endInterface(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.endRethrowStatement$2 = function($0, $1) {
|
| - return this.endRethrowStatement(($0 && $0.is$Token()), ($1 && $1.is$Token()));
|
| + return this.endRethrowStatement(($0 && $0.is$scanner_Token()), ($1 && $1.is$scanner_Token()));
|
| };
|
| Listener.prototype.endReturnStatement$3 = function($0, $1, $2) {
|
| - return this.endReturnStatement($assert_bool($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()));
|
| + return this.endReturnStatement($assert_bool($0), ($1 && $1.is$scanner_Token()), ($2 && $2.is$scanner_Token()));
|
| };
|
| Listener.prototype.endSend$1 = function($0) {
|
| - return this.endSend(($0 && $0.is$Token()));
|
| + return this.endSend(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.endThrowStatement$2 = function($0, $1) {
|
| - return this.endThrowStatement(($0 && $0.is$Token()), ($1 && $1.is$Token()));
|
| + return this.endThrowStatement(($0 && $0.is$scanner_Token()), ($1 && $1.is$scanner_Token()));
|
| };
|
| Listener.prototype.endTopLevelField$2 = function($0, $1) {
|
| - return this.endTopLevelField(($0 && $0.is$Token()), ($1 && $1.is$Token()));
|
| + return this.endTopLevelField(($0 && $0.is$scanner_Token()), ($1 && $1.is$scanner_Token()));
|
| };
|
| Listener.prototype.endTopLevelMethod$2 = function($0, $1) {
|
| - return this.endTopLevelMethod(($0 && $0.is$Token()), ($1 && $1.is$Token()));
|
| + return this.endTopLevelMethod(($0 && $0.is$scanner_Token()), ($1 && $1.is$scanner_Token()));
|
| };
|
| Listener.prototype.endType$3 = function($0, $1, $2) {
|
| - return this.endType($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()));
|
| + return this.endType($assert_num($0), ($1 && $1.is$scanner_Token()), ($2 && $2.is$scanner_Token()));
|
| };
|
| Listener.prototype.endTypeArguments$3 = function($0, $1, $2) {
|
| - return this.endTypeArguments($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()));
|
| + return this.endTypeArguments($assert_num($0), ($1 && $1.is$scanner_Token()), ($2 && $2.is$scanner_Token()));
|
| };
|
| Listener.prototype.endTypeVariable$1 = function($0) {
|
| - return this.endTypeVariable(($0 && $0.is$Token()));
|
| + return this.endTypeVariable(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.endTypeVariables$3 = function($0, $1, $2) {
|
| - return this.endTypeVariables($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()));
|
| + return this.endTypeVariables($assert_num($0), ($1 && $1.is$scanner_Token()), ($2 && $2.is$scanner_Token()));
|
| };
|
| Listener.prototype.endVariablesDeclaration$2 = function($0, $1) {
|
| - return this.endVariablesDeclaration($assert_num($0), ($1 && $1.is$Token()));
|
| + return this.endVariablesDeclaration($assert_num($0), ($1 && $1.is$scanner_Token()));
|
| };
|
| Listener.prototype.expected$2 = function($0, $1) {
|
| - return this.expected($assert_String($0), ($1 && $1.is$Token()));
|
| + return this.expected($assert_String($0), ($1 && $1.is$scanner_Token()));
|
| };
|
| Listener.prototype.expectedBlock$1 = function($0) {
|
| - return this.expectedBlock(($0 && $0.is$Token()));
|
| + return this.expectedBlock(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.expectedIdentifier$1 = function($0) {
|
| - return this.expectedIdentifier(($0 && $0.is$Token()));
|
| + return this.expectedIdentifier(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.expectedType$1 = function($0) {
|
| - return this.expectedType(($0 && $0.is$Token()));
|
| + return this.expectedType(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.handleAssignmentExpression$1 = function($0) {
|
| - return this.handleAssignmentExpression(($0 && $0.is$Token()));
|
| + return this.handleAssignmentExpression(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.handleBinaryExpression$1 = function($0) {
|
| - return this.handleBinaryExpression(($0 && $0.is$Token()));
|
| + return this.handleBinaryExpression(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.handleConditionalExpression$2 = function($0, $1) {
|
| - return this.handleConditionalExpression(($0 && $0.is$Token()), ($1 && $1.is$Token()));
|
| + return this.handleConditionalExpression(($0 && $0.is$scanner_Token()), ($1 && $1.is$scanner_Token()));
|
| };
|
| Listener.prototype.handleIdentifier$1 = function($0) {
|
| - return this.handleIdentifier(($0 && $0.is$Token()));
|
| + return this.handleIdentifier(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.handleLiteralBool$1 = function($0) {
|
| - return this.handleLiteralBool(($0 && $0.is$Token()));
|
| + return this.handleLiteralBool(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.handleLiteralDouble$1 = function($0) {
|
| - return this.handleLiteralDouble(($0 && $0.is$Token()));
|
| + return this.handleLiteralDouble(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.handleLiteralInt$1 = function($0) {
|
| - return this.handleLiteralInt(($0 && $0.is$Token()));
|
| + return this.handleLiteralInt(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.handleLiteralString$1 = function($0) {
|
| - return this.handleLiteralString(($0 && $0.is$Token()));
|
| + return this.handleLiteralString(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.handleNoArguments$1 = function($0) {
|
| - return this.handleNoArguments(($0 && $0.is$Token()));
|
| + return this.handleNoArguments(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.handleNoType$1 = function($0) {
|
| - return this.handleNoType(($0 && $0.is$Token()));
|
| + return this.handleNoType(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.handleNoTypeArguments$1 = function($0) {
|
| - return this.handleNoTypeArguments(($0 && $0.is$Token()));
|
| + return this.handleNoTypeArguments(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.handleNoTypeVariables$1 = function($0) {
|
| - return this.handleNoTypeVariables(($0 && $0.is$Token()));
|
| + return this.handleNoTypeVariables(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.handleUnaryPostfixExpression$1 = function($0) {
|
| - return this.handleUnaryPostfixExpression(($0 && $0.is$Token()));
|
| + return this.handleUnaryPostfixExpression(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.handleUnaryPrefixExpression$1 = function($0) {
|
| - return this.handleUnaryPrefixExpression(($0 && $0.is$Token()));
|
| + return this.handleUnaryPrefixExpression(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.handleVarKeyword$1 = function($0) {
|
| - return this.handleVarKeyword(($0 && $0.is$Token()));
|
| + return this.handleVarKeyword(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.handleVoidKeyword$1 = function($0) {
|
| - return this.handleVoidKeyword(($0 && $0.is$Token()));
|
| + return this.handleVoidKeyword(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.unexpected$1 = function($0) {
|
| - return this.unexpected(($0 && $0.is$Token()));
|
| + return this.unexpected(($0 && $0.is$scanner_Token()));
|
| };
|
| Listener.prototype.unexpectedEof$0 = function() {
|
| return this.unexpectedEof();
|
| @@ -5437,8 +5437,8 @@ ElementListener.prototype.endClass = function(interfacesCount, beginToken, exten
|
| for (; interfacesCount > 0; --interfacesCount) {
|
| this.popNode();
|
| }
|
| - var supertype = (($0 = this.popNode()) && $0.is$Identifier());
|
| - var name = (($0 = this.popNode()) && $0.is$Identifier());
|
| + var supertype = (($0 = this.popNode()) && $0.is$tree_Identifier());
|
| + var name = (($0 = this.popNode()) && $0.is$tree_Identifier());
|
| this.pushElement(new PartialClassElement(name.get$source(), beginToken, endToken));
|
| }
|
| ElementListener.prototype.endInterface = function(token) {
|
| @@ -5449,14 +5449,14 @@ ElementListener.prototype.endFunctionTypeAlias = function(token) {
|
| }
|
| ElementListener.prototype.endTopLevelMethod = function(beginToken, endToken) {
|
| var $0;
|
| - var name = (($0 = this.popNode()) && $0.is$Identifier());
|
| + var name = (($0 = this.popNode()) && $0.is$tree_Identifier());
|
| this.pushElement(new PartialFunctionElement(name.get$source(), beginToken, endToken));
|
| }
|
| ElementListener.prototype.endTopLevelField = function(beginToken, endToken) {
|
| this.canceler.cancel("Cannot handle fields");
|
| }
|
| ElementListener.prototype.handleIdentifier = function(token) {
|
| - this.pushNode(new Identifier(token));
|
| + this.pushNode(new tree_Identifier(token));
|
| }
|
| ElementListener.prototype.handleNoType = function(token) {
|
| this.pushNode(null);
|
| @@ -5464,7 +5464,7 @@ ElementListener.prototype.handleNoType = function(token) {
|
| ElementListener.prototype.endTypeVariable = function(token) {
|
| var $0;
|
| var bound = (($0 = this.popNode()) && $0.is$TypeAnnotation());
|
| - var name = (($0 = this.popNode()) && $0.is$Identifier());
|
| + var name = (($0 = this.popNode()) && $0.is$tree_Identifier());
|
| }
|
| ElementListener.prototype.endTypeArguments = function(count, beginToken, endToken) {
|
| for (; count > 0; --count) {
|
| @@ -5501,7 +5501,7 @@ ElementListener.prototype.pushNode = function(node) {
|
| ElementListener.prototype.popNode = function() {
|
| var $0;
|
| $assert(!$notnull_bool(this.nodes.isEmpty()), "!nodes.isEmpty()", "listener.dart", 343, 12);
|
| - var node = (($0 = this.nodes.get$head()) && $0.is$Node());
|
| + var node = (($0 = this.nodes.get$head()) && $0.is$tree_Node());
|
| this.nodes = (($0 = this.nodes.get$tail()) && $0.is$Link$Node());
|
| this.log(("pop " + this.nodes + ""));
|
| return node;
|
| @@ -5510,49 +5510,49 @@ ElementListener.prototype.log = function(message) {
|
|
|
| }
|
| ElementListener.prototype.beginLibraryTag$1 = function($0) {
|
| - return this.beginLibraryTag(($0 && $0.is$Token()));
|
| + return this.beginLibraryTag(($0 && $0.is$scanner_Token()));
|
| };
|
| ElementListener.prototype.endClass$5 = function($0, $1, $2, $3, $4) {
|
| - return this.endClass($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()), ($3 && $3.is$Token()), ($4 && $4.is$Token()));
|
| + return this.endClass($assert_num($0), ($1 && $1.is$scanner_Token()), ($2 && $2.is$scanner_Token()), ($3 && $3.is$scanner_Token()), ($4 && $4.is$scanner_Token()));
|
| };
|
| ElementListener.prototype.endFunctionTypeAlias$1 = function($0) {
|
| - return this.endFunctionTypeAlias(($0 && $0.is$Token()));
|
| + return this.endFunctionTypeAlias(($0 && $0.is$scanner_Token()));
|
| };
|
| ElementListener.prototype.endInterface$1 = function($0) {
|
| - return this.endInterface(($0 && $0.is$Token()));
|
| + return this.endInterface(($0 && $0.is$scanner_Token()));
|
| };
|
| ElementListener.prototype.endTopLevelField$2 = function($0, $1) {
|
| - return this.endTopLevelField(($0 && $0.is$Token()), ($1 && $1.is$Token()));
|
| + return this.endTopLevelField(($0 && $0.is$scanner_Token()), ($1 && $1.is$scanner_Token()));
|
| };
|
| ElementListener.prototype.endTopLevelMethod$2 = function($0, $1) {
|
| - return this.endTopLevelMethod(($0 && $0.is$Token()), ($1 && $1.is$Token()));
|
| + return this.endTopLevelMethod(($0 && $0.is$scanner_Token()), ($1 && $1.is$scanner_Token()));
|
| };
|
| ElementListener.prototype.endTypeArguments$3 = function($0, $1, $2) {
|
| - return this.endTypeArguments($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()));
|
| + return this.endTypeArguments($assert_num($0), ($1 && $1.is$scanner_Token()), ($2 && $2.is$scanner_Token()));
|
| };
|
| ElementListener.prototype.endTypeVariable$1 = function($0) {
|
| - return this.endTypeVariable(($0 && $0.is$Token()));
|
| + return this.endTypeVariable(($0 && $0.is$scanner_Token()));
|
| };
|
| ElementListener.prototype.expected$2 = function($0, $1) {
|
| - return this.expected($assert_String($0), ($1 && $1.is$Token()));
|
| + return this.expected($assert_String($0), ($1 && $1.is$scanner_Token()));
|
| };
|
| ElementListener.prototype.expectedBlock$1 = function($0) {
|
| - return this.expectedBlock(($0 && $0.is$Token()));
|
| + return this.expectedBlock(($0 && $0.is$scanner_Token()));
|
| };
|
| ElementListener.prototype.expectedIdentifier$1 = function($0) {
|
| - return this.expectedIdentifier(($0 && $0.is$Token()));
|
| + return this.expectedIdentifier(($0 && $0.is$scanner_Token()));
|
| };
|
| ElementListener.prototype.expectedType$1 = function($0) {
|
| - return this.expectedType(($0 && $0.is$Token()));
|
| + return this.expectedType(($0 && $0.is$scanner_Token()));
|
| };
|
| ElementListener.prototype.handleIdentifier$1 = function($0) {
|
| - return this.handleIdentifier(($0 && $0.is$Token()));
|
| + return this.handleIdentifier(($0 && $0.is$scanner_Token()));
|
| };
|
| ElementListener.prototype.handleNoType$1 = function($0) {
|
| - return this.handleNoType(($0 && $0.is$Token()));
|
| + return this.handleNoType(($0 && $0.is$scanner_Token()));
|
| };
|
| ElementListener.prototype.unexpected$1 = function($0) {
|
| - return this.unexpected(($0 && $0.is$Token()));
|
| + return this.unexpected(($0 && $0.is$scanner_Token()));
|
| };
|
| ElementListener.prototype.unexpectedEof$0 = function() {
|
| return this.unexpectedEof();
|
| @@ -5569,7 +5569,7 @@ NodeListener.prototype.endClass = function(interfacesCount, beginToken, extendsK
|
| var $0;
|
| var interfaces = this.makeNodeList(interfacesCount, implementsKeyword, null, ",");
|
| var supertype = (($0 = this.popNode()) && $0.is$TypeAnnotation());
|
| - var name = (($0 = this.popNode()) && $0.is$Identifier());
|
| + var name = (($0 = this.popNode()) && $0.is$tree_Identifier());
|
| this.pushNode(new ClassNode(name, supertype, interfaces, beginToken, extendsKeyword, endToken));
|
| }
|
| NodeListener.prototype.endFormalParameter = function(token) {
|
| @@ -5589,11 +5589,11 @@ NodeListener.prototype.handleNoArguments = function(token) {
|
| }
|
| NodeListener.prototype.endReturnStatement = function(hasExpression, beginToken, endToken) {
|
| var $0;
|
| - var expression = (($0 = $notnull_bool(hasExpression) ? this.popNode() : null) && $0.is$Expression());
|
| + var expression = (($0 = $notnull_bool(hasExpression) ? this.popNode() : null) && $0.is$tree_Expression());
|
| this.pushNode(new Return(beginToken, endToken, expression));
|
| }
|
| NodeListener.prototype.endExpressionStatement = function(token) {
|
| - this.pushNode(new ExpressionStatement(this.popNode(), token));
|
| + this.pushNode(new tree_ExpressionStatement(this.popNode(), token));
|
| }
|
| NodeListener.prototype.handleOnError = function(token, error) {
|
| this.canceler.cancel(("internal error @ " + token.charOffset + ": '" + token.get$value() + "'") + (": " + error + ""));
|
| @@ -5639,7 +5639,7 @@ NodeListener.prototype.endSend = function(token) {
|
| this.pushNode(new Send(null, selector, arguments));
|
| }
|
| NodeListener.prototype.handleVoidKeyword = function(token) {
|
| - this.pushNode(new TypeAnnotation(new Identifier(token)));
|
| + this.pushNode(new TypeAnnotation(new tree_Identifier(token)));
|
| }
|
| NodeListener.prototype.endFunctionBody = function(count, beginToken, endToken) {
|
| var $0;
|
| @@ -5650,10 +5650,10 @@ NodeListener.prototype.endFunctionBody = function(count, beginToken, endToken) {
|
| this.pushNode(new FunctionExpression(name, formals, block, type));
|
| }
|
| NodeListener.prototype.handleVarKeyword = function(token) {
|
| - this.pushNode(new Identifier(token));
|
| + this.pushNode(new tree_Identifier(token));
|
| }
|
| NodeListener.prototype.handleFinalKeyword = function(token) {
|
| - this.pushNode(new Identifier(token));
|
| + this.pushNode(new tree_Identifier(token));
|
| }
|
| NodeListener.prototype.endVariablesDeclaration = function(count, endToken) {
|
| var $0;
|
| @@ -5663,23 +5663,23 @@ NodeListener.prototype.endVariablesDeclaration = function(count, endToken) {
|
| }
|
| NodeListener.prototype.endInitializer = function(assignmentOperator) {
|
| var $0;
|
| - var initializer = (($0 = this.popNode()) && $0.is$Expression());
|
| + var initializer = (($0 = this.popNode()) && $0.is$tree_Expression());
|
| var arguments = new NodeList.singleton$ctor(initializer);
|
| - var name = (($0 = this.popNode()) && $0.is$Expression());
|
| + var name = (($0 = this.popNode()) && $0.is$tree_Expression());
|
| this.pushNode(new SendSet(null, name, assignmentOperator, arguments));
|
| }
|
| NodeListener.prototype.endIfStatement = function(ifToken, elseToken) {
|
| var $0;
|
| - var elsePart = (($0 = (elseToken == null) ? null : this.popNode()) && $0.is$Statement());
|
| - var thenPart = (($0 = this.popNode()) && $0.is$Statement());
|
| + var elsePart = (($0 = (elseToken == null) ? null : this.popNode()) && $0.is$tree_Statement());
|
| + var thenPart = (($0 = this.popNode()) && $0.is$tree_Statement());
|
| var condition = (($0 = this.popNode()) && $0.is$NodeList());
|
| this.pushNode(new If(condition, thenPart, elsePart, ifToken, elseToken));
|
| }
|
| NodeListener.prototype.endForStatement = function(beginToken, endToken) {
|
| var $0;
|
| - var body = (($0 = this.popNode()) && $0.is$Statement());
|
| - var update = (($0 = this.popNode()) && $0.is$Expression());
|
| - var condition = (($0 = this.popNode()) && $0.is$ExpressionStatement());
|
| + var body = (($0 = this.popNode()) && $0.is$tree_Statement());
|
| + var update = (($0 = this.popNode()) && $0.is$tree_Expression());
|
| + var condition = (($0 = this.popNode()) && $0.is$tree_ExpressionStatement());
|
| var initializer = (($0 = this.popNode()) && $0.is$VariableDefinitions());
|
| this.pushNode(new For(initializer, condition, update, body, beginToken));
|
| }
|
| @@ -5688,7 +5688,7 @@ NodeListener.prototype.endBlock = function(count, beginToken, endToken) {
|
| }
|
| NodeListener.prototype.endType = function(count, beginToken, endToken) {
|
| var $0;
|
| - var type = new TypeAnnotation((($0 = this.popNode()) && $0.is$Identifier()));
|
| + var type = new TypeAnnotation((($0 = this.popNode()) && $0.is$tree_Identifier()));
|
| for (; count > 1; --count) {
|
| this.popNode();
|
| }
|
| @@ -5696,7 +5696,7 @@ NodeListener.prototype.endType = function(count, beginToken, endToken) {
|
| }
|
| NodeListener.prototype.endThrowStatement = function(throwToken, endToken) {
|
| var $0;
|
| - var expression = (($0 = this.popNode()) && $0.is$Expression());
|
| + var expression = (($0 = this.popNode()) && $0.is$tree_Expression());
|
| this.pushNode(new Throw(expression, throwToken, endToken));
|
| }
|
| NodeListener.prototype.endRethrowStatement = function(throwToken, endToken) {
|
| @@ -5721,91 +5721,91 @@ NodeListener.prototype.log = function(message) {
|
| this.logger.log(message);
|
| }
|
| NodeListener.prototype.endArguments$3 = function($0, $1, $2) {
|
| - return this.endArguments($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()));
|
| + return this.endArguments($assert_num($0), ($1 && $1.is$scanner_Token()), ($2 && $2.is$scanner_Token()));
|
| };
|
| NodeListener.prototype.endBlock$3 = function($0, $1, $2) {
|
| - return this.endBlock($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()));
|
| + return this.endBlock($assert_num($0), ($1 && $1.is$scanner_Token()), ($2 && $2.is$scanner_Token()));
|
| };
|
| NodeListener.prototype.endClass$5 = function($0, $1, $2, $3, $4) {
|
| - return this.endClass($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()), ($3 && $3.is$Token()), ($4 && $4.is$Token()));
|
| + return this.endClass($assert_num($0), ($1 && $1.is$scanner_Token()), ($2 && $2.is$scanner_Token()), ($3 && $3.is$scanner_Token()), ($4 && $4.is$scanner_Token()));
|
| };
|
| NodeListener.prototype.endExpressionStatement$1 = function($0) {
|
| - return this.endExpressionStatement(($0 && $0.is$Token()));
|
| + return this.endExpressionStatement(($0 && $0.is$scanner_Token()));
|
| };
|
| NodeListener.prototype.endForStatement$2 = function($0, $1) {
|
| - return this.endForStatement(($0 && $0.is$Token()), ($1 && $1.is$Token()));
|
| + return this.endForStatement(($0 && $0.is$scanner_Token()), ($1 && $1.is$scanner_Token()));
|
| };
|
| NodeListener.prototype.endFormalParameter$1 = function($0) {
|
| - return this.endFormalParameter(($0 && $0.is$Token()));
|
| + return this.endFormalParameter(($0 && $0.is$scanner_Token()));
|
| };
|
| NodeListener.prototype.endFormalParameters$3 = function($0, $1, $2) {
|
| - return this.endFormalParameters($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()));
|
| + return this.endFormalParameters($assert_num($0), ($1 && $1.is$scanner_Token()), ($2 && $2.is$scanner_Token()));
|
| };
|
| NodeListener.prototype.endFunctionBody$3 = function($0, $1, $2) {
|
| - return this.endFunctionBody($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()));
|
| + return this.endFunctionBody($assert_num($0), ($1 && $1.is$scanner_Token()), ($2 && $2.is$scanner_Token()));
|
| };
|
| NodeListener.prototype.endIfStatement$2 = function($0, $1) {
|
| - return this.endIfStatement(($0 && $0.is$Token()), ($1 && $1.is$Token()));
|
| + return this.endIfStatement(($0 && $0.is$scanner_Token()), ($1 && $1.is$scanner_Token()));
|
| };
|
| NodeListener.prototype.endInitializer$1 = function($0) {
|
| - return this.endInitializer(($0 && $0.is$Token()));
|
| + return this.endInitializer(($0 && $0.is$scanner_Token()));
|
| };
|
| NodeListener.prototype.endRethrowStatement$2 = function($0, $1) {
|
| - return this.endRethrowStatement(($0 && $0.is$Token()), ($1 && $1.is$Token()));
|
| + return this.endRethrowStatement(($0 && $0.is$scanner_Token()), ($1 && $1.is$scanner_Token()));
|
| };
|
| NodeListener.prototype.endReturnStatement$3 = function($0, $1, $2) {
|
| - return this.endReturnStatement($assert_bool($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()));
|
| + return this.endReturnStatement($assert_bool($0), ($1 && $1.is$scanner_Token()), ($2 && $2.is$scanner_Token()));
|
| };
|
| NodeListener.prototype.endSend$1 = function($0) {
|
| - return this.endSend(($0 && $0.is$Token()));
|
| + return this.endSend(($0 && $0.is$scanner_Token()));
|
| };
|
| NodeListener.prototype.endThrowStatement$2 = function($0, $1) {
|
| - return this.endThrowStatement(($0 && $0.is$Token()), ($1 && $1.is$Token()));
|
| + return this.endThrowStatement(($0 && $0.is$scanner_Token()), ($1 && $1.is$scanner_Token()));
|
| };
|
| NodeListener.prototype.endType$3 = function($0, $1, $2) {
|
| - return this.endType($assert_num($0), ($1 && $1.is$Token()), ($2 && $2.is$Token()));
|
| + return this.endType($assert_num($0), ($1 && $1.is$scanner_Token()), ($2 && $2.is$scanner_Token()));
|
| };
|
| NodeListener.prototype.endVariablesDeclaration$2 = function($0, $1) {
|
| - return this.endVariablesDeclaration($assert_num($0), ($1 && $1.is$Token()));
|
| + return this.endVariablesDeclaration($assert_num($0), ($1 && $1.is$scanner_Token()));
|
| };
|
| NodeListener.prototype.handleAssignmentExpression$1 = function($0) {
|
| - return this.handleAssignmentExpression(($0 && $0.is$Token()));
|
| + return this.handleAssignmentExpression(($0 && $0.is$scanner_Token()));
|
| };
|
| NodeListener.prototype.handleBinaryExpression$1 = function($0) {
|
| - return this.handleBinaryExpression(($0 && $0.is$Token()));
|
| + return this.handleBinaryExpression(($0 && $0.is$scanner_Token()));
|
| };
|
| NodeListener.prototype.handleConditionalExpression$2 = function($0, $1) {
|
| - return this.handleConditionalExpression(($0 && $0.is$Token()), ($1 && $1.is$Token()));
|
| + return this.handleConditionalExpression(($0 && $0.is$scanner_Token()), ($1 && $1.is$scanner_Token()));
|
| };
|
| NodeListener.prototype.handleFinalKeyword$1 = function($0) {
|
| - return this.handleFinalKeyword(($0 && $0.is$Token()));
|
| + return this.handleFinalKeyword(($0 && $0.is$scanner_Token()));
|
| };
|
| NodeListener.prototype.handleLiteralBool$1 = function($0) {
|
| - return this.handleLiteralBool(($0 && $0.is$Token()));
|
| + return this.handleLiteralBool(($0 && $0.is$scanner_Token()));
|
| };
|
| NodeListener.prototype.handleLiteralDouble$1 = function($0) {
|
| - return this.handleLiteralDouble(($0 && $0.is$Token()));
|
| + return this.handleLiteralDouble(($0 && $0.is$scanner_Token()));
|
| };
|
| NodeListener.prototype.handleLiteralInt$1 = function($0) {
|
| - return this.handleLiteralInt(($0 && $0.is$Token()));
|
| + return this.handleLiteralInt(($0 && $0.is$scanner_Token()));
|
| };
|
| NodeListener.prototype.handleLiteralString$1 = function($0) {
|
| - return this.handleLiteralString(($0 && $0.is$Token()));
|
| + return this.handleLiteralString(($0 && $0.is$scanner_Token()));
|
| };
|
| NodeListener.prototype.handleNoArguments$1 = function($0) {
|
| - return this.handleNoArguments(($0 && $0.is$Token()));
|
| + return this.handleNoArguments(($0 && $0.is$scanner_Token()));
|
| };
|
| NodeListener.prototype.handleUnaryPostfixExpression$1 = function($0) {
|
| - return this.handleUnaryPostfixExpression(($0 && $0.is$Token()));
|
| + return this.handleUnaryPostfixExpression(($0 && $0.is$scanner_Token()));
|
| };
|
| NodeListener.prototype.handleUnaryPrefixExpression$1 = function($0) {
|
| - return this.handleUnaryPrefixExpression(($0 && $0.is$Token()));
|
| + return this.handleUnaryPrefixExpression(($0 && $0.is$scanner_Token()));
|
| };
|
| NodeListener.prototype.handleVarKeyword$1 = function($0) {
|
| - return this.handleVarKeyword(($0 && $0.is$Token()));
|
| + return this.handleVarKeyword(($0 && $0.is$scanner_Token()));
|
| };
|
| NodeListener.prototype.handleVoidKeyword$1 = function($0) {
|
| - return this.handleVoidKeyword(($0 && $0.is$Token()));
|
| + return this.handleVoidKeyword(($0 && $0.is$scanner_Token()));
|
| };
|
| // ********** Code for PartialFunctionElement **************
|
| function PartialFunctionElement(name, beginToken, endToken) {
|
| @@ -5904,36 +5904,36 @@ SubstringWrapper.prototype.printOn$1 = function($0) {
|
| SubstringWrapper.prototype.toString$0 = function() {
|
| return this.toString();
|
| };
|
| -// ********** Code for Token **************
|
| -function Token(kind, charOffset) {
|
| +// ********** Code for scanner_Token **************
|
| +function scanner_Token(kind, charOffset) {
|
| this.kind = kind;
|
| this.charOffset = charOffset;
|
| // Initializers done
|
| }
|
| -Token.prototype.is$Token = function(){return this;};
|
| -Token.prototype.get$charOffset = function() { return this.charOffset; };
|
| -Token.prototype.get$value = function() {
|
| +scanner_Token.prototype.is$scanner_Token = function(){return this;};
|
| +scanner_Token.prototype.get$charOffset = function() { return this.charOffset; };
|
| +scanner_Token.prototype.get$value = function() {
|
| return const$112/*const SourceString('EOF')*/;
|
| }
|
| -Token.prototype.get$stringValue = function() {
|
| +scanner_Token.prototype.get$stringValue = function() {
|
| return 'EOF';
|
| }
|
| -Token.prototype.toString = function() {
|
| +scanner_Token.prototype.toString = function() {
|
| return Strings.String$fromCharCodes$factory([this.kind]);
|
| }
|
| -Token.prototype.next$0 = function() {
|
| +scanner_Token.prototype.next$0 = function() {
|
| return this.next();
|
| };
|
| -Token.prototype.toString$0 = function() {
|
| +scanner_Token.prototype.toString$0 = function() {
|
| return this.toString();
|
| };
|
| // ********** Code for KeywordToken **************
|
| function KeywordToken(value, charOffset) {
|
| this.value = value;
|
| // Initializers done
|
| - Token.call(this, 107/*null.KEYWORD_TOKEN*/, charOffset);
|
| + scanner_Token.call(this, 107/*null.KEYWORD_TOKEN*/, charOffset);
|
| }
|
| -$inherits(KeywordToken, Token);
|
| +$inherits(KeywordToken, scanner_Token);
|
| KeywordToken.prototype.get$value = function() { return this.value; };
|
| KeywordToken.prototype.get$stringValue = function() {
|
| return this.value.syntax;
|
| @@ -5952,10 +5952,10 @@ function StringToken(kind, value, charOffset) {
|
| StringToken.fromSource$ctor = function(kind, value, charOffset) {
|
| this.value = value;
|
| // Initializers done
|
| - Token.call(this, kind, charOffset);
|
| + scanner_Token.call(this, kind, charOffset);
|
| }
|
| StringToken.fromSource$ctor.prototype = StringToken.prototype;
|
| -$inherits(StringToken, Token);
|
| +$inherits(StringToken, scanner_Token);
|
| StringToken.prototype.get$value = function() { return this.value; };
|
| StringToken.prototype.get$stringValue = function() {
|
| return this.value.get$stringValue();
|
| @@ -6152,28 +6152,28 @@ LeafKeywordState.prototype.toString$0 = function() {
|
| // ********** Code for top level **************
|
| function parse(canceler, logger, doParse) {
|
| var listener = new NodeListener(canceler, logger);
|
| - doParse(new Parser(listener));
|
| + doParse(new scanner_Parser(listener));
|
| var node = listener.popNode();
|
| logger.log(("parsed: " + node + ""));
|
| return node;
|
| }
|
| // ********** Library tree **************
|
| -// ********** Code for Node **************
|
| -function Node() {
|
| +// ********** Code for tree_Node **************
|
| +function tree_Node() {
|
| this._hashCode = (Math.random() * 0xFFFFFFFF).toInt();
|
| // Initializers done
|
| }
|
| -Node.prototype.is$Node = function(){return this;};
|
| -Node.prototype.hashCode = function() {
|
| +tree_Node.prototype.is$tree_Node = function(){return this;};
|
| +tree_Node.prototype.hashCode = function() {
|
| return this._hashCode;
|
| }
|
| -Node.prototype.toString = function() {
|
| +tree_Node.prototype.toString = function() {
|
| return this.unparse();
|
| }
|
| -Node.prototype.getObjectDescription = function() {
|
| +tree_Node.prototype.getObjectDescription = function() {
|
| return Object.prototype.toString.call(this);
|
| }
|
| -Node.prototype.unparse = function() {
|
| +tree_Node.prototype.unparse = function() {
|
| var unparser = new Unparser(false);
|
| try {
|
| return unparser.unparse(this);
|
| @@ -6182,19 +6182,19 @@ Node.prototype.unparse = function() {
|
| return ('<<unparse error: ' + this.getObjectDescription() + ': ' + unparser.sb + '>>');
|
| }
|
| }
|
| -Node.prototype.accept$1 = function($0) {
|
| +tree_Node.prototype.accept$1 = function($0) {
|
| return this.accept(($0 && $0.is$Visitor()));
|
| };
|
| -Node.prototype.getBeginToken$0 = function() {
|
| +tree_Node.prototype.getBeginToken$0 = function() {
|
| return this.getBeginToken();
|
| };
|
| -Node.prototype.getEndToken$0 = function() {
|
| +tree_Node.prototype.getEndToken$0 = function() {
|
| return this.getEndToken();
|
| };
|
| -Node.prototype.hashCode$0 = function() {
|
| +tree_Node.prototype.hashCode$0 = function() {
|
| return this.hashCode();
|
| };
|
| -Node.prototype.toString$0 = function() {
|
| +tree_Node.prototype.toString$0 = function() {
|
| return this.toString();
|
| };
|
| // ********** Code for ClassNode **************
|
| @@ -6206,9 +6206,9 @@ function ClassNode(name, superclass, interfaces, beginToken, extendsKeyword, end
|
| this.extendsKeyword = extendsKeyword;
|
| this.endToken = endToken;
|
| // Initializers done
|
| - Node.call(this);
|
| + tree_Node.call(this);
|
| }
|
| -$inherits(ClassNode, Node);
|
| +$inherits(ClassNode, tree_Node);
|
| ClassNode.prototype.is$ClassNode = function(){return this;};
|
| ClassNode.prototype.get$name = function() { return this.name; };
|
| ClassNode.prototype.get$interfaces = function() { return this.interfaces; };
|
| @@ -6236,34 +6236,34 @@ ClassNode.prototype.getBeginToken$0 = function() {
|
| ClassNode.prototype.getEndToken$0 = function() {
|
| return this.getEndToken();
|
| };
|
| -// ********** Code for Expression **************
|
| -function Expression() {
|
| +// ********** Code for tree_Expression **************
|
| +function tree_Expression() {
|
| // Initializers done
|
| - Node.call(this);
|
| + tree_Node.call(this);
|
| }
|
| -$inherits(Expression, Node);
|
| -Expression.prototype.is$Expression = function(){return this;};
|
| -// ********** Code for Statement **************
|
| -function Statement() {
|
| +$inherits(tree_Expression, tree_Node);
|
| +tree_Expression.prototype.is$tree_Expression = function(){return this;};
|
| +// ********** Code for tree_Statement **************
|
| +function tree_Statement() {
|
| // Initializers done
|
| - Node.call(this);
|
| + tree_Node.call(this);
|
| }
|
| -$inherits(Statement, Node);
|
| -Statement.prototype.is$Statement = function(){return this;};
|
| +$inherits(tree_Statement, tree_Node);
|
| +tree_Statement.prototype.is$tree_Statement = function(){return this;};
|
| // ********** Code for Send **************
|
| function Send(receiver, selector, argumentsNode) {
|
| this.receiver = receiver;
|
| this.selector = selector;
|
| this.argumentsNode = argumentsNode;
|
| // Initializers done
|
| - Expression.call(this);
|
| + tree_Expression.call(this);
|
| }
|
| Send.postfix$ctor = function(receiver, selector) {
|
| this.receiver = receiver;
|
| this.selector = selector;
|
| this.argumentsNode = const$211/*const Postfix()*/;
|
| // Initializers done
|
| - Expression.call(this);
|
| + tree_Expression.call(this);
|
| }
|
| Send.postfix$ctor.prototype = Send.prototype;
|
| Send.prefix$ctor = function(receiver, selector) {
|
| @@ -6271,10 +6271,10 @@ Send.prefix$ctor = function(receiver, selector) {
|
| this.selector = selector;
|
| this.argumentsNode = const$210/*const Prefix()*/;
|
| // Initializers done
|
| - Expression.call(this);
|
| + tree_Expression.call(this);
|
| }
|
| Send.prefix$ctor.prototype = Send.prototype;
|
| -$inherits(Send, Expression);
|
| +$inherits(Send, tree_Expression);
|
| Send.prototype.is$Send = function(){return this;};
|
| Send.prototype.get$arguments = function() {
|
| return this.argumentsNode.nodes;
|
| @@ -6303,9 +6303,9 @@ Send.prototype.getEndToken = function() {
|
| if (this.argumentsNode != null) token = this.argumentsNode.getEndToken();
|
| if (token != null) return token;
|
| if (this.selector != null) {
|
| - return (($0 = this.selector.getEndToken()) && $0.is$Token());
|
| + return (($0 = this.selector.getEndToken()) && $0.is$scanner_Token());
|
| }
|
| - return (($0 = this.receiver.getBeginToken()) && $0.is$Token());
|
| + return (($0 = this.receiver.getBeginToken()) && $0.is$scanner_Token());
|
| }
|
| Send.prototype.accept$1 = function($0) {
|
| return this.accept(($0 && $0.is$Visitor()));
|
| @@ -6349,14 +6349,14 @@ function NodeList(beginToken, nodes, endToken, delimiter) {
|
| this.endToken = endToken;
|
| this.delimiter = delimiter;
|
| // Initializers done
|
| - Node.call(this);
|
| + tree_Node.call(this);
|
| }
|
| NodeList.singleton$ctor = function(node) {
|
| // Initializers done
|
| NodeList.call(this, null, LinkFactory.Link$factory(node));
|
| }
|
| NodeList.singleton$ctor.prototype = NodeList.prototype;
|
| -$inherits(NodeList, Node);
|
| +$inherits(NodeList, tree_Node);
|
| NodeList.prototype.is$NodeList = function(){return this;};
|
| NodeList.prototype.accept = function(visitor) {
|
| return visitor.visitNodeList(this);
|
| @@ -6368,10 +6368,10 @@ NodeList.prototype.getBeginToken = function() {
|
| for (var link = this.nodes;
|
| !$notnull_bool(link.isEmpty()); link = (($0 = link.get$tail()) && $0.is$Link$Node())) {
|
| if (link.get$head().getBeginToken$0() != null) {
|
| - return (($0 = link.get$head().getBeginToken$0()) && $0.is$Token());
|
| + return (($0 = link.get$head().getBeginToken$0()) && $0.is$scanner_Token());
|
| }
|
| if (link.get$head().getEndToken$0() != null) {
|
| - return (($0 = link.get$head().getEndToken$0()) && $0.is$Token());
|
| + return (($0 = link.get$head().getEndToken$0()) && $0.is$scanner_Token());
|
| }
|
| }
|
| }
|
| @@ -6383,8 +6383,8 @@ NodeList.prototype.getEndToken = function() {
|
| if (this.nodes != null) {
|
| var link = this.nodes;
|
| while (!$notnull_bool(link.get$tail().isEmpty$0())) link = (($0 = link.get$tail()) && $0.is$Link$Node());
|
| - if (link.get$head().getEndToken$0() != null) return (($0 = link.get$head().getEndToken$0()) && $0.is$Token());
|
| - if (link.get$head().getBeginToken$0() != null) return (($0 = link.get$head().getBeginToken$0()) && $0.is$Token());
|
| + if (link.get$head().getEndToken$0() != null) return (($0 = link.get$head().getEndToken$0()) && $0.is$scanner_Token());
|
| + if (link.get$head().getBeginToken$0() != null) return (($0 = link.get$head().getBeginToken$0()) && $0.is$scanner_Token());
|
| }
|
| return this.beginToken;
|
| }
|
| @@ -6401,9 +6401,9 @@ NodeList.prototype.getEndToken$0 = function() {
|
| function Block(statements) {
|
| this.statements = statements;
|
| // Initializers done
|
| - Statement.call(this);
|
| + tree_Statement.call(this);
|
| }
|
| -$inherits(Block, Statement);
|
| +$inherits(Block, tree_Statement);
|
| Block.prototype.accept = function(visitor) {
|
| return visitor.visitBlock(this);
|
| }
|
| @@ -6430,9 +6430,9 @@ function If(condition, thenPart, elsePart, ifToken, elseToken) {
|
| this.ifToken = ifToken;
|
| this.elseToken = elseToken;
|
| // Initializers done
|
| - Statement.call(this);
|
| + tree_Statement.call(this);
|
| }
|
| -$inherits(If, Statement);
|
| +$inherits(If, tree_Statement);
|
| If.prototype.get$hasElsePart = function() {
|
| return this.elsePart != null;
|
| }
|
| @@ -6463,9 +6463,9 @@ function For(initializer, condition, update, body, forToken) {
|
| this.body = body;
|
| this.forToken = forToken;
|
| // Initializers done
|
| - Statement.call(this);
|
| + tree_Statement.call(this);
|
| }
|
| -$inherits(For, Statement);
|
| +$inherits(For, tree_Statement);
|
| For.prototype.accept = function(visitor) {
|
| return visitor.visitFor(this);
|
| }
|
| @@ -6491,9 +6491,9 @@ function FunctionExpression(name, parameters, body, returnType) {
|
| this.body = body;
|
| this.returnType = returnType;
|
| // Initializers done
|
| - Expression.call(this);
|
| + tree_Expression.call(this);
|
| }
|
| -$inherits(FunctionExpression, Expression);
|
| +$inherits(FunctionExpression, tree_Expression);
|
| FunctionExpression.prototype.is$FunctionExpression = function(){return this;};
|
| FunctionExpression.prototype.get$name = function() { return this.name; };
|
| FunctionExpression.prototype.get$parameters = function() { return this.parameters; };
|
| @@ -6521,9 +6521,9 @@ function Literal(token, handler) {
|
| this.token = token;
|
| this.handler = handler;
|
| // Initializers done
|
| - Expression.call(this);
|
| + tree_Expression.call(this);
|
| }
|
| -$inherits(Literal, Expression);
|
| +$inherits(Literal, tree_Expression);
|
| Literal.prototype.getBeginToken = function() {
|
| return this.token;
|
| }
|
| @@ -6541,7 +6541,7 @@ function Literal$SourceString(token, handler) {
|
| this.token = token;
|
| this.handler = handler;
|
| // Initializers done
|
| - Expression.call(this);
|
| + tree_Expression.call(this);
|
| }
|
| $inherits(Literal$SourceString, Literal);
|
| // ********** Code for Literal$bool **************
|
| @@ -6549,7 +6549,7 @@ function Literal$bool(token, handler) {
|
| this.token = token;
|
| this.handler = handler;
|
| // Initializers done
|
| - Expression.call(this);
|
| + tree_Expression.call(this);
|
| }
|
| $inherits(Literal$bool, Literal);
|
| // ********** Code for Literal$double **************
|
| @@ -6557,7 +6557,7 @@ function Literal$double(token, handler) {
|
| this.token = token;
|
| this.handler = handler;
|
| // Initializers done
|
| - Expression.call(this);
|
| + tree_Expression.call(this);
|
| }
|
| $inherits(Literal$double, Literal);
|
| // ********** Code for Literal$int **************
|
| @@ -6565,7 +6565,7 @@ function Literal$int(token, handler) {
|
| this.token = token;
|
| this.handler = handler;
|
| // Initializers done
|
| - Expression.call(this);
|
| + tree_Expression.call(this);
|
| }
|
| $inherits(Literal$int, Literal);
|
| // ********** Code for LiteralInt **************
|
| @@ -6655,42 +6655,42 @@ LiteralString.prototype.accept = function(visitor) {
|
| LiteralString.prototype.accept$1 = function($0) {
|
| return this.accept(($0 && $0.is$Visitor()));
|
| };
|
| -// ********** Code for Identifier **************
|
| -function Identifier(token) {
|
| +// ********** Code for tree_Identifier **************
|
| +function tree_Identifier(token) {
|
| this.token = token;
|
| // Initializers done
|
| - Expression.call(this);
|
| + tree_Expression.call(this);
|
| }
|
| -$inherits(Identifier, Expression);
|
| -Identifier.prototype.is$Identifier = function(){return this;};
|
| -Identifier.prototype.get$source = function() {
|
| +$inherits(tree_Identifier, tree_Expression);
|
| +tree_Identifier.prototype.is$tree_Identifier = function(){return this;};
|
| +tree_Identifier.prototype.get$source = function() {
|
| var $0;
|
| return (($0 = this.token.get$value()) && $0.is$SourceString());
|
| }
|
| -Identifier.prototype.accept = function(visitor) {
|
| +tree_Identifier.prototype.accept = function(visitor) {
|
| return visitor.visitIdentifier(this);
|
| }
|
| -Identifier.prototype.getBeginToken = function() {
|
| +tree_Identifier.prototype.getBeginToken = function() {
|
| return this.token;
|
| }
|
| -Identifier.prototype.getEndToken = function() {
|
| +tree_Identifier.prototype.getEndToken = function() {
|
| return this.token;
|
| }
|
| -Identifier.prototype.accept$1 = function($0) {
|
| +tree_Identifier.prototype.accept$1 = function($0) {
|
| return this.accept(($0 && $0.is$Visitor()));
|
| };
|
| -Identifier.prototype.getBeginToken$0 = function() {
|
| +tree_Identifier.prototype.getBeginToken$0 = function() {
|
| return this.getBeginToken();
|
| };
|
| -Identifier.prototype.getEndToken$0 = function() {
|
| +tree_Identifier.prototype.getEndToken$0 = function() {
|
| return this.getEndToken();
|
| };
|
| // ********** Code for Operator **************
|
| function Operator(token) {
|
| // Initializers done
|
| - Identifier.call(this, token);
|
| + tree_Identifier.call(this, token);
|
| }
|
| -$inherits(Operator, Identifier);
|
| +$inherits(Operator, tree_Identifier);
|
| Operator.prototype.is$Operator = function(){return this;};
|
| Operator.prototype.accept = function(visitor) {
|
| return visitor.visitOperator(this);
|
| @@ -6704,9 +6704,9 @@ function Return(beginToken, endToken, expression) {
|
| this.endToken = endToken;
|
| this.expression = expression;
|
| // Initializers done
|
| - Statement.call(this);
|
| + tree_Statement.call(this);
|
| }
|
| -$inherits(Return, Statement);
|
| +$inherits(Return, tree_Statement);
|
| Return.prototype.get$hasExpression = function() {
|
| return this.expression != null;
|
| }
|
| @@ -6728,32 +6728,32 @@ Return.prototype.getBeginToken$0 = function() {
|
| Return.prototype.getEndToken$0 = function() {
|
| return this.getEndToken();
|
| };
|
| -// ********** Code for ExpressionStatement **************
|
| -function ExpressionStatement(expression, endToken) {
|
| +// ********** Code for tree_ExpressionStatement **************
|
| +function tree_ExpressionStatement(expression, endToken) {
|
| this.expression = expression;
|
| this.endToken = endToken;
|
| // Initializers done
|
| - Statement.call(this);
|
| + tree_Statement.call(this);
|
| }
|
| -$inherits(ExpressionStatement, Statement);
|
| -ExpressionStatement.prototype.is$ExpressionStatement = function(){return this;};
|
| -ExpressionStatement.prototype.accept = function(visitor) {
|
| +$inherits(tree_ExpressionStatement, tree_Statement);
|
| +tree_ExpressionStatement.prototype.is$tree_ExpressionStatement = function(){return this;};
|
| +tree_ExpressionStatement.prototype.accept = function(visitor) {
|
| return visitor.visitExpressionStatement(this);
|
| }
|
| -ExpressionStatement.prototype.getBeginToken = function() {
|
| +tree_ExpressionStatement.prototype.getBeginToken = function() {
|
| var $0;
|
| - return (($0 = this.expression.getBeginToken()) && $0.is$Token());
|
| + return (($0 = this.expression.getBeginToken()) && $0.is$scanner_Token());
|
| }
|
| -ExpressionStatement.prototype.getEndToken = function() {
|
| +tree_ExpressionStatement.prototype.getEndToken = function() {
|
| return this.endToken;
|
| }
|
| -ExpressionStatement.prototype.accept$1 = function($0) {
|
| +tree_ExpressionStatement.prototype.accept$1 = function($0) {
|
| return this.accept(($0 && $0.is$Visitor()));
|
| };
|
| -ExpressionStatement.prototype.getBeginToken$0 = function() {
|
| +tree_ExpressionStatement.prototype.getBeginToken$0 = function() {
|
| return this.getBeginToken();
|
| };
|
| -ExpressionStatement.prototype.getEndToken$0 = function() {
|
| +tree_ExpressionStatement.prototype.getEndToken$0 = function() {
|
| return this.getEndToken();
|
| };
|
| // ********** Code for Throw **************
|
| @@ -6762,9 +6762,9 @@ function Throw(expression, throwToken, endToken) {
|
| this.throwToken = throwToken;
|
| this.endToken = endToken;
|
| // Initializers done
|
| - Statement.call(this);
|
| + tree_Statement.call(this);
|
| }
|
| -$inherits(Throw, Statement);
|
| +$inherits(Throw, tree_Statement);
|
| Throw.prototype.accept = function(visitor) {
|
| return visitor.visitThrow(this);
|
| }
|
| @@ -6787,9 +6787,9 @@ Throw.prototype.getEndToken$0 = function() {
|
| function TypeAnnotation(typeName) {
|
| this.typeName = typeName;
|
| // Initializers done
|
| - Node.call(this);
|
| + tree_Node.call(this);
|
| }
|
| -$inherits(TypeAnnotation, Node);
|
| +$inherits(TypeAnnotation, tree_Node);
|
| TypeAnnotation.prototype.is$TypeAnnotation = function(){return this;};
|
| TypeAnnotation.prototype.get$typeName = function() { return this.typeName; };
|
| TypeAnnotation.prototype.accept = function(visitor) {
|
| @@ -6797,11 +6797,11 @@ TypeAnnotation.prototype.accept = function(visitor) {
|
| }
|
| TypeAnnotation.prototype.getBeginToken = function() {
|
| var $0;
|
| - return (($0 = this.typeName.getBeginToken()) && $0.is$Token());
|
| + return (($0 = this.typeName.getBeginToken()) && $0.is$scanner_Token());
|
| }
|
| TypeAnnotation.prototype.getEndToken = function() {
|
| var $0;
|
| - return (($0 = this.typeName.getEndToken()) && $0.is$Token());
|
| + return (($0 = this.typeName.getEndToken()) && $0.is$scanner_Token());
|
| }
|
| TypeAnnotation.prototype.accept$1 = function($0) {
|
| return this.accept(($0 && $0.is$Visitor()));
|
| @@ -6819,9 +6819,9 @@ function VariableDefinitions(type, modifiers, definitions, endToken) {
|
| this.definitions = definitions;
|
| this.endToken = endToken;
|
| // Initializers done
|
| - Statement.call(this);
|
| + tree_Statement.call(this);
|
| }
|
| -$inherits(VariableDefinitions, Statement);
|
| +$inherits(VariableDefinitions, tree_Statement);
|
| VariableDefinitions.prototype.is$VariableDefinitions = function(){return this;};
|
| VariableDefinitions.prototype.get$type = function() { return this.type; };
|
| VariableDefinitions.prototype.accept = function(visitor) {
|
| @@ -6993,12 +6993,12 @@ Unparser.prototype.add$1 = function($0) {
|
| return this.add(($0 && $0.is$SourceString()));
|
| };
|
| Unparser.prototype.visit$1 = function($0) {
|
| - return this.visit(($0 && $0.is$Node()));
|
| + return this.visit(($0 && $0.is$tree_Node()));
|
| };
|
| // ********** Code for top level **************
|
| function firstBeginToken(first, second) {
|
| var $0;
|
| - return (($0 = (first != null) ? first.getBeginToken() : second.getBeginToken()) && $0.is$Token());
|
| + return (($0 = (first != null) ? first.getBeginToken() : second.getBeginToken()) && $0.is$scanner_Token());
|
| }
|
| // ********** Library elements **************
|
| // ********** Code for ElementKind **************
|
| @@ -7111,9 +7111,9 @@ ClassElement.prototype.resolve$1 = function($0) {
|
| function getType(annotation, types) {
|
| var $0;
|
| if (annotation == null || annotation.typeName == null) {
|
| - return (($0 = types.dynamicType) && $0.is$Type());
|
| + return (($0 = types.dynamicType) && $0.is$leg_Type());
|
| }
|
| - return (($0 = types.lookup$1(annotation.typeName.get$source())) && $0.is$Type());
|
| + return (($0 = types.lookup$1(annotation.typeName.get$source())) && $0.is$leg_Type());
|
| }
|
| // ********** Library ssa **************
|
| // ********** Code for SsaBuilderTask **************
|
| @@ -7134,7 +7134,7 @@ SsaBuilderTask.prototype.build = function(tree, elements) {
|
| var graph = $this.compileMethod(function_.parameters, function_.body, elements);
|
| $assert(graph.isValid(), "graph.isValid()", "builder.dart", 14, 14);
|
| if (false/*null.GENERATE_SSA_TRACE*/) {
|
| - var name = (($0 = function_.name) && $0.is$Identifier());
|
| + var name = (($0 = function_.name) && $0.is$tree_Identifier());
|
| HTracer.HTracer$singleton$factory().traceCompilation(name.get$source().toString());
|
| HTracer.HTracer$singleton$factory().traceGraph('builder', graph);
|
| }
|
| @@ -7207,10 +7207,10 @@ SsaBuilder.prototype.visitParameters = function(parameters) {
|
| var container = (($0 = link.get$head()) && $0.is$VariableDefinitions());
|
| var identifierLink = container.definitions.nodes;
|
| $assert(!$notnull_bool(identifierLink.isEmpty()) && $notnull_bool(identifierLink.get$tail().isEmpty$0()), "!identifierLink.isEmpty() && identifierLink.tail.isEmpty()", "builder.dart", 115, 14);
|
| - if (!(identifierLink.get$head() instanceof Identifier)) {
|
| + if (!(identifierLink.get$head() instanceof tree_Identifier)) {
|
| this.compiler.unimplemented("SsaBuilder.visitParameters non-identifier");
|
| }
|
| - var parameterId = (($0 = identifierLink.get$head()) && $0.is$Identifier());
|
| + var parameterId = (($0 = identifierLink.get$head()) && $0.is$tree_Identifier());
|
| var element = (($0 = this.elements.$index(parameterId)) && $0.is$Element());
|
| var parameterInstruction = new HParameter(parameterIndex++);
|
| this.definitions.$setindex(element, parameterInstruction);
|
| @@ -7221,7 +7221,7 @@ SsaBuilder.prototype.visitBlock = function(node) {
|
| var $0;
|
| for (var link = node.statements.nodes;
|
| !$notnull_bool(link.isEmpty()); link = (($0 = link.get$tail()) && $0.is$Link$Node())) {
|
| - this.visit((($0 = link.get$head()) && $0.is$Node()));
|
| + this.visit((($0 = link.get$head()) && $0.is$tree_Node()));
|
| if ($notnull_bool(this.isAborted())) {
|
| if (!this.stack.isEmpty()) this.compiler.cancel('non-empty instruction stack');
|
| return;
|
| @@ -7408,7 +7408,7 @@ SsaBuilder.prototype.visitSend = function(node) {
|
| }
|
| var arguments = [];
|
| for (; !$notnull_bool(link.isEmpty()); link = (($0 = link.get$tail()) && $0.is$Link$Node())) {
|
| - this.visit((($0 = link.get$head()) && $0.is$Node()));
|
| + this.visit((($0 = link.get$head()) && $0.is$tree_Node()));
|
| arguments.add$1(this.pop());
|
| }
|
| if (element.kind === const$204/*ElementKind.FOREIGN*/) {
|
| @@ -7417,7 +7417,7 @@ SsaBuilder.prototype.visitSend = function(node) {
|
| this.push(new HInvokeForeign(element, arguments, this.unquote(literal)));
|
| }
|
| else {
|
| - var selector = (($0 = node.selector) && $0.is$Identifier());
|
| + var selector = (($0 = node.selector) && $0.is$tree_Identifier());
|
| this.push(new HInvoke(element, arguments));
|
| }
|
| }
|
| @@ -7441,7 +7441,7 @@ SsaBuilder.prototype.visitNodeList = function(node) {
|
| var $0;
|
| for (var link = node.nodes;
|
| !$notnull_bool(link.isEmpty()); link = (($0 = link.get$tail()) && $0.is$Link$Node())) {
|
| - this.visit((($0 = link.get$head()) && $0.is$Node()));
|
| + this.visit((($0 = link.get$head()) && $0.is$tree_Node()));
|
| }
|
| }
|
| SsaBuilder.prototype.visitOperator = function(node) {
|
| @@ -7472,7 +7472,7 @@ SsaBuilder.prototype.updateDefinition = function(node) {
|
| }
|
| var link = node.get$arguments();
|
| $assert(!$notnull_bool(link.isEmpty()) && $notnull_bool(link.get$tail().isEmpty$0()), "!link.isEmpty() && link.tail.isEmpty()", "builder.dart", 438, 12);
|
| - this.visit((($0 = link.get$head()) && $0.is$Node()));
|
| + this.visit((($0 = link.get$head()) && $0.is$tree_Node()));
|
| var value = this.pop();
|
| this.definitions.$setindex(this.elements.$index(node), value);
|
| return value;
|
| @@ -7481,8 +7481,8 @@ SsaBuilder.prototype.visitVariableDefinitions = function(node) {
|
| var $0;
|
| for (var link = node.definitions.nodes;
|
| !$notnull_bool(link.isEmpty()); link = (($0 = link.get$tail()) && $0.is$Link$Node())) {
|
| - var definition = (($0 = link.get$head()) && $0.is$Node());
|
| - if ((definition instanceof Identifier)) {
|
| + var definition = (($0 = link.get$head()) && $0.is$tree_Node());
|
| + if ((definition instanceof tree_Identifier)) {
|
| this.compiler.unimplemented("SsaBuilder.visitVariableDefinitions without initial value");
|
| }
|
| else {
|
| @@ -7495,7 +7495,7 @@ SsaBuilder.prototype.add$1 = function($0) {
|
| return this.add(($0 && $0.is$HInstruction()));
|
| };
|
| SsaBuilder.prototype.visit$1 = function($0) {
|
| - return this.visit(($0 && $0.is$Node()));
|
| + return this.visit(($0 && $0.is$tree_Node()));
|
| };
|
| // ********** Code for SsaCodeGeneratorTask **************
|
| function SsaCodeGeneratorTask(compiler) {
|
| @@ -7519,7 +7519,7 @@ SsaCodeGeneratorTask.prototype.generate = function(tree, graph) {
|
| var name = (($0 = parameter.definitions.nodes.get$head().get$source()) && $0.is$SourceString());
|
| parameterNames.add(JsNames.getValid(('' + name + '')));
|
| }
|
| - var name = (($0 = function_.name) && $0.is$Identifier());
|
| + var name = (($0 = function_.name) && $0.is$tree_Identifier());
|
| if (false/*null.GENERATE_SSA_TRACE*/) {
|
| HTracer.HTracer$singleton$factory().traceGraph("codegen", graph);
|
| }
|
| @@ -8285,7 +8285,7 @@ HInstruction.computeDependsOnFlags = function(flags) {
|
| return flags << 1/*HInstruction.FLAG_CHANGES_COUNT*/;
|
| }
|
| HInstruction.prototype.getChangesFlags = function() {
|
| - return this.flags & (1)/*((1 << FLAG_CHANGES_COUNT) - 1)*/;
|
| + return this.flags & (1.0)/*((1 << FLAG_CHANGES_COUNT) - 1)*/;
|
| }
|
| HInstruction.prototype.hasSideEffects = function() {
|
| return this.getChangesFlags() != 0;
|
| @@ -8294,10 +8294,10 @@ HInstruction.prototype.prepareGvn = function() {
|
| this.setAllSideEffects();
|
| }
|
| HInstruction.prototype.setAllSideEffects = function() {
|
| - this.flags |= (1)/*((1 << FLAG_CHANGES_COUNT) - 1)*/;
|
| + this.flags |= (1.0)/*((1 << FLAG_CHANGES_COUNT) - 1)*/;
|
| }
|
| HInstruction.prototype.clearAllSideEffects = function() {
|
| - this.flags &= -2/*~((1 << FLAG_CHANGES_COUNT) - 1)*/;
|
| + this.flags &= -2.0/*~((1 << FLAG_CHANGES_COUNT) - 1)*/;
|
| }
|
| HInstruction.prototype.generateAtUseSite = function() {
|
| return this.getFlag(2/*HInstruction.FLAG_GENERATE_AT_USE_SITE*/);
|
| @@ -9755,7 +9755,7 @@ ResolverTask.prototype.resolveType = function(tree) {
|
| );
|
| }
|
| ResolverTask.prototype.resolve$1 = function($0) {
|
| - return this.resolve(($0 && $0.is$Node()));
|
| + return this.resolve(($0 && $0.is$tree_Node()));
|
| };
|
| // ********** Code for ErrorMessages **************
|
| function ErrorMessages() {}
|
| @@ -9841,7 +9841,7 @@ ResolverVisitor.prototype.potentiallyMapOperatorToMethodName = function(name) {
|
| ResolverVisitor.prototype.visitSend = function(node) {
|
| var $0;
|
| this.visit(node.receiver);
|
| - var identifier = (($0 = node.selector) && $0.is$Identifier());
|
| + var identifier = (($0 = node.selector) && $0.is$tree_Identifier());
|
| var name = this.potentiallyMapOperatorToMethodName(identifier.get$source());
|
| var target = this.context.lookup(name);
|
| if (target == null) this.fail(node, ErrorMessages.cannotResolve(name));
|
| @@ -9851,7 +9851,7 @@ ResolverVisitor.prototype.visitSend = function(node) {
|
| ResolverVisitor.prototype.visitSendSet = function(node) {
|
| var $0;
|
| var receiver = (($0 = this.visit(node.receiver)) && $0.is$Element());
|
| - var selector = (($0 = node.selector) && $0.is$Identifier());
|
| + var selector = (($0 = node.selector) && $0.is$tree_Identifier());
|
| if (receiver != null) {
|
| this.compiler.unimplemented('Resolver: property access');
|
| }
|
| @@ -9876,7 +9876,7 @@ ResolverVisitor.prototype.visitNodeList = function(node) {
|
| var $0;
|
| for (var link = node.nodes;
|
| !$notnull_bool(link.isEmpty()); link = (($0 = link.get$tail()) && $0.is$Link$Node())) {
|
| - this.visit((($0 = link.get$head()) && $0.is$Node()));
|
| + this.visit((($0 = link.get$head()) && $0.is$tree_Node()));
|
| }
|
| }
|
| ResolverVisitor.prototype.visitOperator = function(node) {
|
| @@ -9922,7 +9922,7 @@ ResolverVisitor.prototype.useElement = function(node, element) {
|
| return element;
|
| }
|
| ResolverVisitor.prototype.visit$1 = function($0) {
|
| - return this.visit(($0 && $0.is$Node()));
|
| + return this.visit(($0 && $0.is$tree_Node()));
|
| };
|
| // ********** Code for ClassResolverVisitor **************
|
| function ClassResolverVisitor(compiler) {
|
| @@ -9939,7 +9939,7 @@ ClassResolverVisitor.prototype.visitClassNode = function(node) {
|
| element.supertype = this.visit(node.superclass);
|
| for (var link = node.interfaces.nodes;
|
| !$notnull_bool(link.isEmpty()); link = (($0 = link.get$tail()) && $0.is$Link$Node())) {
|
| - element.interfaces = (($0 = element.interfaces.prepend(this.visit((($0 = link.get$head()) && $0.is$Node())))) && $0.is$Link$Type());
|
| + element.interfaces = (($0 = element.interfaces.prepend(this.visit((($0 = link.get$head()) && $0.is$tree_Node())))) && $0.is$Link$Type());
|
| }
|
| return element.computeType(this.compiler, null);
|
| }
|
| @@ -9955,17 +9955,17 @@ ClassResolverVisitor.prototype.visitTypeAnnotation = function(node) {
|
| }
|
| else {
|
| this.compiler.resolver.toResolve.add(element);
|
| - return (($0 = element.computeType(this.compiler, null)) && $0.is$Type());
|
| + return (($0 = element.computeType(this.compiler, null)) && $0.is$leg_Type());
|
| }
|
| return null;
|
| }
|
| ClassResolverVisitor.prototype.visit = function(node) {
|
| var $0;
|
| if (node == null) return null;
|
| - return (($0 = node.accept(this)) && $0.is$Type());
|
| + return (($0 = node.accept(this)) && $0.is$leg_Type());
|
| }
|
| ClassResolverVisitor.prototype.visit$1 = function($0) {
|
| - return this.visit(($0 && $0.is$Node()));
|
| + return this.visit(($0 && $0.is$tree_Node()));
|
| };
|
| // ********** Code for VariableDefinitionsVisitor **************
|
| function VariableDefinitionsVisitor(definitions, resolver) {
|
| @@ -9980,8 +9980,8 @@ VariableDefinitionsVisitor.prototype.visitSendSet = function(node) {
|
| if (node.receiver != null) {
|
| this.resolver.compiler.unimplemented("receiver on a variable definition");
|
| }
|
| - var selector = (($0 = node.selector) && $0.is$Identifier());
|
| - this.resolver.visit((($0 = node.get$arguments().get$head()) && $0.is$Node()));
|
| + var selector = (($0 = node.selector) && $0.is$tree_Identifier());
|
| + this.resolver.visit((($0 = node.get$arguments().get$head()) && $0.is$tree_Node()));
|
| return (($0 = this.visit(node.selector)) && $0.is$SourceString());
|
| }
|
| VariableDefinitionsVisitor.prototype.visitIdentifier = function(node) {
|
| @@ -9991,9 +9991,9 @@ VariableDefinitionsVisitor.prototype.visitNodeList = function(node) {
|
| var $0;
|
| for (var link = node.nodes;
|
| !$notnull_bool(link.isEmpty()); link = (($0 = link.get$tail()) && $0.is$Link$Node())) {
|
| - var name = (($0 = this.visit((($0 = link.get$head()) && $0.is$Node()))) && $0.is$SourceString());
|
| - var element = new VariableElement((($0 = link.get$head()) && $0.is$Node()), this.definitions.type, name, this.resolver.context.enclosingElement);
|
| - var existing = this.resolver.defineElement((($0 = link.get$head()) && $0.is$Node()), element);
|
| + var name = (($0 = this.visit((($0 = link.get$head()) && $0.is$tree_Node()))) && $0.is$SourceString());
|
| + var element = new VariableElement((($0 = link.get$head()) && $0.is$tree_Node()), this.definitions.type, name, this.resolver.context.enclosingElement);
|
| + var existing = this.resolver.defineElement((($0 = link.get$head()) && $0.is$tree_Node()), element);
|
| if ($ne(existing, element)) {
|
| this.resolver.fail(node, ErrorMessages.duplicateDefinition(link.get$head()));
|
| }
|
| @@ -10003,20 +10003,13 @@ VariableDefinitionsVisitor.prototype.visit = function(node) {
|
| return node.accept(this);
|
| }
|
| VariableDefinitionsVisitor.prototype.visit$1 = function($0) {
|
| - return this.visit(($0 && $0.is$Node()));
|
| + return this.visit(($0 && $0.is$tree_Node()));
|
| };
|
| // ********** Code for Scope **************
|
| function Scope(parent) {
|
| // Initializers done
|
| Scope.enclosing$ctor.call(this, parent, parent.enclosingElement);
|
| }
|
| -Scope.top$ctor = function() {
|
| - this.parent = null;
|
| - this.elements = const$212/*const {}*/;
|
| - this.enclosingElement = null;
|
| - // Initializers done
|
| -}
|
| -Scope.top$ctor.prototype = Scope.prototype;
|
| Scope.enclosing$ctor = function(parent, enclosingElement) {
|
| this.parent = parent;
|
| this.enclosingElement = enclosingElement;
|
| @@ -10024,6 +10017,13 @@ Scope.enclosing$ctor = function(parent, enclosingElement) {
|
| // Initializers done
|
| }
|
| Scope.enclosing$ctor.prototype = Scope.prototype;
|
| +Scope.top$ctor = function() {
|
| + this.parent = null;
|
| + this.elements = const$212/*const {}*/;
|
| + this.enclosingElement = null;
|
| + // Initializers done
|
| +}
|
| +Scope.top$ctor.prototype = Scope.prototype;
|
| Scope.prototype.get$parent = function() { return this.parent; };
|
| Scope.prototype.lookup = function(name) {
|
| var $0;
|
| @@ -10130,7 +10130,7 @@ SimpleType.named$ctor = function(name) {
|
| // Initializers done
|
| }
|
| SimpleType.named$ctor.prototype = SimpleType.prototype;
|
| -SimpleType.prototype.is$Type = function(){return this;};
|
| +SimpleType.prototype.is$leg_Type = function(){return this;};
|
| SimpleType.prototype.get$name = function() { return this.name; };
|
| SimpleType.prototype.get$element = function() { return this.element; };
|
| SimpleType.prototype.toString = function() {
|
| @@ -10146,7 +10146,7 @@ function FunctionType(returnType, parameterTypes) {
|
| // Initializers done
|
| }
|
| FunctionType.prototype.is$FunctionType = function(){return this;};
|
| -FunctionType.prototype.is$Type = function(){return this;};
|
| +FunctionType.prototype.is$leg_Type = function(){return this;};
|
| FunctionType.prototype.get$returnType = function() { return this.returnType; };
|
| FunctionType.prototype.toString = function() {
|
| var sb = new StringBufferImpl("");
|
| @@ -10229,7 +10229,7 @@ TypeCheckerVisitor.prototype.typeWithDefault = function(node, defaultValue) {
|
| TypeCheckerVisitor.prototype.type = function(node) {
|
| var $0;
|
| if (node == null) this.fail(null, 'unexpected node: null');
|
| - var result = (($0 = node.accept(this)) && $0.is$Type());
|
| + var result = (($0 = node.accept(this)) && $0.is$leg_Type());
|
| return result;
|
| }
|
| TypeCheckerVisitor.prototype.get$type = function() {
|
| @@ -10275,7 +10275,7 @@ TypeCheckerVisitor.prototype.visitIf = function(node) {
|
| TypeCheckerVisitor.prototype.visitSend = function(node) {
|
| var $0;
|
| var target = this.elements.$index(node);
|
| - var selector = (($0 = node.selector) && $0.is$Identifier());
|
| + var selector = (($0 = node.selector) && $0.is$tree_Identifier());
|
| if (target != null) {
|
| var name = selector.get$source();
|
| if ($notnull_bool($eq(name, const$213/*const SourceString('+')*/)) || $notnull_bool($eq(name, const$240/*const SourceString('=')*/)) || $notnull_bool($eq(name, const$215/*const SourceString('-')*/)) || $notnull_bool($eq(name, const$217/*const SourceString('*')*/)) || $notnull_bool($eq(name, const$219/*const SourceString('/')*/)) || $notnull_bool($eq(name, const$225/*const SourceString('<')*/)) || $notnull_bool($eq(name, const$221/*const SourceString('~/')*/))) {
|
| @@ -10283,7 +10283,7 @@ TypeCheckerVisitor.prototype.visitSend = function(node) {
|
| }
|
| var targetType = target.computeType$2(this.compiler, this.types);
|
| if ($notnull_bool(node.get$isPropertyAccess())) {
|
| - return (targetType && targetType.is$Type());
|
| + return (targetType && targetType.is$leg_Type());
|
| }
|
| else if ($notnull_bool(node.get$isFunctionObjectInvocation())) {
|
| this.fail(node);
|
| @@ -10299,9 +10299,9 @@ TypeCheckerVisitor.prototype.visitSend = function(node) {
|
| var formals = funType.parameterTypes;
|
| var arguments = node.get$arguments();
|
| while ((!$notnull_bool(formals.isEmpty())) && (!$notnull_bool(arguments.isEmpty()))) {
|
| - var argument = (($0 = arguments.get$head()) && $0.is$Node());
|
| + var argument = (($0 = arguments.get$head()) && $0.is$tree_Node());
|
| var argumentType = this.type(argument);
|
| - this.checkAssignable(argument, argumentType, (($0 = formals.get$head()) && $0.is$Type()));
|
| + this.checkAssignable(argument, argumentType, (($0 = formals.get$head()) && $0.is$leg_Type()));
|
| formals = (($0 = formals.get$tail()) && $0.is$Link$Type());
|
| arguments = (($0 = arguments.get$tail()) && $0.is$Link$Node());
|
| }
|
| @@ -10309,7 +10309,7 @@ TypeCheckerVisitor.prototype.visitSend = function(node) {
|
| this.compiler.reportWarning(node, 'missing argument');
|
| }
|
| if (!$notnull_bool(arguments.isEmpty())) {
|
| - this.compiler.reportWarning((($0 = arguments.get$head()) && $0.is$Node()), 'additional arguments');
|
| + this.compiler.reportWarning((($0 = arguments.get$head()) && $0.is$tree_Node()), 'additional arguments');
|
| }
|
| return funType.returnType;
|
| }
|
| @@ -10321,8 +10321,8 @@ TypeCheckerVisitor.prototype.visitSend = function(node) {
|
| TypeCheckerVisitor.prototype.visitSendSet = function(node) {
|
| var $0;
|
| this.compiler.ensure(node.get$arguments() != null && !$notnull_bool(node.get$arguments().isEmpty()));
|
| - var targetType = (($0 = this.elements.$index(node).computeType$2(this.compiler, this.types)) && $0.is$Type());
|
| - var value = (($0 = node.get$arguments().get$head()) && $0.is$Node());
|
| + var targetType = (($0 = this.elements.$index(node).computeType$2(this.compiler, this.types)) && $0.is$leg_Type());
|
| + var value = (($0 = node.get$arguments().get$head()) && $0.is$tree_Node());
|
| this.checkAssignable(value, this.type(value), targetType);
|
| return targetType;
|
| }
|
| @@ -10342,7 +10342,7 @@ TypeCheckerVisitor.prototype.visitNodeList = function(node) {
|
| var $0;
|
| for (var link = node.nodes;
|
| !$notnull_bool(link.isEmpty()); link = (($0 = link.get$tail()) && $0.is$Link$Node())) {
|
| - this.type((($0 = link.get$head()) && $0.is$Node()));
|
| + this.type((($0 = link.get$head()) && $0.is$tree_Node()));
|
| }
|
| return null;
|
| }
|
| @@ -10386,10 +10386,10 @@ TypeCheckerVisitor.prototype.visitVariableDefinitions = function(node) {
|
| }
|
| for (var link = node.definitions.nodes;
|
| !$notnull_bool(link.isEmpty()); link = (($0 = link.get$tail()) && $0.is$Link$Node())) {
|
| - var initialization = (($0 = link.get$head()) && $0.is$Node());
|
| - this.compiler.ensure((initialization instanceof Identifier) || (initialization instanceof Send));
|
| + var initialization = (($0 = link.get$head()) && $0.is$tree_Node());
|
| + this.compiler.ensure((initialization instanceof tree_Identifier) || (initialization instanceof Send));
|
| if ((initialization instanceof Send)) {
|
| - var initializer = this.nonVoidType((($0 = link.get$head()) && $0.is$Node()));
|
| + var initializer = this.nonVoidType((($0 = link.get$head()) && $0.is$tree_Node()));
|
| this.checkAssignable(node, type, initializer);
|
| }
|
| }
|
| @@ -10417,7 +10417,7 @@ Universe.prototype.addGeneratedCode = function(element, code) {
|
| function unreachable() {
|
| $throw(const$267/*const Exception("Internal Error (Leg): UNREACHABLE")*/);
|
| }
|
| -function compile(world) {
|
| +function leg_compile(world) {
|
| var file = world.readFile(options.dartScript);
|
| var script = new leg_Script(file);
|
| var compiler = new WorldCompiler(world, script);
|
| @@ -10693,18 +10693,18 @@ WorldGenerator.prototype.writeTypes = function(lib) {
|
| for (var $i = 0;$i < $list.length; $i++) {
|
| var type = $list.$index($i);
|
| if ($notnull_bool(type.get$isUsed()) && $notnull_bool(type.get$isClass())) {
|
| - this.writeType((type && type.is$lang_Type()));
|
| + this.writeType((type && type.is$Type()));
|
| if ($notnull_bool(type.get$isGeneric())) {
|
| var $list0 = this._orderValues(type._concreteTypes);
|
| for (var $i0 = 0;$i0 < $list0.length; $i0++) {
|
| var ct = $list0.$index($i0);
|
| - this.writeType((ct && ct.is$lang_Type()));
|
| + this.writeType((ct && ct.is$Type()));
|
| }
|
| }
|
| }
|
| if ($notnull_bool(type.get$isFunction()) && type.varStubs != null) {
|
| this.writer.comment(('// ********** Code for ' + type.get$jsname() + ' **************'));
|
| - this._writeDynamicStubs((type && type.is$lang_Type()));
|
| + this._writeDynamicStubs((type && type.is$Type()));
|
| }
|
| if (type.typeCheckCode != null) {
|
| this.writer.writeln(type.typeCheckCode);
|
| @@ -10785,7 +10785,7 @@ WorldGenerator.prototype.writeType = function(type) {
|
| var $list = this._orderValues(type.get$genericType()._concreteTypes);
|
| for (var $i = 0;$i < $list.length; $i++) {
|
| var ct = $list.$index($i);
|
| - this._maybeIsTest(type, (ct && ct.is$lang_Type()));
|
| + this._maybeIsTest(type, (ct && ct.is$Type()));
|
| }
|
| }
|
| if (type.get$interfaces() != null) {
|
| @@ -10800,7 +10800,7 @@ WorldGenerator.prototype.writeType = function(type) {
|
| var $list = this._orderValues(interface_.get$genericType()._concreteTypes);
|
| for (var $i = 0;$i < $list.length; $i++) {
|
| var ct = $list.$index($i);
|
| - this._maybeIsTest(type, (ct && ct.is$lang_Type()));
|
| + this._maybeIsTest(type, (ct && ct.is$Type()));
|
| }
|
| }
|
| var $list = interface_.get$interfaces();
|
| @@ -10935,7 +10935,7 @@ WorldGenerator.prototype.useMapFactory = function() {
|
| this.genMethod((($0 = m.get$members().$index(0)) && $0.is$Member()));
|
| var c = factType.getConstructor$1('');
|
| this.genMethod((c && c.is$Member()));
|
| - return (factType && factType.is$lang_Type());
|
| + return (factType && factType.is$Type());
|
| }
|
| // ********** Code for BlockScope **************
|
| function BlockScope(enclosingMethod, parent, reentrant) {
|
| @@ -11011,7 +11011,7 @@ BlockScope.prototype.declareParameter = function(p) {
|
| }
|
| BlockScope.prototype.declare = function(id) {
|
| var type = this.enclosingMethod.method.resolveType(id.type, false);
|
| - return this.create(id.name.name, (type && type.is$lang_Type()), id.span, false, false);
|
| + return this.create(id.name.name, (type && type.is$Type()), id.span, false, false);
|
| }
|
| BlockScope.prototype.getRethrow = function() {
|
| var scope = this;
|
| @@ -11352,7 +11352,7 @@ MethodGenerator.prototype.writeBody = function() {
|
| }
|
| }
|
| }
|
| - this.visitStatementsInBlock((body && body.is$lang_Statement()));
|
| + this.visitStatementsInBlock((body && body.is$Statement()));
|
| }
|
| MethodGenerator.prototype._writeInitializerCall = function(node) {
|
| var contructorName = '';
|
| @@ -11364,10 +11364,10 @@ MethodGenerator.prototype._writeInitializerCall = function(node) {
|
| }
|
| var target = null;
|
| if ((targetExp instanceof SuperExpression)) {
|
| - target = this._makeSuperValue((targetExp && targetExp.is$lang_Node()));
|
| + target = this._makeSuperValue((targetExp && targetExp.is$Node()));
|
| }
|
| else if ((targetExp instanceof ThisExpression)) {
|
| - target = this._makeThisValue((targetExp && targetExp.is$lang_Node()));
|
| + target = this._makeThisValue((targetExp && targetExp.is$Node()));
|
| }
|
| else {
|
| world.error('bad call in initializers', node.span);
|
| @@ -11401,7 +11401,7 @@ MethodGenerator.prototype._makeArgs = function(arguments) {
|
| else if ($notnull_bool(seenLabel)) {
|
| world.error('bare argument can not follow named arguments', arg.get$span());
|
| }
|
| - args.add$1(this.visitValue((($0 = arg.get$value()) && $0.is$lang_Expression())));
|
| + args.add$1(this.visitValue((($0 = arg.get$value()) && $0.is$Expression())));
|
| }
|
| return new Arguments(arguments, args);
|
| }
|
| @@ -11456,7 +11456,7 @@ MethodGenerator.prototype.visitVoid = function(node) {
|
| return this.visitValue(node);
|
| }
|
| MethodGenerator.prototype.visitDietStatement = function(node) {
|
| - var parser = new lang_Parser(node.span.file, false, false, false, node.span.start);
|
| + var parser = new Parser(node.span.file, false, false, false, node.span.start);
|
| this.visitStatementsInBlock(parser.block$0());
|
| return false;
|
| }
|
| @@ -11475,7 +11475,7 @@ MethodGenerator.prototype.visitVariableDefinition = function(node) {
|
| this.writer.write(', ');
|
| }
|
| var name = node.names.$index(i).get$name();
|
| - var value = this.visitValue((($0 = node.values.$index(i)) && $0.is$lang_Expression()));
|
| + var value = this.visitValue((($0 = node.values.$index(i)) && $0.is$Expression()));
|
| if ($notnull_bool(isFinal)) {
|
| if ($notnull_bool(value == null)) {
|
| world.error('no value specified for final variable', node.span);
|
| @@ -11484,7 +11484,7 @@ MethodGenerator.prototype.visitVariableDefinition = function(node) {
|
| if ($notnull_bool(thisType.get$isVar())) thisType = value.type;
|
| }
|
| }
|
| - var val = this._scope.create($assert_String(name), (thisType && thisType.is$lang_Type()), node.names.$index(i).get$span(), $assert_bool(isFinal), false);
|
| + var val = this._scope.create($assert_String(name), (thisType && thisType.is$Type()), node.names.$index(i).get$span(), $assert_bool(isFinal), false);
|
| if ($notnull_bool(value == null)) {
|
| if ($notnull_bool(this._scope.reentrant)) {
|
| this.writer.write(('' + val.code + ' = null'));
|
| @@ -11505,7 +11505,7 @@ MethodGenerator.prototype.visitFunctionDefinition = function(node) {
|
| var $0;
|
| var name = world.toJsIdentifier(node.name.name);
|
| var meth = this._makeLambdaMethod($assert_String(name), node);
|
| - var funcValue = this._scope.create($assert_String(name), (($0 = meth.get$functionType()) && $0.is$lang_Type()), this.method.get$definition().get$span(), true, false);
|
| + var funcValue = this._scope.create($assert_String(name), (($0 = meth.get$functionType()) && $0.is$Type()), this.method.get$definition().get$span(), true, false);
|
| meth.generator.writeDefinition$2(this.writer);
|
| return false;
|
| }
|
| @@ -11619,7 +11619,7 @@ MethodGenerator.prototype.visitForStatement = function(node) {
|
| for (var $i = 0;$i < $list.length; $i++) {
|
| var s = $list.$index($i);
|
| if ($notnull_bool(needsComma)) this.writer.write(', ');
|
| - var sv = this.visitVoid((s && s.is$lang_Expression()));
|
| + var sv = this.visitVoid((s && s.is$Expression()));
|
| this.writer.write($assert_String(sv.code));
|
| needsComma = true;
|
| }
|
| @@ -11643,10 +11643,10 @@ MethodGenerator.prototype.visitForInStatement = function(node) {
|
| var list = node.list.visit(this);
|
| this._pushBlock(true);
|
| var isFinal = this._isFinal(node.item.type);
|
| - var item = this._scope.create($assert_String(itemName), (itemType && itemType.is$lang_Type()), node.item.name.span, isFinal, false);
|
| + var item = this._scope.create($assert_String(itemName), (itemType && itemType.is$Type()), node.item.name.span, isFinal, false);
|
| var listVar = (list && list.is$Value());
|
| if ($notnull_bool(list.needsTemp)) {
|
| - listVar = this._scope.create('\$list', (($0 = list.type) && $0.is$lang_Type()), null, false, false);
|
| + listVar = this._scope.create('\$list', (($0 = list.type) && $0.is$Type()), null, false, false);
|
| this.writer.writeln(('var ' + listVar.code + ' = ' + list.code + ';'));
|
| }
|
| if ($notnull_bool(list.type.get$isList())) {
|
| @@ -11658,7 +11658,7 @@ MethodGenerator.prototype.visitForInStatement = function(node) {
|
| else {
|
| this._pushBlock(false);
|
| var iterator = list.invoke$4(this, 'iterator', node.list, Arguments.get$EMPTY());
|
| - var tmpi = this._scope.create('\$i', (($0 = iterator.type) && $0.is$lang_Type()), null, false, false);
|
| + var tmpi = this._scope.create('\$i', (($0 = iterator.type) && $0.is$Type()), null, false, false);
|
| var hasNext = tmpi.invoke$4(this, 'hasNext', node.list, Arguments.get$EMPTY());
|
| var next = tmpi.invoke$4(this, 'next', node.list, Arguments.get$EMPTY());
|
| this.writer.enterBlock(('for (var ' + tmpi.code + ' = ' + iterator.code + '; ' + hasNext.code + '; ) {'));
|
| @@ -11704,7 +11704,7 @@ MethodGenerator.prototype.visitTryStatement = function(node) {
|
| var test = ex.instanceOf$3$isTrue$forceCheck(this, ex.type, catch_.get$exception().get$span(), false, true);
|
| this.writer.writeln(('if (' + test.code + ') throw ' + ex.code + ';'));
|
| }
|
| - this.visitStatementsInBlock((($0 = node.catches.$index(0).body) && $0.is$lang_Statement()));
|
| + this.visitStatementsInBlock((($0 = node.catches.$index(0).body) && $0.is$Statement()));
|
| this._popBlock();
|
| }
|
| else if (node.catches.length > 0) {
|
| @@ -11745,7 +11745,7 @@ MethodGenerator.prototype.visitTryStatement = function(node) {
|
| var tmptrace = this._scope.declare(catch_.trace);
|
| this.writer.writeln(('var ' + tmptrace.code + ' = ' + trace.code + ';'));
|
| }
|
| - this.visitStatementsInBlock((($0 = catch_.body) && $0.is$lang_Statement()));
|
| + this.visitStatementsInBlock((($0 = catch_.body) && $0.is$Statement()));
|
| this._popBlock();
|
| if ($notnull_bool(tmp.type.get$isVarOrObject())) {
|
| if (i + 1 < node.catches.length) {
|
| @@ -11794,7 +11794,7 @@ MethodGenerator.prototype.visitSwitchStatement = function(node) {
|
| this.writer.writeln('default:');
|
| }
|
| else {
|
| - var value = this.visitValue((expr && expr.is$lang_Expression()));
|
| + var value = this.visitValue((expr && expr.is$Expression()));
|
| this.writer.writeln(('case ' + value.code + ':'));
|
| }
|
| }
|
| @@ -12103,14 +12103,14 @@ MethodGenerator.prototype.visitUnaryExpression = function(node) {
|
| else {
|
| var kind = (16/*TokenKind.INCR*/ == node.op.kind ? 42/*TokenKind.ADD*/ : 43/*TokenKind.SUB*/);
|
| var operand = new LiteralExpression(1, new TypeReference(node.span, world.numType), '1', node.span);
|
| - return this._visitAssign($assert_num(kind), node.self, (operand && operand.is$lang_Expression()), node, to$call$1(null));
|
| + return this._visitAssign($assert_num(kind), node.self, (operand && operand.is$Expression()), node, to$call$1(null));
|
| }
|
|
|
| case 19/*TokenKind.NOT*/:
|
|
|
| if ($notnull_bool(value.type.get$isBool()) && $notnull_bool(value.get$isConst())) {
|
| var newVal = !$notnull_bool(value.get$actualValue());
|
| - return EvaluatedValue.EvaluatedValue$factory((($0 = value.type) && $0.is$lang_Type()), newVal, ('' + newVal + ''), node.span);
|
| + return EvaluatedValue.EvaluatedValue$factory((($0 = value.type) && $0.is$Type()), newVal, ('' + newVal + ''), node.span);
|
| }
|
| else {
|
| var newVal = value.convertTo$3(this, world.nonNullBool, node);
|
| @@ -12150,7 +12150,7 @@ MethodGenerator.prototype.visitPostfixExpression = function(node, isVoid) {
|
| var kind = (16/*TokenKind.INCR*/ == node.op.kind) ? 42/*TokenKind.ADD*/ : 43/*TokenKind.SUB*/;
|
| var operand = new LiteralExpression(1, new TypeReference(node.span, world.numType), '1', node.span);
|
| var tmpleft = null, left = null;
|
| - var ret = this._visitAssign($assert_num(kind), node.body, (operand && operand.is$lang_Expression()), node, (function (l) {
|
| + var ret = this._visitAssign($assert_num(kind), node.body, (operand && operand.is$Expression()), node, (function (l) {
|
| if ($notnull_bool(isVoid)) {
|
| return l;
|
| }
|
| @@ -12203,7 +12203,7 @@ MethodGenerator.prototype.visitNewExpression = function(node) {
|
| var $list = node.arguments;
|
| for (var $i = 0;$i < $list.length; $i++) {
|
| var arg = $list.$index($i);
|
| - if (!$notnull_bool(this.visitValue((($0 = arg.get$value()) && $0.is$lang_Expression())).get$isConst())) {
|
| + if (!$notnull_bool(this.visitValue((($0 = arg.get$value()) && $0.is$Expression())).get$isConst())) {
|
| world.error('const constructor expects const arguments', arg.get$span());
|
| }
|
| }
|
| @@ -12216,7 +12216,7 @@ MethodGenerator.prototype.visitListExpression = function(node) {
|
| var $list = node.values;
|
| for (var $i = 0;$i < $list.length; $i++) {
|
| var item = $list.$index($i);
|
| - var arg = this.visitValue((item && item.is$lang_Expression()));
|
| + var arg = this.visitValue((item && item.is$Expression()));
|
| argValues.add$1(arg);
|
| if ($notnull_bool(node.isConst)) {
|
| if (!$notnull_bool(arg.get$isConst())) {
|
| @@ -12238,7 +12238,7 @@ MethodGenerator.prototype.visitListExpression = function(node) {
|
| var immutableList = world.get$coreimpl().types.$index('ImmutableList');
|
| var immutableListCtor = immutableList.getConstructor$1('from');
|
| var result = immutableListCtor.invoke$4(this, node, null, new Arguments(null, [value]));
|
| - value = world.gen.globalForConst(ConstListValue.ConstListValue$factory((immutableList && immutableList.is$lang_Type()), (argValues && argValues.is$List$EvaluatedValue()), ('const ' + code + ''), $assert_String(result.code), node.span), (argValues && argValues.is$List$Value()));
|
| + value = world.gen.globalForConst(ConstListValue.ConstListValue$factory((immutableList && immutableList.is$Type()), (argValues && argValues.is$List$EvaluatedValue()), ('const ' + code + ''), $assert_String(result.code), node.span), (argValues && argValues.is$List$Value()));
|
| }
|
| return value;
|
| }
|
| @@ -12249,9 +12249,9 @@ MethodGenerator.prototype.visitMapExpression = function(node) {
|
| var argsCode = [];
|
| for (var i = 0;
|
| i < node.items.length; i += 2) {
|
| - var key = this.visitTypedValue((($0 = node.items.$index(i)) && $0.is$lang_Expression()), world.stringType);
|
| + var key = this.visitTypedValue((($0 = node.items.$index(i)) && $0.is$Expression()), world.stringType);
|
| var valueItem = node.items.$index(i + 1);
|
| - var value = this.visitValue((valueItem && valueItem.is$lang_Expression()));
|
| + var value = this.visitValue((valueItem && valueItem.is$Expression()));
|
| argValues.add$1(key);
|
| argValues.add$1(value);
|
| if ($notnull_bool(node.isConst)) {
|
| @@ -12277,7 +12277,7 @@ MethodGenerator.prototype.visitMapExpression = function(node) {
|
| var immutableMapCtor = immutableMap.getConstructor$1('');
|
| var argsValue = new Value(world.listType, argList, node.span, true);
|
| var result = immutableMapCtor.invoke$4(this, node, null, new Arguments(null, [argsValue]));
|
| - var value = ConstMapValue.ConstMapValue$factory((immutableMap && immutableMap.is$lang_Type()), (argValues && argValues.is$List$EvaluatedValue()), code, $assert_String(result.code), node.span);
|
| + var value = ConstMapValue.ConstMapValue$factory((immutableMap && immutableMap.is$Type()), (argValues && argValues.is$List$EvaluatedValue()), code, $assert_String(result.code), node.span);
|
| return world.gen.globalForConst(value, (argValues && argValues.is$List$Value()));
|
| }
|
| return new Value(mapImplType, code, node.span, true);
|
| @@ -12288,7 +12288,7 @@ MethodGenerator.prototype.visitConditionalExpression = function(node) {
|
| var trueBranch = this.visitValue(node.trueBranch);
|
| var falseBranch = this.visitValue(node.falseBranch);
|
| var code = ('' + test.code + ' ? ' + trueBranch.code + ' : ' + falseBranch.code + '');
|
| - return new Value(lang_Type.union((($0 = trueBranch.type) && $0.is$lang_Type()), (($0 = falseBranch.type) && $0.is$lang_Type())), code, node.span, true);
|
| + return new Value(Type.union((($0 = trueBranch.type) && $0.is$Type()), (($0 = falseBranch.type) && $0.is$Type())), code, node.span, true);
|
| }
|
| MethodGenerator.prototype.visitIsExpression = function(node) {
|
| var value = this.visitValue(node.x);
|
| @@ -12299,7 +12299,7 @@ MethodGenerator.prototype.visitParenExpression = function(node) {
|
| var $0;
|
| var body = this.visitValue(node.body);
|
| if ($notnull_bool(body.get$isConst())) {
|
| - return EvaluatedValue.EvaluatedValue$factory((($0 = body.type) && $0.is$lang_Type()), body.get$actualValue(), ('(' + body.get$canonicalCode() + ')'), node.span);
|
| + return EvaluatedValue.EvaluatedValue$factory((($0 = body.type) && $0.is$Type()), body.get$actualValue(), ('(' + body.get$canonicalCode() + ')'), node.span);
|
| }
|
| return new Value(body.type, ('(' + body.code + ')'), node.span, true);
|
| }
|
| @@ -12338,7 +12338,7 @@ MethodGenerator.prototype.visitLiteralExpression = function(node) {
|
| var $list = node.value;
|
| for (var $i = node.value.iterator$0(); $i.hasNext$0(); ) {
|
| var item = $i.next$0();
|
| - var val = this.visitValue((item && item.is$lang_Expression()));
|
| + var val = this.visitValue((item && item.is$Expression()));
|
| val.invoke$4(this, 'toString', item, Arguments.get$EMPTY());
|
| var code = val.code;
|
| if ((item instanceof BinaryExpression) || (item instanceof ConditionalExpression)) {
|
| @@ -12365,7 +12365,7 @@ MethodGenerator.prototype.visitLiteralExpression = function(node) {
|
| node.text = $assert_String(text);
|
| }
|
| }
|
| - return EvaluatedValue.EvaluatedValue$factory((type && type.is$lang_Type()), node.value, node.text, null);
|
| + return EvaluatedValue.EvaluatedValue$factory((type && type.is$Type()), node.value, node.text, null);
|
| }
|
| MethodGenerator.prototype.visitPostfixExpression$1 = function($0) {
|
| return this.visitPostfixExpression(($0 && $0.is$PostfixExpression()), false);
|
| @@ -12625,7 +12625,7 @@ Library.prototype.findTypeByName = function(name) {
|
| }
|
| }
|
| }
|
| - return (ret && ret.is$lang_Type());
|
| + return (ret && ret.is$Type());
|
| }
|
| Library.prototype.lookup = function(name, span) {
|
| var retType = this.findTypeByName(name);
|
| @@ -12734,7 +12734,7 @@ _LibraryVisitor.prototype.addSource = function(source) {
|
| return;
|
| }
|
| this.library.sources.add(source);
|
| - var parser = new lang_Parser(source, options.dietParse, false, false, 0);
|
| + var parser = new Parser(source, options.dietParse, false, false, 0);
|
| var unit = parser.compilationUnit();
|
| unit.forEach((function (def) {
|
| return def.visit$1($this);
|
| @@ -12950,13 +12950,13 @@ Parameter.prototype.get$isOptional = function() {
|
| return this.definition != null && this.definition.value != null;
|
| }
|
| Parameter.prototype.copyWithNewType$1 = function($0) {
|
| - return this.copyWithNewType(($0 && $0.is$lang_Type()));
|
| + return this.copyWithNewType(($0 && $0.is$Type()));
|
| };
|
| Parameter.prototype.genValue$2 = function($0, $1) {
|
| return this.genValue(($0 && $0.is$MethodMember()), ($1 && $1.is$MethodGenerator()));
|
| };
|
| Parameter.prototype.resolve$2 = function($0, $1) {
|
| - return this.resolve(($0 && $0.is$Member()), ($1 && $1.is$lang_Type()));
|
| + return this.resolve(($0 && $0.is$Member()), ($1 && $1.is$Type()));
|
| };
|
| // ********** Code for Member **************
|
| function Member(name, declaringType) {
|
| @@ -13036,7 +13036,7 @@ Member.prototype.get$inferredResult = function() {
|
| if ($notnull_bool(t.get$isBool()) && ($notnull_bool(this.get$library().get$isCore()) || $notnull_bool(this.get$library().get$isCoreImpl()))) {
|
| return world.nonNullBool;
|
| }
|
| - return (t && t.is$lang_Type());
|
| + return (t && t.is$Type());
|
| }
|
| Member.prototype.get$definition = function() {
|
| return null;
|
| @@ -13078,25 +13078,25 @@ Member.prototype.resolveType = function(node, isRequired) {
|
| if ($notnull_bool(this.get$isStatic()) && $notnull_bool(type.get$hasTypeParams())) {
|
| world.error('using type parameter in static context', node.span);
|
| }
|
| - return (type && type.is$lang_Type());
|
| + return (type && type.is$Type());
|
| }
|
| Member.prototype._get$3 = function($0, $1, $2) {
|
| - return this._get(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()));
|
| + return this._get(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()));
|
| };
|
| Member.prototype._set$4 = function($0, $1, $2, $3) {
|
| - return this._set(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Value()));
|
| + return this._set(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()), ($3 && $3.is$Value()));
|
| };
|
| Member.prototype.canInvoke$2 = function($0, $1) {
|
| return this.canInvoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Arguments()));
|
| };
|
| Member.prototype.invoke$4 = function($0, $1, $2, $3) {
|
| - return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), false);
|
| + return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), false);
|
| };
|
| Member.prototype.invoke$4$isDynamic = function($0, $1, $2, $3, isDynamic) {
|
| - return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool(isDynamic));
|
| + return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool(isDynamic));
|
| };
|
| Member.prototype.invoke$5 = function($0, $1, $2, $3, $4) {
|
| - return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool($4));
|
| + return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool($4));
|
| };
|
| Member.prototype.provideFieldSyntax$0 = function() {
|
| return this.provideFieldSyntax();
|
| @@ -13105,7 +13105,7 @@ Member.prototype.providePropertySyntax$0 = function() {
|
| return this.providePropertySyntax();
|
| };
|
| Member.prototype.resolve$1 = function($0) {
|
| - return this.resolve(($0 && $0.is$lang_Type()));
|
| + return this.resolve(($0 && $0.is$Type()));
|
| };
|
| // ********** Code for TypeMember **************
|
| function TypeMember(type) {
|
| @@ -13149,25 +13149,25 @@ TypeMember.prototype.invoke = function(context, node, target, args, isDynamic) {
|
| world.error('can not invoke type', node.span);
|
| }
|
| TypeMember.prototype._get$3 = function($0, $1, $2) {
|
| - return this._get(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), false);
|
| + return this._get(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()), false);
|
| };
|
| TypeMember.prototype._set$4 = function($0, $1, $2, $3) {
|
| - return this._set(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Value()), false);
|
| + return this._set(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()), ($3 && $3.is$Value()), false);
|
| };
|
| TypeMember.prototype.canInvoke$2 = function($0, $1) {
|
| return this.canInvoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Arguments()));
|
| };
|
| TypeMember.prototype.invoke$4 = function($0, $1, $2, $3) {
|
| - return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), false);
|
| + return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), false);
|
| };
|
| TypeMember.prototype.invoke$4$isDynamic = function($0, $1, $2, $3, isDynamic) {
|
| - return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool(isDynamic));
|
| + return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool(isDynamic));
|
| };
|
| TypeMember.prototype.invoke$5 = function($0, $1, $2, $3, $4) {
|
| - return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool($4));
|
| + return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool($4));
|
| };
|
| TypeMember.prototype.resolve$1 = function($0) {
|
| - return this.resolve(($0 && $0.is$lang_Type()));
|
| + return this.resolve(($0 && $0.is$Type()));
|
| };
|
| // ********** Code for FieldMember **************
|
| function FieldMember(name, declaringType, definition, value) {
|
| @@ -13324,10 +13324,10 @@ FieldMember.prototype._set = function(context, node, target, value, isDynamic) {
|
| return new Value(this.type, ('' + lhs.code + ' = ' + value.code + ''), node.span, true);
|
| }
|
| FieldMember.prototype._get$3 = function($0, $1, $2) {
|
| - return this._get(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), false);
|
| + return this._get(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()), false);
|
| };
|
| FieldMember.prototype._set$4 = function($0, $1, $2, $3) {
|
| - return this._set(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Value()), false);
|
| + return this._set(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()), ($3 && $3.is$Value()), false);
|
| };
|
| FieldMember.prototype.computeValue$0 = function() {
|
| return this.computeValue();
|
| @@ -13339,7 +13339,7 @@ FieldMember.prototype.providePropertySyntax$0 = function() {
|
| return this.providePropertySyntax();
|
| };
|
| FieldMember.prototype.resolve$1 = function($0) {
|
| - return this.resolve(($0 && $0.is$lang_Type()));
|
| + return this.resolve(($0 && $0.is$Type()));
|
| };
|
| // ********** Code for PropertyMember **************
|
| function PropertyMember(name, declaringType) {
|
| @@ -13429,10 +13429,10 @@ PropertyMember.prototype.resolve = function(inType) {
|
| this.get$library()._addMember(this);
|
| }
|
| PropertyMember.prototype._get$3 = function($0, $1, $2) {
|
| - return this._get(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), false);
|
| + return this._get(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()), false);
|
| };
|
| PropertyMember.prototype._set$4 = function($0, $1, $2, $3) {
|
| - return this._set(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Value()), false);
|
| + return this._set(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()), ($3 && $3.is$Value()), false);
|
| };
|
| PropertyMember.prototype.provideFieldSyntax$0 = function() {
|
| return this.provideFieldSyntax();
|
| @@ -13441,7 +13441,7 @@ PropertyMember.prototype.providePropertySyntax$0 = function() {
|
| return this.providePropertySyntax();
|
| };
|
| PropertyMember.prototype.resolve$1 = function($0) {
|
| - return this.resolve(($0 && $0.is$lang_Type()));
|
| + return this.resolve(($0 && $0.is$Type()));
|
| };
|
| // ********** Code for ConcreteMember **************
|
| function ConcreteMember(name, declaringType, baseMember) {
|
| @@ -13538,7 +13538,7 @@ ConcreteMember.prototype.set$initDelegate = function(ctor) {
|
| ConcreteMember.prototype.resolveType = function(node, isRequired) {
|
| var $0;
|
| var type = this.baseMember.resolveType(node, isRequired);
|
| - return (($0 = type.resolveTypeParams$1(this.declaringType)) && $0.is$lang_Type());
|
| + return (($0 = type.resolveTypeParams$1(this.declaringType)) && $0.is$Type());
|
| }
|
| ConcreteMember.prototype.override = function(other) {
|
| return this.baseMember.override(other);
|
| @@ -13563,22 +13563,22 @@ ConcreteMember.prototype.invoke = function(context, node, target, args, isDynami
|
| return new Value(this.get$inferredResult(), code, node.span, true);
|
| }
|
| ConcreteMember.prototype._get$3 = function($0, $1, $2) {
|
| - return this._get(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), false);
|
| + return this._get(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()), false);
|
| };
|
| ConcreteMember.prototype._set$4 = function($0, $1, $2, $3) {
|
| - return this._set(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Value()), false);
|
| + return this._set(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()), ($3 && $3.is$Value()), false);
|
| };
|
| ConcreteMember.prototype.canInvoke$2 = function($0, $1) {
|
| return this.canInvoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Arguments()));
|
| };
|
| ConcreteMember.prototype.invoke$4 = function($0, $1, $2, $3) {
|
| - return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), false);
|
| + return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), false);
|
| };
|
| ConcreteMember.prototype.invoke$4$isDynamic = function($0, $1, $2, $3, isDynamic) {
|
| - return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool(isDynamic));
|
| + return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool(isDynamic));
|
| };
|
| ConcreteMember.prototype.invoke$5 = function($0, $1, $2, $3, $4) {
|
| - return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool($4));
|
| + return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool($4));
|
| };
|
| ConcreteMember.prototype.provideFieldSyntax$0 = function() {
|
| return this.provideFieldSyntax();
|
| @@ -13898,7 +13898,7 @@ MethodMember.prototype._invokeConstructor = function(context, node, target, args
|
| }
|
| else {
|
| var code = (this.get$constructorName() != '') ? ('new ' + this.declaringType.get$jsname() + '.' + this.get$constructorName() + '\$ctor(' + argsString + ')') : ('new ' + this.declaringType.get$jsname() + '(' + argsString + ')');
|
| - if ($notnull_bool(this.isConst) && (node instanceof lang_NewExpression) && $notnull_bool(node.get$dynamic().get$isConst())) {
|
| + if ($notnull_bool(this.isConst) && (node instanceof NewExpression) && $notnull_bool(node.get$dynamic().get$isConst())) {
|
| return this._invokeConstConstructor(node, $assert_String(code), target, args);
|
| }
|
| else {
|
| @@ -14265,7 +14265,7 @@ MethodMember.prototype.resolve = function(inType) {
|
| }
|
| }
|
| MethodMember.prototype._get$3 = function($0, $1, $2) {
|
| - return this._get(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), false);
|
| + return this._get(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()), false);
|
| };
|
| MethodMember.prototype._set$4 = function($0, $1, $2, $3) {
|
| return this._set(($0 && $0.is$MethodGenerator()), $1, ($2 && $2.is$Value()), ($3 && $3.is$Value()), false);
|
| @@ -14274,13 +14274,13 @@ MethodMember.prototype.canInvoke$2 = function($0, $1) {
|
| return this.canInvoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Arguments()));
|
| };
|
| MethodMember.prototype.invoke$4 = function($0, $1, $2, $3) {
|
| - return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), false);
|
| + return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), false);
|
| };
|
| MethodMember.prototype.invoke$4$isDynamic = function($0, $1, $2, $3, isDynamic) {
|
| - return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool(isDynamic));
|
| + return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool(isDynamic));
|
| };
|
| MethodMember.prototype.invoke$5 = function($0, $1, $2, $3, $4) {
|
| - return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool($4));
|
| + return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool($4));
|
| };
|
| MethodMember.prototype.namesInOrder$1 = function($0) {
|
| return this.namesInOrder(($0 && $0.is$Arguments()));
|
| @@ -14292,7 +14292,7 @@ MethodMember.prototype.providePropertySyntax$0 = function() {
|
| return this.providePropertySyntax();
|
| };
|
| MethodMember.prototype.resolve$1 = function($0) {
|
| - return this.resolve(($0 && $0.is$lang_Type()));
|
| + return this.resolve(($0 && $0.is$Type()));
|
| };
|
| // ********** Code for MemberSet **************
|
| function MemberSet(member, isVar) {
|
| @@ -14425,25 +14425,24 @@ MemberSet.prototype._set = function(context, node, target, value, isDynamic) {
|
| return returnValue;
|
| }
|
| MemberSet.prototype.invoke = function(context, node, target, args, isDynamic) {
|
| - var $0;
|
| if ($notnull_bool(this.isVar) && !$notnull_bool(this.get$isOperator())) {
|
| return this.invokeOnVar(context, node, target, args);
|
| }
|
| if (this.members.length == 1) {
|
| - return (($0 = this.members.$index(0).invoke$5(context, node, target, args, isDynamic)) && $0.is$Value());
|
| + return this.members.$index(0).invoke$5(context, node, target, args, isDynamic);
|
| }
|
| var targets = this.members.filter((function (m) {
|
| return m.canInvoke$2(context, args);
|
| })
|
| );
|
| if (targets.length == 1) {
|
| - return (($0 = targets.$index(0).invoke$5(context, node, target, args, isDynamic)) && $0.is$Value());
|
| + return targets.$index(0).invoke$5(context, node, target, args, isDynamic);
|
| }
|
| var returnValue = null;
|
| for (var $i = targets.iterator$0(); $i.hasNext$0(); ) {
|
| var member = $i.next$0();
|
| var res = member.invoke$4$isDynamic(context, node, target, args, true);
|
| - returnValue = this._tryUnion(returnValue, (res && res.is$Value()), node);
|
| + returnValue = this._tryUnion(returnValue, res, node);
|
| }
|
| if (returnValue == null) {
|
| return this._makeError(node, target, 'method');
|
| @@ -14467,7 +14466,7 @@ MemberSet.prototype.invokeOnVar = function(context, node, target, args) {
|
| }
|
| MemberSet.prototype._tryUnion = function(x, y, node) {
|
| if (x == null) return y;
|
| - var type = lang_Type.union(x.type, y.type);
|
| + var type = Type.union(x.type, y.type);
|
| if (x.code == y.code) {
|
| if ($notnull_bool($eq(type, x.type))) {
|
| return x;
|
| @@ -14502,17 +14501,17 @@ MemberSet.prototype.getVarMember = function(context, node, args) {
|
| var returnType = reduce(map((targets && targets.is$Iterable()), (function (t) {
|
| return t.get$returnType();
|
| })
|
| - ), lang_Type.union);
|
| + ), Type.union);
|
| stub = new VarMethodSet($assert_String(stubName), targets, args, returnType);
|
| world.objectType.varStubs.$setindex(stubName, stub);
|
| }
|
| return (stub && stub.is$VarMember());
|
| }
|
| MemberSet.prototype._get$3 = function($0, $1, $2) {
|
| - return this._get(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), false);
|
| + return this._get(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()), false);
|
| };
|
| MemberSet.prototype._set$4 = function($0, $1, $2, $3) {
|
| - return this._set(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Value()), false);
|
| + return this._set(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()), ($3 && $3.is$Value()), false);
|
| };
|
| MemberSet.prototype.add$1 = function($0) {
|
| return this.add(($0 && $0.is$Member()));
|
| @@ -14521,13 +14520,13 @@ MemberSet.prototype.canInvoke$2 = function($0, $1) {
|
| return this.canInvoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Arguments()));
|
| };
|
| MemberSet.prototype.invoke$4 = function($0, $1, $2, $3) {
|
| - return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), false);
|
| + return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), false);
|
| };
|
| MemberSet.prototype.invoke$4$isDynamic = function($0, $1, $2, $3, isDynamic) {
|
| - return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool(isDynamic));
|
| + return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool(isDynamic));
|
| };
|
| MemberSet.prototype.invoke$5 = function($0, $1, $2, $3, $4) {
|
| - return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool($4));
|
| + return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()), $assert_bool($4));
|
| };
|
| MemberSet.prototype.toString$0 = function() {
|
| return this.toString();
|
| @@ -14564,19 +14563,19 @@ FactoryMap.prototype.forEach = function(f) {
|
| FactoryMap.prototype.getFactory$2 = function($0, $1) {
|
| return this.getFactory($assert_String($0), $assert_String($1));
|
| };
|
| -// ********** Code for lang_Token **************
|
| -function lang_Token(kind, source, start, end) {
|
| +// ********** Code for Token **************
|
| +function Token(kind, source, start, end) {
|
| this.kind = kind;
|
| this.source = source;
|
| this.start = start;
|
| this.end = end;
|
| // Initializers done
|
| }
|
| -lang_Token.prototype.get$source = function() { return this.source; };
|
| -lang_Token.prototype.get$text = function() {
|
| +Token.prototype.get$source = function() { return this.source; };
|
| +Token.prototype.get$text = function() {
|
| return this.source.get$text().substring(this.start, this.end);
|
| }
|
| -lang_Token.prototype.toString = function() {
|
| +Token.prototype.toString = function() {
|
| var kindText = TokenKind.kindToString(this.kind);
|
| var actualText = this.get$text();
|
| if ($notnull_bool($ne(kindText, actualText))) {
|
| @@ -14589,10 +14588,10 @@ lang_Token.prototype.toString = function() {
|
| return $assert_String(kindText);
|
| }
|
| }
|
| -lang_Token.prototype.get$span = function() {
|
| +Token.prototype.get$span = function() {
|
| return new SourceSpan(this.source, this.start, this.end);
|
| }
|
| -lang_Token.prototype.toString$0 = function() {
|
| +Token.prototype.toString$0 = function() {
|
| return this.toString();
|
| };
|
| // ********** Code for SourceFile **************
|
| @@ -14758,7 +14757,7 @@ TokenizerBase.prototype._maybeEatChar = function(ch) {
|
| }
|
| }
|
| TokenizerBase.prototype._finishToken = function(kind) {
|
| - return new lang_Token(kind, this._source, this._startIndex, this._lang_index);
|
| + return new Token(kind, this._source, this._startIndex, this._lang_index);
|
| }
|
| TokenizerBase.prototype._errorToken = function() {
|
| return this._finishToken(65/*TokenKind.ERROR*/);
|
| @@ -15019,7 +15018,7 @@ TokenizerBase.prototype.eatEscapeSequence = function() {
|
| return true;
|
|
|
| }
|
| - var n = lang_Parser.parseHex(hex);
|
| + var n = Parser.parseHex(hex);
|
| return n < 0xD800 || n > 0xDFFF && n <= 0x10FFFF;
|
| }
|
| TokenizerBase.prototype.finishDot = function() {
|
| @@ -16405,8 +16404,8 @@ TokenKind.kindFromAssign = function(kind) {
|
| }
|
| return -1;
|
| }
|
| -// ********** Code for lang_Parser **************
|
| -function lang_Parser(source, diet, throwOnIncomplete, optionalSemicolons, startOffset) {
|
| +// ********** Code for Parser **************
|
| +function Parser(source, diet, throwOnIncomplete, optionalSemicolons, startOffset) {
|
| this.source = source;
|
| this.diet = diet;
|
| this.throwOnIncomplete = throwOnIncomplete;
|
| @@ -16417,8 +16416,8 @@ function lang_Parser(source, diet, throwOnIncomplete, optionalSemicolons, startO
|
| this._previousToken = null;
|
| this._inInitializers = false;
|
| }
|
| -lang_Parser.prototype.get$source = function() { return this.source; };
|
| -lang_Parser.prototype.isPrematureEndOfFile = function() {
|
| +Parser.prototype.get$source = function() { return this.source; };
|
| +Parser.prototype.isPrematureEndOfFile = function() {
|
| if ($notnull_bool(this.throwOnIncomplete) && $notnull_bool(this._maybeEat(1/*TokenKind.END_OF_FILE*/)) || $notnull_bool(this._maybeEat(68/*TokenKind.INCOMPLETE_MULTILINE_STRING_DQ*/)) || $notnull_bool(this._maybeEat(69/*TokenKind.INCOMPLETE_MULTILINE_STRING_SQ*/))) {
|
| $throw(new IncompleteSourceException(this._previousToken));
|
| }
|
| @@ -16430,21 +16429,21 @@ lang_Parser.prototype.isPrematureEndOfFile = function() {
|
| return false;
|
| }
|
| }
|
| -lang_Parser.prototype._peek = function() {
|
| +Parser.prototype._peek = function() {
|
| return this._peekToken.kind;
|
| }
|
| -lang_Parser.prototype._lang_next = function() {
|
| +Parser.prototype._lang_next = function() {
|
| this._previousToken = this._peekToken;
|
| this._peekToken = this.tokenizer.next();
|
| return this._previousToken;
|
| }
|
| -lang_Parser.prototype._peekKind = function(kind) {
|
| +Parser.prototype._peekKind = function(kind) {
|
| return this._peekToken.kind == kind;
|
| }
|
| -lang_Parser.prototype._peekIdentifier = function() {
|
| +Parser.prototype._peekIdentifier = function() {
|
| return TokenKind.isIdentifier(this._peekToken.kind);
|
| }
|
| -lang_Parser.prototype._maybeEat = function(kind) {
|
| +Parser.prototype._maybeEat = function(kind) {
|
| if (this._peekToken.kind == kind) {
|
| this._previousToken = this._peekToken;
|
| this._peekToken = this.tokenizer.next();
|
| @@ -16454,28 +16453,28 @@ lang_Parser.prototype._maybeEat = function(kind) {
|
| return false;
|
| }
|
| }
|
| -lang_Parser.prototype._eat = function(kind) {
|
| +Parser.prototype._eat = function(kind) {
|
| if (!$notnull_bool(this._maybeEat(kind))) {
|
| this._errorExpected(TokenKind.kindToString(kind));
|
| }
|
| }
|
| -lang_Parser.prototype._eatSemicolon = function() {
|
| +Parser.prototype._eatSemicolon = function() {
|
| if ($notnull_bool(this.optionalSemicolons) && $notnull_bool(this._peekKind(1/*TokenKind.END_OF_FILE*/))) return;
|
| this._eat(10/*TokenKind.SEMICOLON*/);
|
| }
|
| -lang_Parser.prototype._errorExpected = function(expected) {
|
| +Parser.prototype._errorExpected = function(expected) {
|
| if ($notnull_bool(this.throwOnIncomplete)) this.isPrematureEndOfFile();
|
| var tok = this._lang_next();
|
| var message = ('expected ' + expected + ', but found ' + tok + '');
|
| this._lang_error($assert_String(message), tok.get$span());
|
| }
|
| -lang_Parser.prototype._lang_error = function(message, location) {
|
| +Parser.prototype._lang_error = function(message, location) {
|
| if (location == null) {
|
| location = this._peekToken.get$span();
|
| }
|
| world.fatal(message, location);
|
| }
|
| -lang_Parser.prototype._skipBlock = function() {
|
| +Parser.prototype._skipBlock = function() {
|
| var depth = 1;
|
| this._eat(6/*TokenKind.LBRACE*/);
|
| while (true) {
|
| @@ -16493,10 +16492,10 @@ lang_Parser.prototype._skipBlock = function() {
|
| }
|
| }
|
| }
|
| -lang_Parser.prototype._makeSpan = function(start) {
|
| +Parser.prototype._makeSpan = function(start) {
|
| return new SourceSpan(this.source, start, this._previousToken.end);
|
| }
|
| -lang_Parser.prototype.compilationUnit = function() {
|
| +Parser.prototype.compilationUnit = function() {
|
| var ret = [];
|
| this._maybeEat(13/*TokenKind.HASHBANG*/);
|
| while ($notnull_bool(this._peekKind(12/*TokenKind.HASH*/))) {
|
| @@ -16507,7 +16506,7 @@ lang_Parser.prototype.compilationUnit = function() {
|
| }
|
| return (ret && ret.is$List$Definition());
|
| }
|
| -lang_Parser.prototype.directive = function() {
|
| +Parser.prototype.directive = function() {
|
| var start = this._peekToken.start;
|
| this._eat(12/*TokenKind.HASH*/);
|
| var name = this.identifier();
|
| @@ -16515,7 +16514,7 @@ lang_Parser.prototype.directive = function() {
|
| this._eatSemicolon();
|
| return new DirectiveDefinition(name, args, this._makeSpan(start));
|
| }
|
| -lang_Parser.prototype.topLevelDefinition = function() {
|
| +Parser.prototype.topLevelDefinition = function() {
|
| switch (this._peek()) {
|
| case 73/*TokenKind.CLASS*/:
|
|
|
| @@ -16535,7 +16534,7 @@ lang_Parser.prototype.topLevelDefinition = function() {
|
|
|
| }
|
| }
|
| -lang_Parser.prototype.classDefinition = function(kind) {
|
| +Parser.prototype.classDefinition = function(kind) {
|
| var start = this._peekToken.start;
|
| this._eat(kind);
|
| var name = this.identifier();
|
| @@ -16571,7 +16570,7 @@ lang_Parser.prototype.classDefinition = function(kind) {
|
| }
|
| return new TypeDefinition(kind == 73/*TokenKind.CLASS*/, name, typeParams, _extends, _implements, _native, _factory, body, this._makeSpan(start));
|
| }
|
| -lang_Parser.prototype.functionTypeAlias = function() {
|
| +Parser.prototype.functionTypeAlias = function() {
|
| var start = this._peekToken.start;
|
| this._eat(87/*TokenKind.TYPEDEF*/);
|
| var di = this.declaredIdentifier(false);
|
| @@ -16584,7 +16583,7 @@ lang_Parser.prototype.functionTypeAlias = function() {
|
| var func = new FunctionDefinition(null, di.type, di.get$name(), formals, null, null, this._makeSpan(start));
|
| return new FunctionTypeDefinition(func, typeParams, this._makeSpan(start));
|
| }
|
| -lang_Parser.prototype.initializers = function() {
|
| +Parser.prototype.initializers = function() {
|
| this._inInitializers = true;
|
| var ret = [];
|
| do {
|
| @@ -16594,7 +16593,7 @@ lang_Parser.prototype.initializers = function() {
|
| this._inInitializers = false;
|
| return ret;
|
| }
|
| -lang_Parser.prototype.functionBody = function(inExpression) {
|
| +Parser.prototype.functionBody = function(inExpression) {
|
| var start = this._peekToken.start;
|
| if ($notnull_bool(this._maybeEat(9/*TokenKind.ARROW*/))) {
|
| var expr = this.expression();
|
| @@ -16629,7 +16628,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) {
|
| +Parser.prototype.finishField = function(start, modifiers, type, name, value) {
|
| var names = [name];
|
| var values = [value];
|
| while ($notnull_bool(this._maybeEat(11/*TokenKind.COMMA*/))) {
|
| @@ -16644,7 +16643,7 @@ lang_Parser.prototype.finishField = function(start, modifiers, type, name, value
|
| this._eatSemicolon();
|
| return new VariableDefinition(modifiers, type, names, values, this._makeSpan($assert_num(start)));
|
| }
|
| -lang_Parser.prototype.finishDefinition = function(start, modifiers, di) {
|
| +Parser.prototype.finishDefinition = function(start, modifiers, di) {
|
| var $0;
|
| switch (this._peek()) {
|
| case 2/*TokenKind.LPAREN*/:
|
| @@ -16678,7 +16677,7 @@ lang_Parser.prototype.finishDefinition = function(start, modifiers, di) {
|
|
|
| }
|
| }
|
| -lang_Parser.prototype.declaration = function(includeOperators) {
|
| +Parser.prototype.declaration = function(includeOperators) {
|
| var start = this._peekToken.start;
|
| if ($notnull_bool(this._peekKind(75/*TokenKind.FACTORY*/))) {
|
| return this.factoryConstructorDeclaration();
|
| @@ -16686,7 +16685,7 @@ lang_Parser.prototype.declaration = function(includeOperators) {
|
| var modifiers = this._readModifiers();
|
| return this.finishDefinition(start, modifiers, this.declaredIdentifier(includeOperators));
|
| }
|
| -lang_Parser.prototype.factoryConstructorDeclaration = function() {
|
| +Parser.prototype.factoryConstructorDeclaration = function() {
|
| var start = this._peekToken.start;
|
| var factoryToken = this._lang_next();
|
| var names = [this.identifier()];
|
| @@ -16707,11 +16706,11 @@ lang_Parser.prototype.factoryConstructorDeclaration = function() {
|
| name = names.removeLast$0();
|
| }
|
| else {
|
| - name = new lang_Identifier('', names.$index(0).get$span());
|
| + name = new Identifier('', names.$index(0).get$span());
|
| }
|
| }
|
| else {
|
| - name = new lang_Identifier('', names.$index(0).get$span());
|
| + name = new Identifier('', names.$index(0).get$span());
|
| }
|
| if (names.length > 1) {
|
| this._lang_error('unsupported qualified name for factory', names.$index(0).get$span());
|
| @@ -16720,28 +16719,28 @@ lang_Parser.prototype.factoryConstructorDeclaration = function() {
|
| var di = new DeclaredIdentifier(type, name, this._makeSpan(start));
|
| return this.finishDefinition(start, [factoryToken], di);
|
| }
|
| -lang_Parser.prototype.statement = function() {
|
| +Parser.prototype.statement = function() {
|
| var $0;
|
| switch (this._peek()) {
|
| case 88/*TokenKind.BREAK*/:
|
|
|
| - return (($0 = this.breakStatement()) && $0.is$lang_Statement());
|
| + return (($0 = this.breakStatement()) && $0.is$Statement());
|
|
|
| case 92/*TokenKind.CONTINUE*/:
|
|
|
| - return (($0 = this.continueStatement()) && $0.is$lang_Statement());
|
| + return (($0 = this.continueStatement()) && $0.is$Statement());
|
|
|
| case 105/*TokenKind.RETURN*/:
|
|
|
| - return (($0 = this.returnStatement()) && $0.is$lang_Statement());
|
| + return (($0 = this.returnStatement()) && $0.is$Statement());
|
|
|
| case 109/*TokenKind.THROW*/:
|
|
|
| - return (($0 = this.throwStatement()) && $0.is$lang_Statement());
|
| + return (($0 = this.throwStatement()) && $0.is$Statement());
|
|
|
| case 72/*TokenKind.ASSERT*/:
|
|
|
| - return (($0 = this.assertStatement()) && $0.is$lang_Statement());
|
| + return (($0 = this.assertStatement()) && $0.is$Statement());
|
|
|
| case 114/*TokenKind.WHILE*/:
|
|
|
| @@ -16753,7 +16752,7 @@ lang_Parser.prototype.statement = function() {
|
|
|
| case 99/*TokenKind.FOR*/:
|
|
|
| - return (($0 = this.forStatement()) && $0.is$lang_Statement());
|
| + return (($0 = this.forStatement()) && $0.is$Statement());
|
|
|
| case 100/*TokenKind.IF*/:
|
|
|
| @@ -16761,11 +16760,11 @@ lang_Parser.prototype.statement = function() {
|
|
|
| case 107/*TokenKind.SWITCH*/:
|
|
|
| - return (($0 = this.switchStatement()) && $0.is$lang_Statement());
|
| + return (($0 = this.switchStatement()) && $0.is$Statement());
|
|
|
| case 111/*TokenKind.TRY*/:
|
|
|
| - return (($0 = this.tryStatement()) && $0.is$lang_Statement());
|
| + return (($0 = this.tryStatement()) && $0.is$Statement());
|
|
|
| case 6/*TokenKind.LBRACE*/:
|
|
|
| @@ -16777,19 +16776,19 @@ lang_Parser.prototype.statement = function() {
|
|
|
| case 97/*TokenKind.FINAL*/:
|
|
|
| - return (($0 = this.declaration(false)) && $0.is$lang_Statement());
|
| + return (($0 = this.declaration(false)) && $0.is$Statement());
|
|
|
| case 112/*TokenKind.VAR*/:
|
|
|
| - return (($0 = this.declaration(false)) && $0.is$lang_Statement());
|
| + return (($0 = this.declaration(false)) && $0.is$Statement());
|
|
|
| default:
|
|
|
| - return (($0 = this.finishExpressionAsStatement(this.expression())) && $0.is$lang_Statement());
|
| + return (($0 = this.finishExpressionAsStatement(this.expression())) && $0.is$Statement());
|
|
|
| }
|
| }
|
| -lang_Parser.prototype.finishExpressionAsStatement = function(expr) {
|
| +Parser.prototype.finishExpressionAsStatement = function(expr) {
|
| var $0;
|
| var start = expr.get$span().start;
|
| if ($notnull_bool(this._maybeEat(8/*TokenKind.COLON*/))) {
|
| @@ -16827,16 +16826,16 @@ lang_Parser.prototype.finishExpressionAsStatement = function(expr) {
|
| }
|
| else {
|
| this._eatSemicolon();
|
| - return new lang_ExpressionStatement(expr, this._makeSpan(expr.get$span().start));
|
| + return new ExpressionStatement(expr, this._makeSpan(expr.get$span().start));
|
| }
|
| }
|
| -lang_Parser.prototype.testCondition = function() {
|
| +Parser.prototype.testCondition = function() {
|
| this._eat(2/*TokenKind.LPAREN*/);
|
| var ret = this.expression();
|
| this._eat(3/*TokenKind.RPAREN*/);
|
| - return (ret && ret.is$lang_Expression());
|
| + return (ret && ret.is$Expression());
|
| }
|
| -lang_Parser.prototype.block = function() {
|
| +Parser.prototype.block = function() {
|
| var start = this._peekToken.start;
|
| this._eat(6/*TokenKind.LBRACE*/);
|
| var stmts = [];
|
| @@ -16846,12 +16845,12 @@ lang_Parser.prototype.block = function() {
|
| }
|
| return new BlockStatement(stmts, this._makeSpan(start));
|
| }
|
| -lang_Parser.prototype.emptyStatement = function() {
|
| +Parser.prototype.emptyStatement = function() {
|
| var start = this._peekToken.start;
|
| this._eat(10/*TokenKind.SEMICOLON*/);
|
| return new EmptyStatement(this._makeSpan(start));
|
| }
|
| -lang_Parser.prototype.ifStatement = function() {
|
| +Parser.prototype.ifStatement = function() {
|
| var start = this._peekToken.start;
|
| this._eat(100/*TokenKind.IF*/);
|
| var test = this.testCondition();
|
| @@ -16862,14 +16861,14 @@ lang_Parser.prototype.ifStatement = function() {
|
| }
|
| return new IfStatement(test, trueBranch, falseBranch, this._makeSpan(start));
|
| }
|
| -lang_Parser.prototype.whileStatement = function() {
|
| +Parser.prototype.whileStatement = function() {
|
| var start = this._peekToken.start;
|
| this._eat(114/*TokenKind.WHILE*/);
|
| var test = this.testCondition();
|
| var body = this.statement();
|
| return new WhileStatement(test, body, this._makeSpan(start));
|
| }
|
| -lang_Parser.prototype.doStatement = function() {
|
| +Parser.prototype.doStatement = function() {
|
| var start = this._peekToken.start;
|
| this._eat(94/*TokenKind.DO*/);
|
| var body = this.statement();
|
| @@ -16878,7 +16877,7 @@ lang_Parser.prototype.doStatement = function() {
|
| this._eatSemicolon();
|
| return new DoStatement(body, test, this._makeSpan(start));
|
| }
|
| -lang_Parser.prototype.forStatement = function() {
|
| +Parser.prototype.forStatement = function() {
|
| var start = this._peekToken.start;
|
| this._eat(99/*TokenKind.FOR*/);
|
| this._eat(2/*TokenKind.LPAREN*/);
|
| @@ -16902,7 +16901,7 @@ lang_Parser.prototype.forStatement = function() {
|
| var body = this.statement();
|
| return new ForStatement(init, test, step, body, this._makeSpan(start));
|
| }
|
| -lang_Parser.prototype.forInitializerStatement = function(start) {
|
| +Parser.prototype.forInitializerStatement = function(start) {
|
| var $0;
|
| if ($notnull_bool(this._maybeEat(10/*TokenKind.SEMICOLON*/))) {
|
| return null;
|
| @@ -16925,13 +16924,13 @@ lang_Parser.prototype.forInitializerStatement = function(start) {
|
| }
|
| }
|
| }
|
| -lang_Parser.prototype._finishForIn = function(start, di) {
|
| +Parser.prototype._finishForIn = function(start, di) {
|
| var expr = this.expression();
|
| this._eat(3/*TokenKind.RPAREN*/);
|
| var body = this.statement();
|
| return new ForInStatement(di, expr, body, this._makeSpan(start));
|
| }
|
| -lang_Parser.prototype.tryStatement = function() {
|
| +Parser.prototype.tryStatement = function() {
|
| var start = this._peekToken.start;
|
| this._eat(111/*TokenKind.TRY*/);
|
| var body = this.block();
|
| @@ -16945,7 +16944,7 @@ lang_Parser.prototype.tryStatement = function() {
|
| }
|
| return new TryStatement(body, catches, finallyBlock, this._makeSpan(start));
|
| }
|
| -lang_Parser.prototype.catchNode = function() {
|
| +Parser.prototype.catchNode = function() {
|
| var start = this._peekToken.start;
|
| this._eat(90/*TokenKind.CATCH*/);
|
| this._eat(2/*TokenKind.LPAREN*/);
|
| @@ -16958,7 +16957,7 @@ lang_Parser.prototype.catchNode = function() {
|
| var body = this.block();
|
| return new CatchNode(exc, trace, body, this._makeSpan(start));
|
| }
|
| -lang_Parser.prototype.switchStatement = function() {
|
| +Parser.prototype.switchStatement = function() {
|
| var start = this._peekToken.start;
|
| this._eat(107/*TokenKind.SWITCH*/);
|
| var test = this.testCondition();
|
| @@ -16969,11 +16968,11 @@ lang_Parser.prototype.switchStatement = function() {
|
| }
|
| return new SwitchStatement(test, cases, this._makeSpan(start));
|
| }
|
| -lang_Parser.prototype._peekCaseEnd = function() {
|
| +Parser.prototype._peekCaseEnd = function() {
|
| var kind = this._peek();
|
| return $notnull_bool($eq(kind, 7/*TokenKind.RBRACE*/)) || $notnull_bool($eq(kind, 89/*TokenKind.CASE*/)) || $notnull_bool($eq(kind, 93/*TokenKind.DEFAULT*/));
|
| }
|
| -lang_Parser.prototype.caseNode = function() {
|
| +Parser.prototype.caseNode = function() {
|
| var start = this._peekToken.start;
|
| var label = null;
|
| if ($notnull_bool(this._peekIdentifier())) {
|
| @@ -17004,7 +17003,7 @@ lang_Parser.prototype.caseNode = function() {
|
| }
|
| return new CaseNode(label, cases, stmts, this._makeSpan(start));
|
| }
|
| -lang_Parser.prototype.returnStatement = function() {
|
| +Parser.prototype.returnStatement = function() {
|
| var start = this._peekToken.start;
|
| this._eat(105/*TokenKind.RETURN*/);
|
| var expr;
|
| @@ -17017,7 +17016,7 @@ lang_Parser.prototype.returnStatement = function() {
|
| }
|
| return new ReturnStatement(expr, this._makeSpan(start));
|
| }
|
| -lang_Parser.prototype.throwStatement = function() {
|
| +Parser.prototype.throwStatement = function() {
|
| var start = this._peekToken.start;
|
| this._eat(109/*TokenKind.THROW*/);
|
| var expr;
|
| @@ -17030,7 +17029,7 @@ lang_Parser.prototype.throwStatement = function() {
|
| }
|
| return new ThrowStatement(expr, this._makeSpan(start));
|
| }
|
| -lang_Parser.prototype.assertStatement = function() {
|
| +Parser.prototype.assertStatement = function() {
|
| var start = this._peekToken.start;
|
| this._eat(72/*TokenKind.ASSERT*/);
|
| this._eat(2/*TokenKind.LPAREN*/);
|
| @@ -17039,7 +17038,7 @@ lang_Parser.prototype.assertStatement = function() {
|
| this._eatSemicolon();
|
| return new AssertStatement(expr, this._makeSpan(start));
|
| }
|
| -lang_Parser.prototype.breakStatement = function() {
|
| +Parser.prototype.breakStatement = function() {
|
| var start = this._peekToken.start;
|
| this._eat(88/*TokenKind.BREAK*/);
|
| var name = null;
|
| @@ -17049,7 +17048,7 @@ lang_Parser.prototype.breakStatement = function() {
|
| this._eatSemicolon();
|
| return new BreakStatement(name, this._makeSpan(start));
|
| }
|
| -lang_Parser.prototype.continueStatement = function() {
|
| +Parser.prototype.continueStatement = function() {
|
| var start = this._peekToken.start;
|
| this._eat(92/*TokenKind.CONTINUE*/);
|
| var name = null;
|
| @@ -17059,10 +17058,10 @@ lang_Parser.prototype.continueStatement = function() {
|
| this._eatSemicolon();
|
| return new ContinueStatement(name, this._makeSpan(start));
|
| }
|
| -lang_Parser.prototype.expression = function() {
|
| +Parser.prototype.expression = function() {
|
| return this.infixExpression(0);
|
| }
|
| -lang_Parser.prototype._makeType = function(expr) {
|
| +Parser.prototype._makeType = function(expr) {
|
| if ((expr instanceof VarExpression)) {
|
| return new NameTypeReference(false, expr.get$name(), null, expr.get$span());
|
| }
|
| @@ -17082,15 +17081,15 @@ lang_Parser.prototype._makeType = function(expr) {
|
| return null;
|
| }
|
| }
|
| -lang_Parser.prototype.infixExpression = function(precedence) {
|
| +Parser.prototype.infixExpression = function(precedence) {
|
| var $0;
|
| - return this.finishInfixExpression((($0 = this.unaryExpression()) && $0.is$lang_Expression()), precedence);
|
| + return this.finishInfixExpression((($0 = this.unaryExpression()) && $0.is$Expression()), precedence);
|
| }
|
| -lang_Parser.prototype._finishDeclaredId = function(type) {
|
| +Parser.prototype._finishDeclaredId = function(type) {
|
| var name = this.identifier();
|
| return this.finishPostfixExpression(new DeclaredIdentifier(type, name, this._makeSpan(type.get$span().start)));
|
| }
|
| -lang_Parser.prototype._fixAsType = function(x) {
|
| +Parser.prototype._fixAsType = function(x) {
|
| $assert(this._isBin(x, 52/*TokenKind.LT*/), "_isBin(x, TokenKind.LT)", "parser.dart", 790, 12);
|
| if ($notnull_bool(this._maybeEat(53/*TokenKind.GT*/))) {
|
| var base = this._makeType(x.x);
|
| @@ -17117,7 +17116,7 @@ lang_Parser.prototype._fixAsType = function(x) {
|
| return this._finishDeclaredId(type);
|
| }
|
| }
|
| -lang_Parser.prototype.finishInfixExpression = function(x, precedence) {
|
| +Parser.prototype.finishInfixExpression = function(x, precedence) {
|
| while (true) {
|
| var kind = this._peek();
|
| var prec = TokenKind.infixPrecedence(this._peek());
|
| @@ -17150,7 +17149,7 @@ lang_Parser.prototype.finishInfixExpression = function(x, precedence) {
|
| }
|
| return x;
|
| }
|
| -lang_Parser.prototype._isPrefixUnaryOperator = function(kind) {
|
| +Parser.prototype._isPrefixUnaryOperator = function(kind) {
|
| switch (kind) {
|
| case 42/*TokenKind.ADD*/:
|
| case 43/*TokenKind.SUB*/:
|
| @@ -17167,7 +17166,7 @@ lang_Parser.prototype._isPrefixUnaryOperator = function(kind) {
|
|
|
| }
|
| }
|
| -lang_Parser.prototype.unaryExpression = function() {
|
| +Parser.prototype.unaryExpression = function() {
|
| var start = this._peekToken.start;
|
| if ($notnull_bool(this._isPrefixUnaryOperator(this._peek()))) {
|
| var tok = this._lang_next();
|
| @@ -17176,12 +17175,12 @@ lang_Parser.prototype.unaryExpression = function() {
|
| }
|
| return this.finishPostfixExpression(this.primary());
|
| }
|
| -lang_Parser.prototype.argument = function() {
|
| +Parser.prototype.argument = function() {
|
| var start = this._peekToken.start;
|
| var expr;
|
| var label = null;
|
| if ($notnull_bool(this._maybeEat(15/*TokenKind.ELLIPSIS*/))) {
|
| - label = new lang_Identifier('...', this._makeSpan(start));
|
| + label = new Identifier('...', this._makeSpan(start));
|
| }
|
| expr = this.expression();
|
| if (label == null && $notnull_bool(this._maybeEat(8/*TokenKind.COLON*/))) {
|
| @@ -17190,7 +17189,7 @@ lang_Parser.prototype.argument = function() {
|
| }
|
| return new ArgumentNode(label, expr, this._makeSpan(start));
|
| }
|
| -lang_Parser.prototype.arguments = function() {
|
| +Parser.prototype.arguments = function() {
|
| var args = [];
|
| this._eat(2/*TokenKind.LPAREN*/);
|
| if (!$notnull_bool(this._maybeEat(3/*TokenKind.RPAREN*/))) {
|
| @@ -17202,10 +17201,10 @@ lang_Parser.prototype.arguments = function() {
|
| }
|
| return args;
|
| }
|
| -lang_Parser.prototype.get$arguments = function() {
|
| - return lang_Parser.prototype.arguments.bind(this);
|
| +Parser.prototype.get$arguments = function() {
|
| + return Parser.prototype.arguments.bind(this);
|
| }
|
| -lang_Parser.prototype.finishPostfixExpression = function(expr) {
|
| +Parser.prototype.finishPostfixExpression = function(expr) {
|
| switch (this._peek()) {
|
| case 2/*TokenKind.LPAREN*/:
|
|
|
| @@ -17249,22 +17248,22 @@ lang_Parser.prototype.finishPostfixExpression = function(expr) {
|
|
|
| }
|
| }
|
| -lang_Parser.prototype._isBin = function(expr, kind) {
|
| +Parser.prototype._isBin = function(expr, kind) {
|
| return (expr instanceof BinaryExpression) && expr.op.kind == kind;
|
| }
|
| -lang_Parser.prototype._boolTypeRef = function(span) {
|
| +Parser.prototype._boolTypeRef = function(span) {
|
| return new TypeReference(span, world.nonNullBool);
|
| }
|
| -lang_Parser.prototype._intTypeRef = function(span) {
|
| +Parser.prototype._intTypeRef = function(span) {
|
| return new TypeReference(span, world.intType);
|
| }
|
| -lang_Parser.prototype._doubleTypeRef = function(span) {
|
| +Parser.prototype._doubleTypeRef = function(span) {
|
| return new TypeReference(span, world.doubleType);
|
| }
|
| -lang_Parser.prototype._stringTypeRef = function(span) {
|
| +Parser.prototype._stringTypeRef = function(span) {
|
| return new TypeReference(span, world.stringType);
|
| }
|
| -lang_Parser.prototype.primary = function() {
|
| +Parser.prototype.primary = function() {
|
| var start = this._peekToken.start;
|
| switch (this._peek()) {
|
| case 108/*TokenKind.THIS*/:
|
| @@ -17329,7 +17328,7 @@ lang_Parser.prototype.primary = function() {
|
| case 61/*TokenKind.HEX_INTEGER*/:
|
|
|
| var t = this._lang_next();
|
| - return new LiteralExpression(lang_Parser.parseHex(t.get$text().substring(2)), this._intTypeRef(this._makeSpan(start)), t.get$text(), this._makeSpan(start));
|
| + return new LiteralExpression(Parser.parseHex(t.get$text().substring(2)), this._intTypeRef(this._makeSpan(start)), t.get$text(), this._makeSpan(start));
|
|
|
| case 60/*TokenKind.INTEGER*/:
|
|
|
| @@ -17368,7 +17367,7 @@ lang_Parser.prototype.primary = function() {
|
|
|
| }
|
| }
|
| -lang_Parser.prototype.stringInterpolation = function() {
|
| +Parser.prototype.stringInterpolation = function() {
|
| var start = this._peekToken.start;
|
| var lits = [];
|
| var startQuote = null, endQuote = null;
|
| @@ -17410,14 +17409,14 @@ lang_Parser.prototype.stringInterpolation = function() {
|
| var span = this._makeSpan(start);
|
| return new LiteralExpression(lits, this._stringTypeRef((span && span.is$SourceSpan())), '\$\$\$', (span && span.is$SourceSpan()));
|
| }
|
| -lang_Parser.prototype.makeStringLiteral = function(text, span) {
|
| +Parser.prototype.makeStringLiteral = function(text, span) {
|
| return new LiteralExpression(text, this._stringTypeRef(span), text, span);
|
| }
|
| -lang_Parser.prototype.stringLiteralExpr = function() {
|
| +Parser.prototype.stringLiteralExpr = function() {
|
| var token = this._lang_next();
|
| return this.makeStringLiteral(token.get$text(), token.get$span());
|
| }
|
| -lang_Parser.prototype.maybeStringLiteral = function() {
|
| +Parser.prototype.maybeStringLiteral = function() {
|
| var kind = this._peek();
|
| if ($notnull_bool($eq(kind, 58/*TokenKind.STRING*/))) {
|
| return parseStringLiteral(this._lang_next().get$text());
|
| @@ -17432,7 +17431,7 @@ lang_Parser.prototype.maybeStringLiteral = function() {
|
| }
|
| return null;
|
| }
|
| -lang_Parser.prototype._parenOrLambda = function() {
|
| +Parser.prototype._parenOrLambda = function() {
|
| var start = this._peekToken.start;
|
| var args = this.arguments();
|
| if (!$notnull_bool(this._inInitializers) && ($notnull_bool(this._peekKind(9/*TokenKind.ARROW*/)) || $notnull_bool(this._peekKind(6/*TokenKind.LBRACE*/)))) {
|
| @@ -17451,10 +17450,10 @@ lang_Parser.prototype._parenOrLambda = function() {
|
| }
|
| }
|
| }
|
| -lang_Parser.prototype._typeAsIdentifier = function(type) {
|
| +Parser.prototype._typeAsIdentifier = function(type) {
|
| return type.get$name();
|
| }
|
| -lang_Parser.prototype._specialIdentifier = function(includeOperators) {
|
| +Parser.prototype._specialIdentifier = function(includeOperators) {
|
| var start = this._peekToken.start;
|
| var name;
|
| switch (this._peek()) {
|
| @@ -17521,9 +17520,9 @@ lang_Parser.prototype._specialIdentifier = function(includeOperators) {
|
| return null;
|
|
|
| }
|
| - return new lang_Identifier(name, this._makeSpan(start));
|
| + return new Identifier(name, this._makeSpan(start));
|
| }
|
| -lang_Parser.prototype.declaredIdentifier = function(includeOperators) {
|
| +Parser.prototype.declaredIdentifier = function(includeOperators) {
|
| var start = this._peekToken.start;
|
| var myType = null;
|
| var name = this._specialIdentifier(includeOperators);
|
| @@ -17544,7 +17543,7 @@ lang_Parser.prototype.declaredIdentifier = function(includeOperators) {
|
| }
|
| return new DeclaredIdentifier(myType, name, this._makeSpan(start));
|
| }
|
| -lang_Parser._hexDigit = function(c) {
|
| +Parser._hexDigit = function(c) {
|
| if (c >= 48 && c <= 57) {
|
| return c - 48;
|
| }
|
| @@ -17558,26 +17557,26 @@ lang_Parser._hexDigit = function(c) {
|
| return -1;
|
| }
|
| }
|
| -lang_Parser.parseHex = function(hex) {
|
| +Parser.parseHex = function(hex) {
|
| var result = 0;
|
| for (var i = 0;
|
| i < hex.length; i++) {
|
| - var digit = lang_Parser._hexDigit(hex.charCodeAt(i));
|
| + var digit = Parser._hexDigit(hex.charCodeAt(i));
|
| $assert($ne(digit, -1), "digit != -1", "parser.dart", 1261, 14);
|
| result = (result << 4) + $assert_num(digit);
|
| }
|
| return $assert_num(result);
|
| }
|
| -lang_Parser.prototype.finishNewExpression = function(start, isConst) {
|
| +Parser.prototype.finishNewExpression = function(start, isConst) {
|
| var type = this.type(0);
|
| var name = null;
|
| if ($notnull_bool(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 NewExpression(isConst, type, name, args, this._makeSpan(start));
|
| }
|
| -lang_Parser.prototype.finishListLiteral = function(start, isConst, type) {
|
| +Parser.prototype.finishListLiteral = function(start, isConst, type) {
|
| if ($notnull_bool(this._maybeEat(56/*TokenKind.INDEX*/))) {
|
| return new ListExpression(isConst, type, [], this._makeSpan(start));
|
| }
|
| @@ -17593,7 +17592,7 @@ lang_Parser.prototype.finishListLiteral = function(start, isConst, type) {
|
| }
|
| return new ListExpression(isConst, type, values, this._makeSpan(start));
|
| }
|
| -lang_Parser.prototype.finishMapLiteral = function(start, isConst, type) {
|
| +Parser.prototype.finishMapLiteral = function(start, isConst, type) {
|
| var items = [];
|
| this._eat(6/*TokenKind.LBRACE*/);
|
| while (!$notnull_bool(this._maybeEat(7/*TokenKind.RBRACE*/))) {
|
| @@ -17608,7 +17607,7 @@ lang_Parser.prototype.finishMapLiteral = function(start, isConst, type) {
|
| }
|
| return new MapExpression(isConst, type, items, this._makeSpan(start));
|
| }
|
| -lang_Parser.prototype.finishTypedLiteral = function(start, isConst) {
|
| +Parser.prototype.finishTypedLiteral = function(start, isConst) {
|
| var span = this._makeSpan(start);
|
| var typeToBeNamedLater = new NameTypeReference(false, null, null, (span && span.is$SourceSpan()));
|
| var genericType = this.addTypeArguments((typeToBeNamedLater && typeToBeNamedLater.is$TypeReference()), 0);
|
| @@ -17622,7 +17621,7 @@ lang_Parser.prototype.finishTypedLiteral = function(start, isConst) {
|
| this._errorExpected('array or map literal');
|
| }
|
| }
|
| -lang_Parser.prototype._readModifiers = function() {
|
| +Parser.prototype._readModifiers = function() {
|
| var modifiers = null;
|
| while (true) {
|
| switch (this._peek()) {
|
| @@ -17644,7 +17643,7 @@ lang_Parser.prototype._readModifiers = function() {
|
| }
|
| return null;
|
| }
|
| -lang_Parser.prototype.typeParameter = function() {
|
| +Parser.prototype.typeParameter = function() {
|
| var start = this._peekToken.start;
|
| var name = this.identifier();
|
| var myType = null;
|
| @@ -17653,7 +17652,7 @@ lang_Parser.prototype.typeParameter = function() {
|
| }
|
| return new TypeParameter(name, myType, this._makeSpan(start));
|
| }
|
| -lang_Parser.prototype.typeParameters = function() {
|
| +Parser.prototype.typeParameters = function() {
|
| this._eat(52/*TokenKind.LT*/);
|
| var closed = false;
|
| var ret = [];
|
| @@ -17671,10 +17670,10 @@ lang_Parser.prototype.typeParameters = function() {
|
| }
|
| return ret;
|
| }
|
| -lang_Parser.prototype.get$typeParameters = function() {
|
| - return lang_Parser.prototype.typeParameters.bind(this);
|
| +Parser.prototype.get$typeParameters = function() {
|
| + return Parser.prototype.typeParameters.bind(this);
|
| }
|
| -lang_Parser.prototype._eatClosingAngle = function(depth) {
|
| +Parser.prototype._eatClosingAngle = function(depth) {
|
| if ($notnull_bool(this._maybeEat(53/*TokenKind.GT*/))) {
|
| return depth;
|
| }
|
| @@ -17689,11 +17688,11 @@ lang_Parser.prototype._eatClosingAngle = function(depth) {
|
| return depth;
|
| }
|
| }
|
| -lang_Parser.prototype.addTypeArguments = function(baseType, depth) {
|
| +Parser.prototype.addTypeArguments = function(baseType, depth) {
|
| this._eat(52/*TokenKind.LT*/);
|
| return this._finishTypeArguments(baseType, depth, []);
|
| }
|
| -lang_Parser.prototype._finishTypeArguments = function(baseType, depth, types) {
|
| +Parser.prototype._finishTypeArguments = function(baseType, depth, types) {
|
| var delta = -1;
|
| do {
|
| var myType = this.type(depth + 1);
|
| @@ -17713,7 +17712,7 @@ lang_Parser.prototype._finishTypeArguments = function(baseType, depth, types) {
|
| var span = this._makeSpan(baseType.span.start);
|
| return new GenericTypeReference(baseType, types, depth, (span && span.is$SourceSpan()));
|
| }
|
| -lang_Parser.prototype.typeList = function() {
|
| +Parser.prototype.typeList = function() {
|
| var types = [];
|
| do {
|
| types.add$1(this.type(0));
|
| @@ -17721,7 +17720,7 @@ lang_Parser.prototype.typeList = function() {
|
| while ($notnull_bool(this._maybeEat(11/*TokenKind.COMMA*/)))
|
| return types;
|
| }
|
| -lang_Parser.prototype.type = function(depth) {
|
| +Parser.prototype.type = function(depth) {
|
| var start = this._peekToken.start;
|
| var name;
|
| var names = null;
|
| @@ -17761,10 +17760,10 @@ lang_Parser.prototype.type = function(depth) {
|
| return typeRef;
|
| }
|
| }
|
| -lang_Parser.prototype.get$type = function() {
|
| - return lang_Parser.prototype.type.bind(this);
|
| +Parser.prototype.get$type = function() {
|
| + return Parser.prototype.type.bind(this);
|
| }
|
| -lang_Parser.prototype.formalParameter = function(inOptionalBlock) {
|
| +Parser.prototype.formalParameter = function(inOptionalBlock) {
|
| var start = this._peekToken.start;
|
| var isThis = false;
|
| var isRest = false;
|
| @@ -17788,7 +17787,7 @@ lang_Parser.prototype.formalParameter = function(inOptionalBlock) {
|
| }
|
| return new FormalNode(isThis, isRest, type, name, value, this._makeSpan(start));
|
| }
|
| -lang_Parser.prototype.formalParameterList = function() {
|
| +Parser.prototype.formalParameterList = function() {
|
| this._eat(2/*TokenKind.LPAREN*/);
|
| var formals = [];
|
| var inOptionalBlock = false;
|
| @@ -17813,14 +17812,14 @@ lang_Parser.prototype.formalParameterList = function() {
|
| }
|
| return formals;
|
| }
|
| -lang_Parser.prototype.identifier = function() {
|
| +Parser.prototype.identifier = function() {
|
| var tok = this._lang_next();
|
| if (!$notnull_bool(TokenKind.isIdentifier($assert_num(tok.kind)))) {
|
| this._lang_error(('expected identifier, but found ' + tok + ''), tok.get$span());
|
| }
|
| - return new lang_Identifier(tok.get$text(), this._makeSpan(tok.start));
|
| + return new Identifier(tok.get$text(), this._makeSpan(tok.start));
|
| }
|
| -lang_Parser.prototype._makeFunction = function(expr, body) {
|
| +Parser.prototype._makeFunction = function(expr, body) {
|
| var name, type;
|
| if ((expr instanceof CallExpression)) {
|
| if ((expr.target instanceof VarExpression)) {
|
| @@ -17843,7 +17842,7 @@ lang_Parser.prototype._makeFunction = function(expr, body) {
|
| this._lang_error('expected function');
|
| }
|
| }
|
| -lang_Parser.prototype._makeFormal = function(expr) {
|
| +Parser.prototype._makeFormal = function(expr) {
|
| var $0;
|
| if ((expr instanceof VarExpression)) {
|
| return new FormalNode(false, false, null, expr.get$name(), null, expr.get$span());
|
| @@ -17865,7 +17864,7 @@ lang_Parser.prototype._makeFormal = function(expr) {
|
| this._lang_error('expected formal', expr.get$span());
|
| }
|
| }
|
| -lang_Parser.prototype._makeFormalsFromList = function(expr) {
|
| +Parser.prototype._makeFormalsFromList = function(expr) {
|
| if ($notnull_bool(expr.get$isConst())) {
|
| this._lang_error('expected formal, but found "const"', expr.get$span());
|
| }
|
| @@ -17874,7 +17873,7 @@ lang_Parser.prototype._makeFormalsFromList = function(expr) {
|
| }
|
| return this._makeFormalsFromExpressions(expr.values, false);
|
| }
|
| -lang_Parser.prototype._makeFormals = function(arguments) {
|
| +Parser.prototype._makeFormals = function(arguments) {
|
| var expressions = [];
|
| for (var i = 0;
|
| i < arguments.length; i++) {
|
| @@ -17886,7 +17885,7 @@ lang_Parser.prototype._makeFormals = function(arguments) {
|
| }
|
| return this._makeFormalsFromExpressions(expressions, true);
|
| }
|
| -lang_Parser.prototype._makeFormalsFromExpressions = function(expressions, allowOptional) {
|
| +Parser.prototype._makeFormalsFromExpressions = function(expressions, allowOptional) {
|
| var $0;
|
| var formals = [];
|
| for (var i = 0;
|
| @@ -17930,7 +17929,7 @@ lang_Parser.prototype._makeFormalsFromExpressions = function(expressions, allowO
|
| }
|
| return formals;
|
| }
|
| -lang_Parser.prototype._makeDeclaredIdentifier = function(e) {
|
| +Parser.prototype._makeDeclaredIdentifier = function(e) {
|
| if ((e instanceof VarExpression)) {
|
| return new DeclaredIdentifier(null, e.get$name(), e.get$span());
|
| }
|
| @@ -17942,7 +17941,7 @@ lang_Parser.prototype._makeDeclaredIdentifier = function(e) {
|
| return new DeclaredIdentifier(null, null, e.get$span());
|
| }
|
| }
|
| -lang_Parser.prototype._makeLabel = function(expr) {
|
| +Parser.prototype._makeLabel = function(expr) {
|
| if ((expr instanceof VarExpression)) {
|
| return expr.get$name();
|
| }
|
| @@ -17951,7 +17950,7 @@ lang_Parser.prototype._makeLabel = function(expr) {
|
| return null;
|
| }
|
| }
|
| -lang_Parser.prototype.block$0 = function() {
|
| +Parser.prototype.block$0 = function() {
|
| return this.block();
|
| };
|
| // ********** Code for IncompleteSourceException **************
|
| @@ -17966,23 +17965,23 @@ IncompleteSourceException.prototype.toString = function() {
|
| IncompleteSourceException.prototype.toString$0 = function() {
|
| return this.toString();
|
| };
|
| -// ********** Code for lang_Node **************
|
| -function lang_Node(span) {
|
| +// ********** Code for Node **************
|
| +function Node(span) {
|
| this.span = span;
|
| // Initializers done
|
| }
|
| -lang_Node.prototype.is$lang_Node = function(){return this;};
|
| -lang_Node.prototype.get$span = function() { return this.span; };
|
| -lang_Node.prototype.set$span = function(value) { return this.span = value; };
|
| -lang_Node.prototype.visit$1 = function($0) {
|
| +Node.prototype.is$Node = function(){return this;};
|
| +Node.prototype.get$span = function() { return this.span; };
|
| +Node.prototype.set$span = function(value) { return this.span = value; };
|
| +Node.prototype.visit$1 = function($0) {
|
| return this.visit(($0 && $0.is$TreeVisitor()));
|
| };
|
| // ********** Code for Definition **************
|
| function Definition(span) {
|
| // Initializers done
|
| - lang_Statement.call(this, span);
|
| + Statement.call(this, span);
|
| }
|
| -$inherits(Definition, lang_Statement);
|
| +$inherits(Definition, Statement);
|
| Definition.prototype.is$Definition = function(){return this;};
|
| Definition.prototype.get$typeParameters = function() {
|
| return null;
|
| @@ -17990,27 +17989,27 @@ Definition.prototype.get$typeParameters = function() {
|
| Definition.prototype.get$nativeType = function() {
|
| return null;
|
| }
|
| -// ********** Code for lang_Statement **************
|
| -function lang_Statement(span) {
|
| +// ********** Code for Statement **************
|
| +function Statement(span) {
|
| // Initializers done
|
| - lang_Node.call(this, span);
|
| + Node.call(this, span);
|
| }
|
| -$inherits(lang_Statement, lang_Node);
|
| -lang_Statement.prototype.is$lang_Statement = function(){return this;};
|
| -// ********** Code for lang_Expression **************
|
| -function lang_Expression(span) {
|
| +$inherits(Statement, Node);
|
| +Statement.prototype.is$Statement = function(){return this;};
|
| +// ********** Code for Expression **************
|
| +function Expression(span) {
|
| // Initializers done
|
| - lang_Node.call(this, span);
|
| + Node.call(this, span);
|
| }
|
| -$inherits(lang_Expression, lang_Node);
|
| -lang_Expression.prototype.is$lang_Expression = function(){return this;};
|
| +$inherits(Expression, Node);
|
| +Expression.prototype.is$Expression = function(){return this;};
|
| // ********** Code for TypeReference **************
|
| function TypeReference(span, type) {
|
| this.type = type;
|
| // Initializers done
|
| - lang_Node.call(this, span);
|
| + Node.call(this, span);
|
| }
|
| -$inherits(TypeReference, lang_Node);
|
| +$inherits(TypeReference, Node);
|
| TypeReference.prototype.is$TypeReference = function(){return this;};
|
| TypeReference.prototype.get$type = function() { return this.type; };
|
| TypeReference.prototype.set$type = function(value) { return this.type = value; };
|
| @@ -18131,9 +18130,9 @@ FunctionDefinition.prototype.visit$1 = function($0) {
|
| function ReturnStatement(value, span) {
|
| this.value = value;
|
| // Initializers done
|
| - lang_Statement.call(this, span);
|
| + Statement.call(this, span);
|
| }
|
| -$inherits(ReturnStatement, lang_Statement);
|
| +$inherits(ReturnStatement, Statement);
|
| ReturnStatement.prototype.get$value = function() { return this.value; };
|
| ReturnStatement.prototype.set$value = function(value) { return this.value = value; };
|
| ReturnStatement.prototype.visit = function(visitor) {
|
| @@ -18146,9 +18145,9 @@ ReturnStatement.prototype.visit$1 = function($0) {
|
| function ThrowStatement(value, span) {
|
| this.value = value;
|
| // Initializers done
|
| - lang_Statement.call(this, span);
|
| + Statement.call(this, span);
|
| }
|
| -$inherits(ThrowStatement, lang_Statement);
|
| +$inherits(ThrowStatement, Statement);
|
| ThrowStatement.prototype.get$value = function() { return this.value; };
|
| ThrowStatement.prototype.set$value = function(value) { return this.value = value; };
|
| ThrowStatement.prototype.visit = function(visitor) {
|
| @@ -18161,9 +18160,9 @@ ThrowStatement.prototype.visit$1 = function($0) {
|
| function AssertStatement(test, span) {
|
| this.test = test;
|
| // Initializers done
|
| - lang_Statement.call(this, span);
|
| + Statement.call(this, span);
|
| }
|
| -$inherits(AssertStatement, lang_Statement);
|
| +$inherits(AssertStatement, Statement);
|
| AssertStatement.prototype.visit = function(visitor) {
|
| return visitor.visitAssertStatement(this);
|
| }
|
| @@ -18174,9 +18173,9 @@ AssertStatement.prototype.visit$1 = function($0) {
|
| function BreakStatement(label, span) {
|
| this.label = label;
|
| // Initializers done
|
| - lang_Statement.call(this, span);
|
| + Statement.call(this, span);
|
| }
|
| -$inherits(BreakStatement, lang_Statement);
|
| +$inherits(BreakStatement, Statement);
|
| BreakStatement.prototype.visit = function(visitor) {
|
| return visitor.visitBreakStatement(this);
|
| }
|
| @@ -18187,9 +18186,9 @@ BreakStatement.prototype.visit$1 = function($0) {
|
| function ContinueStatement(label, span) {
|
| this.label = label;
|
| // Initializers done
|
| - lang_Statement.call(this, span);
|
| + Statement.call(this, span);
|
| }
|
| -$inherits(ContinueStatement, lang_Statement);
|
| +$inherits(ContinueStatement, Statement);
|
| ContinueStatement.prototype.visit = function(visitor) {
|
| return visitor.visitContinueStatement(this);
|
| }
|
| @@ -18202,9 +18201,9 @@ function IfStatement(test, trueBranch, falseBranch, span) {
|
| this.trueBranch = trueBranch;
|
| this.falseBranch = falseBranch;
|
| // Initializers done
|
| - lang_Statement.call(this, span);
|
| + Statement.call(this, span);
|
| }
|
| -$inherits(IfStatement, lang_Statement);
|
| +$inherits(IfStatement, Statement);
|
| IfStatement.prototype.visit = function(visitor) {
|
| return visitor.visitIfStatement(this);
|
| }
|
| @@ -18216,9 +18215,9 @@ function WhileStatement(test, body, span) {
|
| this.test = test;
|
| this.body = body;
|
| // Initializers done
|
| - lang_Statement.call(this, span);
|
| + Statement.call(this, span);
|
| }
|
| -$inherits(WhileStatement, lang_Statement);
|
| +$inherits(WhileStatement, Statement);
|
| WhileStatement.prototype.visit = function(visitor) {
|
| return visitor.visitWhileStatement(this);
|
| }
|
| @@ -18230,9 +18229,9 @@ function DoStatement(body, test, span) {
|
| this.body = body;
|
| this.test = test;
|
| // Initializers done
|
| - lang_Statement.call(this, span);
|
| + Statement.call(this, span);
|
| }
|
| -$inherits(DoStatement, lang_Statement);
|
| +$inherits(DoStatement, Statement);
|
| DoStatement.prototype.visit = function(visitor) {
|
| return visitor.visitDoStatement(this);
|
| }
|
| @@ -18246,9 +18245,9 @@ function ForStatement(init, test, step, body, span) {
|
| this.step = step;
|
| this.body = body;
|
| // Initializers done
|
| - lang_Statement.call(this, span);
|
| + Statement.call(this, span);
|
| }
|
| -$inherits(ForStatement, lang_Statement);
|
| +$inherits(ForStatement, Statement);
|
| ForStatement.prototype.visit = function(visitor) {
|
| return visitor.visitForStatement(this);
|
| }
|
| @@ -18261,9 +18260,9 @@ function ForInStatement(item, list, body, span) {
|
| this.list = list;
|
| this.body = body;
|
| // Initializers done
|
| - lang_Statement.call(this, span);
|
| + Statement.call(this, span);
|
| }
|
| -$inherits(ForInStatement, lang_Statement);
|
| +$inherits(ForInStatement, Statement);
|
| ForInStatement.prototype.visit = function(visitor) {
|
| return visitor.visitForInStatement(this);
|
| }
|
| @@ -18276,9 +18275,9 @@ function TryStatement(body, catches, finallyBlock, span) {
|
| this.catches = catches;
|
| this.finallyBlock = finallyBlock;
|
| // Initializers done
|
| - lang_Statement.call(this, span);
|
| + Statement.call(this, span);
|
| }
|
| -$inherits(TryStatement, lang_Statement);
|
| +$inherits(TryStatement, Statement);
|
| TryStatement.prototype.visit = function(visitor) {
|
| return visitor.visitTryStatement(this);
|
| }
|
| @@ -18290,9 +18289,9 @@ function SwitchStatement(test, cases, span) {
|
| this.test = test;
|
| this.cases = cases;
|
| // Initializers done
|
| - lang_Statement.call(this, span);
|
| + Statement.call(this, span);
|
| }
|
| -$inherits(SwitchStatement, lang_Statement);
|
| +$inherits(SwitchStatement, Statement);
|
| SwitchStatement.prototype.visit = function(visitor) {
|
| return visitor.visitSwitchStatement(this);
|
| }
|
| @@ -18303,9 +18302,9 @@ SwitchStatement.prototype.visit$1 = function($0) {
|
| function BlockStatement(body, span) {
|
| this.body = body;
|
| // Initializers done
|
| - lang_Statement.call(this, span);
|
| + Statement.call(this, span);
|
| }
|
| -$inherits(BlockStatement, lang_Statement);
|
| +$inherits(BlockStatement, Statement);
|
| BlockStatement.prototype.is$BlockStatement = function(){return this;};
|
| BlockStatement.prototype.visit = function(visitor) {
|
| return visitor.visitBlockStatement(this);
|
| @@ -18318,9 +18317,9 @@ function LabeledStatement(name, body, span) {
|
| this.name = name;
|
| this.body = body;
|
| // Initializers done
|
| - lang_Statement.call(this, span);
|
| + Statement.call(this, span);
|
| }
|
| -$inherits(LabeledStatement, lang_Statement);
|
| +$inherits(LabeledStatement, Statement);
|
| LabeledStatement.prototype.get$name = function() { return this.name; };
|
| LabeledStatement.prototype.set$name = function(value) { return this.name = value; };
|
| LabeledStatement.prototype.visit = function(visitor) {
|
| @@ -18329,25 +18328,25 @@ LabeledStatement.prototype.visit = function(visitor) {
|
| LabeledStatement.prototype.visit$1 = function($0) {
|
| return this.visit(($0 && $0.is$TreeVisitor()));
|
| };
|
| -// ********** Code for lang_ExpressionStatement **************
|
| -function lang_ExpressionStatement(body, span) {
|
| +// ********** Code for ExpressionStatement **************
|
| +function ExpressionStatement(body, span) {
|
| this.body = body;
|
| // Initializers done
|
| - lang_Statement.call(this, span);
|
| + Statement.call(this, span);
|
| }
|
| -$inherits(lang_ExpressionStatement, lang_Statement);
|
| -lang_ExpressionStatement.prototype.visit = function(visitor) {
|
| +$inherits(ExpressionStatement, Statement);
|
| +ExpressionStatement.prototype.visit = function(visitor) {
|
| return visitor.visitExpressionStatement(this);
|
| }
|
| -lang_ExpressionStatement.prototype.visit$1 = function($0) {
|
| +ExpressionStatement.prototype.visit$1 = function($0) {
|
| return this.visit(($0 && $0.is$TreeVisitor()));
|
| };
|
| // ********** Code for EmptyStatement **************
|
| function EmptyStatement(span) {
|
| // Initializers done
|
| - lang_Statement.call(this, span);
|
| + Statement.call(this, span);
|
| }
|
| -$inherits(EmptyStatement, lang_Statement);
|
| +$inherits(EmptyStatement, Statement);
|
| EmptyStatement.prototype.visit = function(visitor) {
|
| return visitor.visitEmptyStatement(this);
|
| }
|
| @@ -18357,9 +18356,9 @@ EmptyStatement.prototype.visit$1 = function($0) {
|
| // ********** Code for DietStatement **************
|
| function DietStatement(span) {
|
| // Initializers done
|
| - lang_Statement.call(this, span);
|
| + Statement.call(this, span);
|
| }
|
| -$inherits(DietStatement, lang_Statement);
|
| +$inherits(DietStatement, Statement);
|
| DietStatement.prototype.visit = function(visitor) {
|
| return visitor.visitDietStatement(this);
|
| }
|
| @@ -18370,9 +18369,9 @@ DietStatement.prototype.visit$1 = function($0) {
|
| function NativeStatement(body, span) {
|
| this.body = body;
|
| // Initializers done
|
| - lang_Statement.call(this, span);
|
| + Statement.call(this, span);
|
| }
|
| -$inherits(NativeStatement, lang_Statement);
|
| +$inherits(NativeStatement, Statement);
|
| NativeStatement.prototype.visit = function(visitor) {
|
| return visitor.visitNativeStatement(this);
|
| }
|
| @@ -18383,9 +18382,9 @@ NativeStatement.prototype.visit$1 = function($0) {
|
| function LambdaExpression(func, span) {
|
| this.func = func;
|
| // Initializers done
|
| - lang_Expression.call(this, span);
|
| + Expression.call(this, span);
|
| }
|
| -$inherits(LambdaExpression, lang_Expression);
|
| +$inherits(LambdaExpression, Expression);
|
| LambdaExpression.prototype.is$LambdaExpression = function(){return this;};
|
| LambdaExpression.prototype.visit = function(visitor) {
|
| return visitor.visitLambdaExpression(this);
|
| @@ -18398,9 +18397,9 @@ function CallExpression(target, arguments, span) {
|
| this.target = target;
|
| this.arguments = arguments;
|
| // Initializers done
|
| - lang_Expression.call(this, span);
|
| + Expression.call(this, span);
|
| }
|
| -$inherits(CallExpression, lang_Expression);
|
| +$inherits(CallExpression, Expression);
|
| CallExpression.prototype.is$CallExpression = function(){return this;};
|
| CallExpression.prototype.get$arguments = function() { return this.arguments; };
|
| CallExpression.prototype.set$arguments = function(value) { return this.arguments = value; };
|
| @@ -18415,9 +18414,9 @@ function IndexExpression(target, index, span) {
|
| this.target = target;
|
| this.index = index;
|
| // Initializers done
|
| - lang_Expression.call(this, span);
|
| + Expression.call(this, span);
|
| }
|
| -$inherits(IndexExpression, lang_Expression);
|
| +$inherits(IndexExpression, Expression);
|
| IndexExpression.prototype.is$IndexExpression = function(){return this;};
|
| IndexExpression.prototype.visit = function(visitor) {
|
| return visitor.visitIndexExpression(this);
|
| @@ -18431,9 +18430,9 @@ function BinaryExpression(op, x, y, span) {
|
| this.x = x;
|
| this.y = y;
|
| // Initializers done
|
| - lang_Expression.call(this, span);
|
| + Expression.call(this, span);
|
| }
|
| -$inherits(BinaryExpression, lang_Expression);
|
| +$inherits(BinaryExpression, Expression);
|
| BinaryExpression.prototype.is$BinaryExpression = function(){return this;};
|
| BinaryExpression.prototype.visit = function(visitor) {
|
| return visitor.visitBinaryExpression(this);
|
| @@ -18446,9 +18445,9 @@ function UnaryExpression(op, self, span) {
|
| this.op = op;
|
| this.self = self;
|
| // Initializers done
|
| - lang_Expression.call(this, span);
|
| + Expression.call(this, span);
|
| }
|
| -$inherits(UnaryExpression, lang_Expression);
|
| +$inherits(UnaryExpression, Expression);
|
| UnaryExpression.prototype.visit = function(visitor) {
|
| return visitor.visitUnaryExpression(this);
|
| }
|
| @@ -18460,9 +18459,9 @@ function PostfixExpression(body, op, span) {
|
| this.body = body;
|
| this.op = op;
|
| // Initializers done
|
| - lang_Expression.call(this, span);
|
| + Expression.call(this, span);
|
| }
|
| -$inherits(PostfixExpression, lang_Expression);
|
| +$inherits(PostfixExpression, Expression);
|
| PostfixExpression.prototype.is$PostfixExpression = function(){return this;};
|
| PostfixExpression.prototype.visit = function(visitor) {
|
| return visitor.visitPostfixExpression$1(this);
|
| @@ -18470,28 +18469,28 @@ PostfixExpression.prototype.visit = function(visitor) {
|
| PostfixExpression.prototype.visit$1 = function($0) {
|
| return this.visit(($0 && $0.is$TreeVisitor()));
|
| };
|
| -// ********** Code for lang_NewExpression **************
|
| -function lang_NewExpression(isConst, type, name, arguments, span) {
|
| +// ********** Code for NewExpression **************
|
| +function NewExpression(isConst, type, name, arguments, span) {
|
| this.isConst = isConst;
|
| this.type = type;
|
| this.name = name;
|
| this.arguments = arguments;
|
| // Initializers done
|
| - lang_Expression.call(this, span);
|
| -}
|
| -$inherits(lang_NewExpression, lang_Expression);
|
| -lang_NewExpression.prototype.get$isConst = function() { return this.isConst; };
|
| -lang_NewExpression.prototype.set$isConst = function(value) { return this.isConst = value; };
|
| -lang_NewExpression.prototype.get$type = function() { return this.type; };
|
| -lang_NewExpression.prototype.set$type = function(value) { return this.type = value; };
|
| -lang_NewExpression.prototype.get$name = function() { return this.name; };
|
| -lang_NewExpression.prototype.set$name = function(value) { return this.name = value; };
|
| -lang_NewExpression.prototype.get$arguments = function() { return this.arguments; };
|
| -lang_NewExpression.prototype.set$arguments = function(value) { return this.arguments = value; };
|
| -lang_NewExpression.prototype.visit = function(visitor) {
|
| + Expression.call(this, span);
|
| +}
|
| +$inherits(NewExpression, Expression);
|
| +NewExpression.prototype.get$isConst = function() { return this.isConst; };
|
| +NewExpression.prototype.set$isConst = function(value) { return this.isConst = value; };
|
| +NewExpression.prototype.get$type = function() { return this.type; };
|
| +NewExpression.prototype.set$type = function(value) { return this.type = value; };
|
| +NewExpression.prototype.get$name = function() { return this.name; };
|
| +NewExpression.prototype.set$name = function(value) { return this.name = value; };
|
| +NewExpression.prototype.get$arguments = function() { return this.arguments; };
|
| +NewExpression.prototype.set$arguments = function(value) { return this.arguments = value; };
|
| +NewExpression.prototype.visit = function(visitor) {
|
| return visitor.visitNewExpression(this);
|
| }
|
| -lang_NewExpression.prototype.visit$1 = function($0) {
|
| +NewExpression.prototype.visit$1 = function($0) {
|
| return this.visit(($0 && $0.is$TreeVisitor()));
|
| };
|
| // ********** Code for ListExpression **************
|
| @@ -18500,9 +18499,9 @@ function ListExpression(isConst, type, values, span) {
|
| this.type = type;
|
| this.values = values;
|
| // Initializers done
|
| - lang_Expression.call(this, span);
|
| + Expression.call(this, span);
|
| }
|
| -$inherits(ListExpression, lang_Expression);
|
| +$inherits(ListExpression, Expression);
|
| ListExpression.prototype.get$isConst = function() { return this.isConst; };
|
| ListExpression.prototype.set$isConst = function(value) { return this.isConst = value; };
|
| ListExpression.prototype.get$type = function() { return this.type; };
|
| @@ -18519,9 +18518,9 @@ function MapExpression(isConst, type, items, span) {
|
| this.type = type;
|
| this.items = items;
|
| // Initializers done
|
| - lang_Expression.call(this, span);
|
| + Expression.call(this, span);
|
| }
|
| -$inherits(MapExpression, lang_Expression);
|
| +$inherits(MapExpression, Expression);
|
| MapExpression.prototype.get$isConst = function() { return this.isConst; };
|
| MapExpression.prototype.set$isConst = function(value) { return this.isConst = value; };
|
| MapExpression.prototype.get$type = function() { return this.type; };
|
| @@ -18538,9 +18537,9 @@ function ConditionalExpression(test, trueBranch, falseBranch, span) {
|
| this.trueBranch = trueBranch;
|
| this.falseBranch = falseBranch;
|
| // Initializers done
|
| - lang_Expression.call(this, span);
|
| + Expression.call(this, span);
|
| }
|
| -$inherits(ConditionalExpression, lang_Expression);
|
| +$inherits(ConditionalExpression, Expression);
|
| ConditionalExpression.prototype.visit = function(visitor) {
|
| return visitor.visitConditionalExpression(this);
|
| }
|
| @@ -18553,9 +18552,9 @@ function IsExpression(isTrue, x, type, span) {
|
| this.x = x;
|
| this.type = type;
|
| // Initializers done
|
| - lang_Expression.call(this, span);
|
| + Expression.call(this, span);
|
| }
|
| -$inherits(IsExpression, lang_Expression);
|
| +$inherits(IsExpression, Expression);
|
| IsExpression.prototype.get$type = function() { return this.type; };
|
| IsExpression.prototype.set$type = function(value) { return this.type = value; };
|
| IsExpression.prototype.visit = function(visitor) {
|
| @@ -18568,9 +18567,9 @@ IsExpression.prototype.visit$1 = function($0) {
|
| function ParenExpression(body, span) {
|
| this.body = body;
|
| // Initializers done
|
| - lang_Expression.call(this, span);
|
| + Expression.call(this, span);
|
| }
|
| -$inherits(ParenExpression, lang_Expression);
|
| +$inherits(ParenExpression, Expression);
|
| ParenExpression.prototype.visit = function(visitor) {
|
| return visitor.visitParenExpression(this);
|
| }
|
| @@ -18582,9 +18581,9 @@ function DotExpression(self, name, span) {
|
| this.self = self;
|
| this.name = name;
|
| // Initializers done
|
| - lang_Expression.call(this, span);
|
| + Expression.call(this, span);
|
| }
|
| -$inherits(DotExpression, lang_Expression);
|
| +$inherits(DotExpression, Expression);
|
| DotExpression.prototype.is$DotExpression = function(){return this;};
|
| DotExpression.prototype.get$name = function() { return this.name; };
|
| DotExpression.prototype.set$name = function(value) { return this.name = value; };
|
| @@ -18598,9 +18597,9 @@ DotExpression.prototype.visit$1 = function($0) {
|
| function VarExpression(name, span) {
|
| this.name = name;
|
| // Initializers done
|
| - lang_Expression.call(this, span);
|
| + Expression.call(this, span);
|
| }
|
| -$inherits(VarExpression, lang_Expression);
|
| +$inherits(VarExpression, Expression);
|
| VarExpression.prototype.is$VarExpression = function(){return this;};
|
| VarExpression.prototype.get$name = function() { return this.name; };
|
| VarExpression.prototype.set$name = function(value) { return this.name = value; };
|
| @@ -18613,9 +18612,9 @@ VarExpression.prototype.visit$1 = function($0) {
|
| // ********** Code for ThisExpression **************
|
| function ThisExpression(span) {
|
| // Initializers done
|
| - lang_Expression.call(this, span);
|
| + Expression.call(this, span);
|
| }
|
| -$inherits(ThisExpression, lang_Expression);
|
| +$inherits(ThisExpression, Expression);
|
| ThisExpression.prototype.visit = function(visitor) {
|
| return visitor.visitThisExpression(this);
|
| }
|
| @@ -18625,9 +18624,9 @@ ThisExpression.prototype.visit$1 = function($0) {
|
| // ********** Code for SuperExpression **************
|
| function SuperExpression(span) {
|
| // Initializers done
|
| - lang_Expression.call(this, span);
|
| + Expression.call(this, span);
|
| }
|
| -$inherits(SuperExpression, lang_Expression);
|
| +$inherits(SuperExpression, Expression);
|
| SuperExpression.prototype.visit = function(visitor) {
|
| return visitor.visitSuperExpression(this);
|
| }
|
| @@ -18637,9 +18636,9 @@ SuperExpression.prototype.visit$1 = function($0) {
|
| // ********** Code for NullExpression **************
|
| function NullExpression(span) {
|
| // Initializers done
|
| - lang_Expression.call(this, span);
|
| + Expression.call(this, span);
|
| }
|
| -$inherits(NullExpression, lang_Expression);
|
| +$inherits(NullExpression, Expression);
|
| NullExpression.prototype.visit = function(visitor) {
|
| return visitor.visitNullExpression(this);
|
| }
|
| @@ -18652,9 +18651,9 @@ function LiteralExpression(value, type, text, span) {
|
| this.type = type;
|
| this.text = text;
|
| // Initializers done
|
| - lang_Expression.call(this, span);
|
| + Expression.call(this, span);
|
| }
|
| -$inherits(LiteralExpression, lang_Expression);
|
| +$inherits(LiteralExpression, Expression);
|
| LiteralExpression.prototype.get$value = function() { return this.value; };
|
| LiteralExpression.prototype.set$value = function(value) { return this.value = value; };
|
| LiteralExpression.prototype.get$type = function() { return this.type; };
|
| @@ -18725,9 +18724,9 @@ function ArgumentNode(label, value, span) {
|
| this.label = label;
|
| this.value = value;
|
| // Initializers done
|
| - lang_Node.call(this, span);
|
| + Node.call(this, span);
|
| }
|
| -$inherits(ArgumentNode, lang_Node);
|
| +$inherits(ArgumentNode, Node);
|
| ArgumentNode.prototype.is$ArgumentNode = function(){return this;};
|
| ArgumentNode.prototype.get$value = function() { return this.value; };
|
| ArgumentNode.prototype.set$value = function(value) { return this.value = value; };
|
| @@ -18745,9 +18744,9 @@ function FormalNode(isThis, isRest, type, name, value, span) {
|
| this.name = name;
|
| this.value = value;
|
| // Initializers done
|
| - lang_Node.call(this, span);
|
| + Node.call(this, span);
|
| }
|
| -$inherits(FormalNode, lang_Node);
|
| +$inherits(FormalNode, Node);
|
| FormalNode.prototype.get$type = function() { return this.type; };
|
| FormalNode.prototype.set$type = function(value) { return this.type = value; };
|
| FormalNode.prototype.get$name = function() { return this.name; };
|
| @@ -18766,9 +18765,9 @@ function CatchNode(exception, trace, body, span) {
|
| this.trace = trace;
|
| this.body = body;
|
| // Initializers done
|
| - lang_Node.call(this, span);
|
| + Node.call(this, span);
|
| }
|
| -$inherits(CatchNode, lang_Node);
|
| +$inherits(CatchNode, Node);
|
| CatchNode.prototype.get$exception = function() { return this.exception; };
|
| CatchNode.prototype.set$exception = function(value) { return this.exception = value; };
|
| CatchNode.prototype.visit = function(visitor) {
|
| @@ -18783,9 +18782,9 @@ function CaseNode(label, cases, statements, span) {
|
| this.cases = cases;
|
| this.statements = statements;
|
| // Initializers done
|
| - lang_Node.call(this, span);
|
| + Node.call(this, span);
|
| }
|
| -$inherits(CaseNode, lang_Node);
|
| +$inherits(CaseNode, Node);
|
| CaseNode.prototype.visit = function(visitor) {
|
| return visitor.visitCaseNode(this);
|
| }
|
| @@ -18797,9 +18796,9 @@ function TypeParameter(name, extendsType, span) {
|
| this.name = name;
|
| this.extendsType = extendsType;
|
| // Initializers done
|
| - lang_Node.call(this, span);
|
| + Node.call(this, span);
|
| }
|
| -$inherits(TypeParameter, lang_Node);
|
| +$inherits(TypeParameter, Node);
|
| TypeParameter.prototype.get$name = function() { return this.name; };
|
| TypeParameter.prototype.set$name = function(value) { return this.name = value; };
|
| TypeParameter.prototype.visit = function(visitor) {
|
| @@ -18808,20 +18807,20 @@ TypeParameter.prototype.visit = function(visitor) {
|
| TypeParameter.prototype.visit$1 = function($0) {
|
| return this.visit(($0 && $0.is$TreeVisitor()));
|
| };
|
| -// ********** Code for lang_Identifier **************
|
| -function lang_Identifier(name, span) {
|
| +// ********** Code for Identifier **************
|
| +function Identifier(name, span) {
|
| this.name = name;
|
| // Initializers done
|
| - lang_Node.call(this, span);
|
| + Node.call(this, span);
|
| }
|
| -$inherits(lang_Identifier, lang_Node);
|
| -lang_Identifier.prototype.is$lang_Identifier = function(){return this;};
|
| -lang_Identifier.prototype.get$name = function() { return this.name; };
|
| -lang_Identifier.prototype.set$name = function(value) { return this.name = value; };
|
| -lang_Identifier.prototype.visit = function(visitor) {
|
| +$inherits(Identifier, Node);
|
| +Identifier.prototype.is$Identifier = function(){return this;};
|
| +Identifier.prototype.get$name = function() { return this.name; };
|
| +Identifier.prototype.set$name = function(value) { return this.name = value; };
|
| +Identifier.prototype.visit = function(visitor) {
|
| return visitor.visitIdentifier(this);
|
| }
|
| -lang_Identifier.prototype.visit$1 = function($0) {
|
| +Identifier.prototype.visit$1 = function($0) {
|
| return this.visit(($0 && $0.is$TreeVisitor()));
|
| };
|
| // ********** Code for DeclaredIdentifier **************
|
| @@ -18829,9 +18828,9 @@ function DeclaredIdentifier(type, name, span) {
|
| this.type = type;
|
| this.name = name;
|
| // Initializers done
|
| - lang_Expression.call(this, span);
|
| + Expression.call(this, span);
|
| }
|
| -$inherits(DeclaredIdentifier, lang_Expression);
|
| +$inherits(DeclaredIdentifier, Expression);
|
| DeclaredIdentifier.prototype.is$DeclaredIdentifier = function(){return this;};
|
| DeclaredIdentifier.prototype.get$type = function() { return this.type; };
|
| DeclaredIdentifier.prototype.set$type = function(value) { return this.type = value; };
|
| @@ -18843,122 +18842,122 @@ DeclaredIdentifier.prototype.visit = function(visitor) {
|
| DeclaredIdentifier.prototype.visit$1 = function($0) {
|
| return this.visit(($0 && $0.is$TreeVisitor()));
|
| };
|
| -// ********** Code for lang_Type **************
|
| -function lang_Type(name) {
|
| +// ********** Code for Type **************
|
| +function Type(name) {
|
| this.name = name;
|
| this.isTested = false;
|
| // Initializers done
|
| }
|
| -lang_Type.prototype.is$lang_Type = function(){return this;};
|
| -lang_Type.prototype.is$Named = function(){return this;};
|
| -lang_Type.prototype.get$name = function() { return this.name; };
|
| -lang_Type.prototype.markUsed = function() {
|
| +Type.prototype.is$Type = function(){return this;};
|
| +Type.prototype.is$Named = function(){return this;};
|
| +Type.prototype.get$name = function() { return this.name; };
|
| +Type.prototype.markUsed = function() {
|
|
|
| }
|
| -lang_Type.prototype.get$typeMember = function() {
|
| +Type.prototype.get$typeMember = function() {
|
| var $0;
|
| if (this._typeMember == null) {
|
| this._typeMember = new TypeMember((this && this.is$DefinedType()));
|
| }
|
| return (($0 = this._typeMember) && $0.is$TypeMember());
|
| }
|
| -lang_Type.prototype.getMember = function(name) {
|
| +Type.prototype.getMember = function(name) {
|
| return null;
|
| }
|
| -lang_Type.prototype.get$isVar = function() {
|
| +Type.prototype.get$isVar = function() {
|
| return false;
|
| }
|
| -lang_Type.prototype.get$isTop = function() {
|
| +Type.prototype.get$isTop = function() {
|
| return false;
|
| }
|
| -lang_Type.prototype.get$isObject = function() {
|
| +Type.prototype.get$isObject = function() {
|
| return false;
|
| }
|
| -lang_Type.prototype.get$isString = function() {
|
| +Type.prototype.get$isString = function() {
|
| return false;
|
| }
|
| -lang_Type.prototype.get$isBool = function() {
|
| +Type.prototype.get$isBool = function() {
|
| return false;
|
| }
|
| -lang_Type.prototype.get$isFunction = function() {
|
| +Type.prototype.get$isFunction = function() {
|
| return false;
|
| }
|
| -lang_Type.prototype.get$isList = function() {
|
| +Type.prototype.get$isList = function() {
|
| return false;
|
| }
|
| -lang_Type.prototype.get$isNum = function() {
|
| +Type.prototype.get$isNum = function() {
|
| return false;
|
| }
|
| -lang_Type.prototype.get$isVoid = function() {
|
| +Type.prototype.get$isVoid = function() {
|
| return false;
|
| }
|
| -lang_Type.prototype.get$isNullable = function() {
|
| +Type.prototype.get$isNullable = function() {
|
| return true;
|
| }
|
| -lang_Type.prototype.get$isVarOrFunction = function() {
|
| +Type.prototype.get$isVarOrFunction = function() {
|
| return $notnull_bool(this.get$isVar()) || $notnull_bool(this.get$isFunction());
|
| }
|
| -lang_Type.prototype.get$isVarOrObject = function() {
|
| +Type.prototype.get$isVarOrObject = function() {
|
| return $notnull_bool(this.get$isVar()) || $notnull_bool(this.get$isObject());
|
| }
|
| -lang_Type.prototype.getCallMethod = function() {
|
| +Type.prototype.getCallMethod = function() {
|
| return null;
|
| }
|
| -lang_Type.prototype.get$isClosed = function() {
|
| +Type.prototype.get$isClosed = function() {
|
| return $notnull_bool(this.get$isString()) || $notnull_bool(this.get$isBool()) || $notnull_bool(this.get$isNum()) || $notnull_bool(this.get$isFunction()) || $notnull_bool(this.get$isVar());
|
| }
|
| -lang_Type.prototype.get$isUsed = function() {
|
| +Type.prototype.get$isUsed = function() {
|
| return false;
|
| }
|
| -lang_Type.prototype.get$isGeneric = function() {
|
| +Type.prototype.get$isGeneric = function() {
|
| return false;
|
| }
|
| -lang_Type.prototype.get$isNativeType = function() {
|
| +Type.prototype.get$isNativeType = function() {
|
| return false;
|
| }
|
| -lang_Type.prototype.get$isNative = function() {
|
| +Type.prototype.get$isNative = function() {
|
| return this.get$isNativeType();
|
| }
|
| -lang_Type.prototype.get$hasTypeParams = function() {
|
| +Type.prototype.get$hasTypeParams = function() {
|
| return false;
|
| }
|
| -lang_Type.prototype.get$typeofName = function() {
|
| +Type.prototype.get$typeofName = function() {
|
| return null;
|
| }
|
| -lang_Type.prototype.get$jsname = function() {
|
| +Type.prototype.get$jsname = function() {
|
| return this._jsname == null ? this.name : this._jsname;
|
| }
|
| -lang_Type.prototype.set$jsname = function(name) {
|
| +Type.prototype.set$jsname = function(name) {
|
| return this._jsname = name;
|
| }
|
| -lang_Type.prototype.get$members = function() {
|
| +Type.prototype.get$members = function() {
|
| return null;
|
| }
|
| -lang_Type.prototype.get$definition = function() {
|
| +Type.prototype.get$definition = function() {
|
| return null;
|
| }
|
| -lang_Type.prototype.get$factories = function() {
|
| +Type.prototype.get$factories = function() {
|
| return null;
|
| }
|
| -lang_Type.prototype.get$typeArgsInOrder = function() {
|
| +Type.prototype.get$typeArgsInOrder = function() {
|
| return null;
|
| }
|
| -lang_Type.prototype.get$genericType = function() {
|
| +Type.prototype.get$genericType = function() {
|
| return (this && this.is$DefinedType());
|
| }
|
| -lang_Type.prototype.get$interfaces = function() {
|
| +Type.prototype.get$interfaces = function() {
|
| return null;
|
| }
|
| -lang_Type.prototype.get$parent = function() {
|
| +Type.prototype.get$parent = function() {
|
| return null;
|
| }
|
| -lang_Type.prototype.getAllMembers = function() {
|
| +Type.prototype.getAllMembers = function() {
|
| return $map([]);
|
| }
|
| -lang_Type.prototype.hashCode = function() {
|
| +Type.prototype.hashCode = function() {
|
| return this.name.hashCode();
|
| }
|
| -lang_Type.prototype.ensureSubtypeOf = function(other, span, typeErrors) {
|
| +Type.prototype.ensureSubtypeOf = function(other, span, typeErrors) {
|
| if (!$notnull_bool(this.isSubtypeOf(other))) {
|
| var msg = ('type ' + this.name + ' is not a subtype of ' + other.name + '');
|
| if ($notnull_bool(typeErrors)) {
|
| @@ -18969,7 +18968,7 @@ lang_Type.prototype.ensureSubtypeOf = function(other, span, typeErrors) {
|
| }
|
| }
|
| }
|
| -lang_Type.prototype.needsVarCall = function(args) {
|
| +Type.prototype.needsVarCall = function(args) {
|
| if ($notnull_bool(this.get$isVarOrFunction())) {
|
| return true;
|
| }
|
| @@ -18981,16 +18980,16 @@ lang_Type.prototype.needsVarCall = function(args) {
|
| }
|
| return false;
|
| }
|
| -lang_Type.union = function(x, y) {
|
| +Type.union = function(x, y) {
|
| if ($eq(x, y)) return x;
|
| if ($notnull_bool(x.get$isNum()) && $notnull_bool(y.get$isNum())) return world.numType;
|
| if ($notnull_bool(x.get$isString()) && $notnull_bool(y.get$isString())) return world.stringType;
|
| return world.varType;
|
| }
|
| -lang_Type.prototype.isAssignable = function(other) {
|
| +Type.prototype.isAssignable = function(other) {
|
| return $notnull_bool(this.isSubtypeOf(other)) || $notnull_bool(other.isSubtypeOf(this));
|
| }
|
| -lang_Type.prototype._isDirectSupertypeOf = function(other) {
|
| +Type.prototype._isDirectSupertypeOf = function(other) {
|
| var $this = this; // closure support
|
| if ($notnull_bool(other.get$isClass())) {
|
| return $eq(other.get$parent(), this) || $notnull_bool(this.get$isObject()) && other.get$parent() == null;
|
| @@ -19007,7 +19006,7 @@ lang_Type.prototype._isDirectSupertypeOf = function(other) {
|
| }
|
| }
|
| }
|
| -lang_Type.prototype.isSubtypeOf = function(other) {
|
| +Type.prototype.isSubtypeOf = function(other) {
|
| if ((other instanceof ParameterType)) {
|
| return true;
|
| }
|
| @@ -19018,7 +19017,7 @@ lang_Type.prototype.isSubtypeOf = function(other) {
|
| var call = this.getCallMethod();
|
| var otherCall = other.getCallMethod();
|
| if ($notnull_bool($ne(call, null)) && $notnull_bool($ne(otherCall, null))) {
|
| - return lang_Type._isFunctionSubtypeOf((call && call.is$MethodMember()), (otherCall && otherCall.is$MethodMember()));
|
| + return Type._isFunctionSubtypeOf((call && call.is$MethodMember()), (otherCall && otherCall.is$MethodMember()));
|
| }
|
| if ($eq(this.get$genericType(), other.get$genericType()) && $notnull_bool($ne(this.get$typeArgsInOrder(), null)) && $notnull_bool($ne(other.get$typeArgsInOrder(), null)) && this.get$typeArgsInOrder().length == other.get$typeArgsInOrder().length) {
|
| var t = this.get$typeArgsInOrder().iterator$0();
|
| @@ -19039,7 +19038,7 @@ lang_Type.prototype.isSubtypeOf = function(other) {
|
| }
|
| return false;
|
| }
|
| -lang_Type._isFunctionSubtypeOf = function(t, s) {
|
| +Type._isFunctionSubtypeOf = function(t, s) {
|
| if (!$notnull_bool(s.returnType.get$isVoid()) && !$notnull_bool(s.returnType.isAssignable(t.returnType))) {
|
| return false;
|
| }
|
| @@ -19055,49 +19054,49 @@ lang_Type._isFunctionSubtypeOf = function(t, s) {
|
| if (tp.length > sp.length && !$notnull_bool(tp.$index(sp.length).get$isOptional())) return false;
|
| return true;
|
| }
|
| -lang_Type.prototype.addDirectSubtype$1 = function($0) {
|
| - return this.addDirectSubtype(($0 && $0.is$lang_Type()));
|
| +Type.prototype.addDirectSubtype$1 = function($0) {
|
| + return this.addDirectSubtype(($0 && $0.is$Type()));
|
| };
|
| -lang_Type.prototype.ensureSubtypeOf$3 = function($0, $1, $2) {
|
| - return this.ensureSubtypeOf(($0 && $0.is$lang_Type()), ($1 && $1.is$SourceSpan()), $assert_bool($2));
|
| +Type.prototype.ensureSubtypeOf$3 = function($0, $1, $2) {
|
| + return this.ensureSubtypeOf(($0 && $0.is$Type()), ($1 && $1.is$SourceSpan()), $assert_bool($2));
|
| };
|
| -lang_Type.prototype.getConstructor$1 = function($0) {
|
| +Type.prototype.getConstructor$1 = function($0) {
|
| return this.getConstructor($assert_String($0));
|
| };
|
| -lang_Type.prototype.getFactory$2 = function($0, $1) {
|
| - return this.getFactory(($0 && $0.is$lang_Type()), $assert_String($1));
|
| +Type.prototype.getFactory$2 = function($0, $1) {
|
| + return this.getFactory(($0 && $0.is$Type()), $assert_String($1));
|
| };
|
| -lang_Type.prototype.getMember$1 = function($0) {
|
| +Type.prototype.getMember$1 = function($0) {
|
| return this.getMember($assert_String($0));
|
| };
|
| -lang_Type.prototype.getOrMakeConcreteType$1 = function($0) {
|
| +Type.prototype.getOrMakeConcreteType$1 = function($0) {
|
| return this.getOrMakeConcreteType(($0 && $0.is$List$Type()));
|
| };
|
| -lang_Type.prototype.hashCode$0 = function() {
|
| +Type.prototype.hashCode$0 = function() {
|
| return this.hashCode();
|
| };
|
| -lang_Type.prototype.isAssignable$1 = function($0) {
|
| - return this.isAssignable(($0 && $0.is$lang_Type()));
|
| +Type.prototype.isAssignable$1 = function($0) {
|
| + return this.isAssignable(($0 && $0.is$Type()));
|
| };
|
| -lang_Type.prototype.isSubtypeOf$1 = function($0) {
|
| - return this.isSubtypeOf(($0 && $0.is$lang_Type()));
|
| +Type.prototype.isSubtypeOf$1 = function($0) {
|
| + return this.isSubtypeOf(($0 && $0.is$Type()));
|
| };
|
| -lang_Type.prototype.markUsed$0 = function() {
|
| +Type.prototype.markUsed$0 = function() {
|
| return this.markUsed();
|
| };
|
| -lang_Type.prototype.resolveMember$1 = function($0) {
|
| +Type.prototype.resolveMember$1 = function($0) {
|
| return this.resolveMember($assert_String($0));
|
| };
|
| -lang_Type.prototype.resolveTypeParams$1 = function($0) {
|
| +Type.prototype.resolveTypeParams$1 = function($0) {
|
| return this.resolveTypeParams(($0 && $0.is$ConcreteType()));
|
| };
|
| // ********** Code for ParameterType **************
|
| function ParameterType(name, typeParameter) {
|
| this.typeParameter = typeParameter;
|
| // Initializers done
|
| - lang_Type.call(this, name);
|
| + Type.call(this, name);
|
| }
|
| -$inherits(ParameterType, lang_Type);
|
| +$inherits(ParameterType, Type);
|
| ParameterType.prototype.is$ParameterType = function(){return this;};
|
| ParameterType.prototype.get$isClass = function() {
|
| return false;
|
| @@ -19131,7 +19130,7 @@ ParameterType.prototype.getOrMakeConcreteType = function(typeArgs) {
|
| }
|
| ParameterType.prototype.resolveTypeParams = function(inType) {
|
| var $0;
|
| - return (($0 = inType.typeArguments.$index(this.name)) && $0.is$lang_Type());
|
| + return (($0 = inType.typeArguments.$index(this.name)) && $0.is$Type());
|
| }
|
| ParameterType.prototype.addDirectSubtype = function(type) {
|
| world.internalError('no subtypes of type parameters yet', this.get$span());
|
| @@ -19145,7 +19144,7 @@ ParameterType.prototype.resolve = function(inType) {
|
| }
|
| }
|
| ParameterType.prototype.addDirectSubtype$1 = function($0) {
|
| - return this.addDirectSubtype(($0 && $0.is$lang_Type()));
|
| + return this.addDirectSubtype(($0 && $0.is$Type()));
|
| };
|
| ParameterType.prototype.getConstructor$1 = function($0) {
|
| return this.getConstructor($assert_String($0));
|
| @@ -19154,10 +19153,10 @@ ParameterType.prototype.getOrMakeConcreteType$1 = function($0) {
|
| return this.getOrMakeConcreteType(($0 && $0.is$List$Type()));
|
| };
|
| ParameterType.prototype.isSubtypeOf$1 = function($0) {
|
| - return this.isSubtypeOf(($0 && $0.is$lang_Type()));
|
| + return this.isSubtypeOf(($0 && $0.is$Type()));
|
| };
|
| ParameterType.prototype.resolve$1 = function($0) {
|
| - return this.resolve(($0 && $0.is$lang_Type()));
|
| + return this.resolve(($0 && $0.is$Type()));
|
| };
|
| ParameterType.prototype.resolveMember$1 = function($0) {
|
| return this.resolveMember($assert_String($0));
|
| @@ -19169,9 +19168,9 @@ ParameterType.prototype.resolveTypeParams$1 = function($0) {
|
| function NonNullableType(type) {
|
| this.type = type;
|
| // Initializers done
|
| - lang_Type.call(this, type.name);
|
| + Type.call(this, type.name);
|
| }
|
| -$inherits(NonNullableType, lang_Type);
|
| +$inherits(NonNullableType, Type);
|
| NonNullableType.prototype.get$type = function() { return this.type; };
|
| NonNullableType.prototype.get$isNullable = function() {
|
| return false;
|
| @@ -19276,13 +19275,13 @@ NonNullableType.prototype.get$isNativeType = function() {
|
| return this.type.get$isNativeType();
|
| }
|
| NonNullableType.prototype.addDirectSubtype$1 = function($0) {
|
| - return this.addDirectSubtype(($0 && $0.is$lang_Type()));
|
| + return this.addDirectSubtype(($0 && $0.is$Type()));
|
| };
|
| NonNullableType.prototype.getConstructor$1 = function($0) {
|
| return this.getConstructor($assert_String($0));
|
| };
|
| NonNullableType.prototype.getFactory$2 = function($0, $1) {
|
| - return this.getFactory(($0 && $0.is$lang_Type()), $assert_String($1));
|
| + return this.getFactory(($0 && $0.is$Type()), $assert_String($1));
|
| };
|
| NonNullableType.prototype.getMember$1 = function($0) {
|
| return this.getMember($assert_String($0));
|
| @@ -19291,7 +19290,7 @@ NonNullableType.prototype.getOrMakeConcreteType$1 = function($0) {
|
| return this.getOrMakeConcreteType(($0 && $0.is$List$Type()));
|
| };
|
| NonNullableType.prototype.isSubtypeOf$1 = function($0) {
|
| - return this.isSubtypeOf(($0 && $0.is$lang_Type()));
|
| + return this.isSubtypeOf(($0 && $0.is$Type()));
|
| };
|
| NonNullableType.prototype.markUsed$0 = function() {
|
| return this.markUsed();
|
| @@ -19311,9 +19310,9 @@ function ConcreteType(name, genericType, typeArguments, typeArgsInOrder) {
|
| this.members = $map([]);
|
| this.factories = new FactoryMap();
|
| // Initializers done
|
| - lang_Type.call(this, name);
|
| + Type.call(this, name);
|
| }
|
| -$inherits(ConcreteType, lang_Type);
|
| +$inherits(ConcreteType, Type);
|
| ConcreteType.prototype.is$ConcreteType = function(){return this;};
|
| ConcreteType.prototype.get$genericType = function() { return this.genericType; };
|
| ConcreteType.prototype.get$typeArgsInOrder = function() { return this.typeArgsInOrder; };
|
| @@ -19444,19 +19443,19 @@ ConcreteType.prototype.resolveMember = function(memberName) {
|
| }
|
| ConcreteType.prototype.resolveType = function(node, isRequired) {
|
| var ret = this.genericType.resolveType(node, isRequired);
|
| - return (ret && ret.is$lang_Type());
|
| + return (ret && ret.is$Type());
|
| }
|
| ConcreteType.prototype.addDirectSubtype = function(type) {
|
| this.genericType.addDirectSubtype(type);
|
| }
|
| ConcreteType.prototype.addDirectSubtype$1 = function($0) {
|
| - return this.addDirectSubtype(($0 && $0.is$lang_Type()));
|
| + return this.addDirectSubtype(($0 && $0.is$Type()));
|
| };
|
| ConcreteType.prototype.getConstructor$1 = function($0) {
|
| return this.getConstructor($assert_String($0));
|
| };
|
| ConcreteType.prototype.getFactory$2 = function($0, $1) {
|
| - return this.getFactory(($0 && $0.is$lang_Type()), $assert_String($1));
|
| + return this.getFactory(($0 && $0.is$Type()), $assert_String($1));
|
| };
|
| ConcreteType.prototype.getMember$1 = function($0) {
|
| return this.getMember($assert_String($0));
|
| @@ -19485,10 +19484,10 @@ function DefinedType(name, library, definition, isClass) {
|
| this.factories = new FactoryMap();
|
| this._resolvedMembers = $map([]);
|
| // Initializers done
|
| - lang_Type.call(this, name);
|
| + Type.call(this, name);
|
| this.setDefinition(definition);
|
| }
|
| -$inherits(DefinedType, lang_Type);
|
| +$inherits(DefinedType, Type);
|
| DefinedType.prototype.is$DefinedType = function(){return this;};
|
| DefinedType.prototype.get$definition = function() { return this.definition; };
|
| DefinedType.prototype.set$definition = function(value) { return this.definition = value; };
|
| @@ -19994,7 +19993,7 @@ DefinedType.prototype.resolveType = function(node, typeErrors) {
|
| for (var $i = 0;$i < $list.length; $i++) {
|
| var tp = $list.$index($i);
|
| if ($notnull_bool($eq(tp.get$name(), name))) {
|
| - typeRef.type = (tp && tp.is$lang_Type());
|
| + typeRef.type = (tp && tp.is$Type());
|
| }
|
| }
|
| }
|
| @@ -20066,7 +20065,7 @@ DefinedType.prototype.getOrMakeConcreteType = function(typeArgs) {
|
| ret = new ConcreteType($assert_String(concreteName), this, typeMap, typeArgs);
|
| this._concreteTypes.$setindex(concreteName, ret);
|
| }
|
| - return (ret && ret.is$lang_Type());
|
| + return (ret && ret.is$Type());
|
| }
|
| DefinedType.prototype.getCallStub = function(args) {
|
| $assert(this.get$isFunction(), "isFunction", "type.dart", 1251, 12);
|
| @@ -20080,7 +20079,7 @@ DefinedType.prototype.getCallStub = function(args) {
|
| return (stub && stub.is$VarFunctionStub());
|
| }
|
| DefinedType.prototype.addDirectSubtype$1 = function($0) {
|
| - return this.addDirectSubtype(($0 && $0.is$lang_Type()));
|
| + return this.addDirectSubtype(($0 && $0.is$Type()));
|
| };
|
| DefinedType.prototype.addMethod$2 = function($0, $1) {
|
| return this.addMethod($assert_String($0), ($1 && $1.is$FunctionDefinition()));
|
| @@ -20089,7 +20088,7 @@ DefinedType.prototype.getConstructor$1 = function($0) {
|
| return this.getConstructor($assert_String($0));
|
| };
|
| DefinedType.prototype.getFactory$2 = function($0, $1) {
|
| - return this.getFactory(($0 && $0.is$lang_Type()), $assert_String($1));
|
| + return this.getFactory(($0 && $0.is$Type()), $assert_String($1));
|
| };
|
| DefinedType.prototype.getMember$1 = function($0) {
|
| return this.getMember($assert_String($0));
|
| @@ -20504,34 +20503,34 @@ Value.prototype.checkFirstClass$1 = function($0) {
|
| return this.checkFirstClass(($0 && $0.is$SourceSpan()));
|
| };
|
| Value.prototype.convertTo$3 = function($0, $1, $2) {
|
| - return this.convertTo(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Type()), ($2 && $2.is$lang_Node()), false);
|
| + return this.convertTo(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Type()), ($2 && $2.is$Node()), false);
|
| };
|
| Value.prototype.convertTo$4 = function($0, $1, $2, $3) {
|
| - return this.convertTo(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Type()), ($2 && $2.is$lang_Node()), $assert_bool($3));
|
| + return this.convertTo(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Type()), ($2 && $2.is$Node()), $assert_bool($3));
|
| };
|
| Value.prototype.get_$3 = function($0, $1, $2) {
|
| - return this.get_(($0 && $0.is$MethodGenerator()), $assert_String($1), ($2 && $2.is$lang_Node()));
|
| + return this.get_(($0 && $0.is$MethodGenerator()), $assert_String($1), ($2 && $2.is$Node()));
|
| };
|
| Value.prototype.instanceOf$3$isTrue$forceCheck = function($0, $1, $2, isTrue, forceCheck) {
|
| - return this.instanceOf(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Type()), ($2 && $2.is$SourceSpan()), $assert_bool(isTrue), $assert_bool(forceCheck));
|
| + return this.instanceOf(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Type()), ($2 && $2.is$SourceSpan()), $assert_bool(isTrue), $assert_bool(forceCheck));
|
| };
|
| Value.prototype.instanceOf$4 = function($0, $1, $2, $3) {
|
| - return this.instanceOf(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Type()), ($2 && $2.is$SourceSpan()), $assert_bool($3), false);
|
| + return this.instanceOf(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Type()), ($2 && $2.is$SourceSpan()), $assert_bool($3), false);
|
| };
|
| Value.prototype.invoke$4 = function($0, $1, $2, $3) {
|
| - return this.invoke(($0 && $0.is$MethodGenerator()), $assert_String($1), ($2 && $2.is$lang_Node()), ($3 && $3.is$Arguments()), false);
|
| + return this.invoke(($0 && $0.is$MethodGenerator()), $assert_String($1), ($2 && $2.is$Node()), ($3 && $3.is$Arguments()), false);
|
| };
|
| Value.prototype.invoke$4$isDynamic = function($0, $1, $2, $3, isDynamic) {
|
| - return this.invoke(($0 && $0.is$MethodGenerator()), $assert_String($1), ($2 && $2.is$lang_Node()), ($3 && $3.is$Arguments()), $assert_bool(isDynamic));
|
| + return this.invoke(($0 && $0.is$MethodGenerator()), $assert_String($1), ($2 && $2.is$Node()), ($3 && $3.is$Arguments()), $assert_bool(isDynamic));
|
| };
|
| Value.prototype.invoke$5 = function($0, $1, $2, $3, $4) {
|
| - return this.invoke(($0 && $0.is$MethodGenerator()), $assert_String($1), ($2 && $2.is$lang_Node()), ($3 && $3.is$Arguments()), $assert_bool($4));
|
| + return this.invoke(($0 && $0.is$MethodGenerator()), $assert_String($1), ($2 && $2.is$Node()), ($3 && $3.is$Arguments()), $assert_bool($4));
|
| };
|
| Value.prototype.needsConversion$1 = function($0) {
|
| - return this.needsConversion(($0 && $0.is$lang_Type()));
|
| + return this.needsConversion(($0 && $0.is$Type()));
|
| };
|
| Value.prototype.set_$4 = function($0, $1, $2, $3) {
|
| - return this.set_(($0 && $0.is$MethodGenerator()), $assert_String($1), ($2 && $2.is$lang_Node()), ($3 && $3.is$Value()), false);
|
| + return this.set_(($0 && $0.is$MethodGenerator()), $assert_String($1), ($2 && $2.is$Node()), ($3 && $3.is$Value()), false);
|
| };
|
| // ********** Code for EvaluatedValue **************
|
| function EvaluatedValue() {}
|
| @@ -20561,7 +20560,7 @@ function ConstListValue() {}
|
| ConstListValue._internal$ctor = function(type, values, actualValue, canonicalCode, span, code) {
|
| this.values = values;
|
| // Initializers done
|
| - EvaluatedValue._internal$ctor.call(this, (type && type.is$lang_Type()), actualValue, canonicalCode, (span && span.is$SourceSpan()), $assert_String(code));
|
| + EvaluatedValue._internal$ctor.call(this, (type && type.is$Type()), actualValue, canonicalCode, (span && span.is$SourceSpan()), $assert_String(code));
|
| }
|
| ConstListValue._internal$ctor.prototype = ConstListValue.prototype;
|
| $inherits(ConstListValue, EvaluatedValue);
|
| @@ -20573,7 +20572,7 @@ function ConstMapValue() {}
|
| ConstMapValue._internal$ctor = function(type, values, actualValue, canonicalCode, span, code) {
|
| this.values = values;
|
| // Initializers done
|
| - EvaluatedValue._internal$ctor.call(this, (type && type.is$lang_Type()), actualValue, canonicalCode, (span && span.is$SourceSpan()), $assert_String(code));
|
| + EvaluatedValue._internal$ctor.call(this, (type && type.is$Type()), actualValue, canonicalCode, (span && span.is$SourceSpan()), $assert_String(code));
|
| }
|
| ConstMapValue._internal$ctor.prototype = ConstMapValue.prototype;
|
| $inherits(ConstMapValue, EvaluatedValue);
|
| @@ -20590,7 +20589,7 @@ function ConstObjectValue() {}
|
| ConstObjectValue._internal$ctor = function(type, fields, actualValue, canonicalCode, span, code) {
|
| this.fields = fields;
|
| // Initializers done
|
| - EvaluatedValue._internal$ctor.call(this, (type && type.is$lang_Type()), actualValue, canonicalCode, (span && span.is$SourceSpan()), $assert_String(code));
|
| + EvaluatedValue._internal$ctor.call(this, (type && type.is$Type()), actualValue, canonicalCode, (span && span.is$SourceSpan()), $assert_String(code));
|
| }
|
| ConstObjectValue._internal$ctor.prototype = ConstObjectValue.prototype;
|
| $inherits(ConstObjectValue, EvaluatedValue);
|
| @@ -20864,7 +20863,7 @@ World.prototype.runLeg = function() {
|
| var $this = this; // closure support
|
| if (!$notnull_bool(options.enableLeg)) return false;
|
| var res = $assert_bool(this.withTiming('try leg compile', (function () {
|
| - return compile($this);
|
| + return leg_compile($this);
|
| })
|
| ));
|
| if (!$notnull_bool(res) && $notnull_bool(options.legOnly)) {
|
| @@ -21190,7 +21189,7 @@ VarMember.prototype.generate$1 = function($0) {
|
| return this.generate(($0 && $0.is$CodeWriter()));
|
| };
|
| VarMember.prototype.invoke$4 = function($0, $1, $2, $3) {
|
| - return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()));
|
| + return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()));
|
| };
|
| // ********** Code for VarFunctionStub **************
|
| function VarFunctionStub(name, callArgs) {
|
| @@ -21244,7 +21243,7 @@ function VarMethodStub(name, member, args, body) {
|
| $inherits(VarMethodStub, VarMember);
|
| VarMethodStub.prototype.get$returnType = function() {
|
| var $0;
|
| - return (($0 = this.member != null ? this.member.get$returnType() : world.varType) && $0.is$lang_Type());
|
| + return (($0 = this.member != null ? this.member.get$returnType() : world.varType) && $0.is$Type());
|
| }
|
| VarMethodStub.prototype.get$typeName = function() {
|
| return this.member != null ? this.member.declaringType.get$jsname() : 'Object';
|
| @@ -21320,7 +21319,7 @@ VarMethodSet.prototype._invokeMembers = function(context, node) {
|
| objectStub = stub;
|
| }
|
| else if ($ne(type.get$library(), world.get$dom())) {
|
| - VarMethodSet._addVarStub((type && type.is$lang_Type()), (stub && stub.is$VarMember()));
|
| + VarMethodSet._addVarStub((type && type.is$Type()), (stub && stub.is$VarMember()));
|
| }
|
| else {
|
| this._fallbackStubs.add(stub);
|
| @@ -21359,7 +21358,7 @@ VarMethodSet.prototype.generate$1 = function($0) {
|
| return this.generate(($0 && $0.is$CodeWriter()));
|
| };
|
| VarMethodSet.prototype.invoke$4 = function($0, $1, $2, $3) {
|
| - return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$lang_Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()));
|
| + return this.invoke(($0 && $0.is$MethodGenerator()), ($1 && $1.is$Node()), ($2 && $2.is$Value()), ($3 && $3.is$Arguments()));
|
| };
|
| // ********** Code for top level **************
|
| function map(source, mapper) {
|
| @@ -21450,7 +21449,7 @@ function initializeWorld(files) {
|
| world = new World(files);
|
| world.init();
|
| }
|
| -function lang_compile(homedir, args, files) {
|
| +function compile(homedir, args, files) {
|
| parseOptions(homedir, args, files);
|
| initializeWorld(files);
|
| var success = world.compile();
|
| @@ -21486,7 +21485,7 @@ function _getCallStubName(name, args) {
|
| function main() {
|
| var homedir = path.dirname(fs.realpathSync($assert_String(process.argv.$index(1))));
|
| var argv = ListFactory.ListFactory$from$factory(process.argv);
|
| - if ($notnull_bool(lang_compile($assert_String(homedir), (argv && argv.is$List$String()), new NodeFileSystem()))) {
|
| + if ($notnull_bool(compile($assert_String(homedir), (argv && argv.is$List$String()), new NodeFileSystem()))) {
|
| var code = world.getGeneratedCode();
|
| if (!$notnull_bool(options.compileOnly)) {
|
| process.argv = [argv.$index(0), argv.$index(1)];
|
|
|
Chromium Code Reviews
Issue 8572044:
Clean and create output directory when generating docs. (Closed)
Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart