cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf: Don’t subclass Error; resulting in smaller binary (#14160)

Browse Source 
Subclassing errors is problematic since Error returns a
new instance. All of the patching which we do than prevent
proper application of source maps.

PR Close #14160
This commit is contained in:
Miško Hevery
2017-01-27 13:19:00 -08:00
committed by Miško Hevery
parent 3c2842be96
commit c33fda2607
51 changed files with 407 additions and 500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
modules/@angular/compiler/src/css_parser/css_lexer.ts
View File

@ -8,7 +8,6 @@
import * as chars from '../chars';
import {BaseError} from '../facade/errors';
import {isPresent} from '../facade/lang';
export enum CssTokenType {
@ -42,7 +41,7 @@ export enum CssLexerMode {
}
export class LexedCssResult {
constructor(public error: CssScannerError, public token: CssToken) {}
constructor(public error: Error, public token: CssToken) {}
}
export function generateErrorMessage(
@ -86,16 +85,22 @@ export class CssLexer {
}
}
export class CssScannerError extends BaseError {
public rawMessage: string;
public message: string;
export function cssScannerError(token: CssToken, message: string): Error {
const error = Error('CssParseError: ' + message);
(error as any)[ERROR_RAW_MESSAGE] = message;
(error as any)[ERROR_TOKEN] = token;
return error;
}
constructor(public token: CssToken, message: string) {
super('Css Parse Error: ' + message);
this.rawMessage = message;
}
const ERROR_TOKEN = 'ngToken';
const ERROR_RAW_MESSAGE = 'ngRawMessage';
toString(): string { return this.message; }
export function getRawMessage(error: Error): string {
return (error as any)[ERROR_RAW_MESSAGE];
}
export function getToken(error: Error): CssToken {
return (error as any)[ERROR_TOKEN];
}
function _trackWhitespace(mode: CssLexerMode) {
@ -122,7 +127,7 @@ export class CssScanner {
/** @internal */
_currentMode: CssLexerMode = CssLexerMode.BLOCK;
/** @internal */
_currentError: CssScannerError = null;
_currentError: Error = null;
constructor(public input: string, private _trackComments: boolean = false) {
this.length = this.input.length;
@ -221,7 +226,7 @@ export class CssScanner {
// mode so that the parser can recover...
this.setMode(mode);
let error: CssScannerError = null;
let error: Error = null;
if (!isMatchingType || (isPresent(value) && value != next.strValue)) {
let errorMessage =
CssTokenType[next.type] + ' does not match expected ' + CssTokenType[type] + ' value';
@ -230,7 +235,7 @@ export class CssScanner {
errorMessage += ' ("' + next.strValue + '" should match "' + value + '")';
}
error = new CssScannerError(
error = cssScannerError(
next, generateErrorMessage(
this.input, errorMessage, next.strValue, previousIndex, previousLine,
previousColumn));
@ -483,7 +488,7 @@ export class CssScanner {
if (!doNotAdvance) {
this.advance();
}
this._currentError = new CssScannerError(invalidToken, errorMessage);
this._currentError = cssScannerError(invalidToken, errorMessage);
return invalidToken;
}
}

6
modules/@angular/compiler/src/css_parser/css_parser.ts
View File

@ -11,7 +11,7 @@ import {isPresent} from '../facade/lang';
import {ParseError, ParseLocation, ParseSourceFile, ParseSourceSpan} from '../parse_util';
import {BlockType, CssAst, CssAtRulePredicateAst, CssBlockAst, CssBlockDefinitionRuleAst, CssBlockRuleAst, CssDefinitionAst, CssInlineRuleAst, CssKeyframeDefinitionAst, CssKeyframeRuleAst, CssMediaQueryRuleAst, CssPseudoSelectorAst, CssRuleAst, CssSelectorAst, CssSelectorRuleAst, CssSimpleSelectorAst, CssStyleSheetAst, CssStyleValueAst, CssStylesBlockAst, CssUnknownRuleAst, CssUnknownTokenListAst, mergeTokens} from './css_ast';
import {CssLexer, CssLexerMode, CssScanner, CssToken, CssTokenType, generateErrorMessage, isNewline} from './css_lexer';
import {CssLexer, CssLexerMode, CssScanner, CssToken, CssTokenType, generateErrorMessage, getRawMessage, isNewline} from './css_lexer';
const SPACE_OPERATOR = ' ';
@ -378,7 +378,7 @@ export class CssParser {
const token = output.token;
const error = output.error;
if (isPresent(error)) {
this._error(error.rawMessage, token);
this._error(getRawMessage(error), token);
}
this._lastToken = token;
return token;
@ -393,7 +393,7 @@ export class CssParser {
const token = output.token;
const error = output.error;
if (isPresent(error)) {
this._error(error.rawMessage, token);
this._error(getRawMessage(error), token);
}
this._lastToken = token;
return token;