From 722d8ef88037ca3ca0106021c980d2c4d9bf5d1d Mon Sep 17 00:00:00 2001 From: JoostK Date: Wed, 8 Dec 2021 19:35:18 +0100 Subject: [PATCH] refactor(compiler): remove unused code from output logic (#44411) This code is no longer used now that ViewEngine has been removed. PR Close #44411 --- packages/compiler/src/compiler.ts | 2 +- .../compiler/src/output/abstract_emitter.ts | 14 ++------------ .../compiler/src/output/abstract_js_emitter.ts | 18 ------------------ packages/compiler/src/output/output_ast.ts | 6 ------ 4 files changed, 3 insertions(+), 37 deletions(-) diff --git a/packages/compiler/src/compiler.ts b/packages/compiler/src/compiler.ts index b434de7f92c..55d01d22d5a 100644 --- a/packages/compiler/src/compiler.ts +++ b/packages/compiler/src/compiler.ts @@ -53,7 +53,7 @@ export * from './ml_parser/tags'; export {ParseTreeResult, TreeError} from './ml_parser/parser'; export {LexerRange} from './ml_parser/lexer'; export * from './ml_parser/xml_parser'; -export {ArrayType, AssertNotNull, DYNAMIC_TYPE, BinaryOperator, BinaryOperatorExpr, BuiltinMethod, BuiltinType, BuiltinTypeName, BuiltinVar, CastExpr, ClassField, ClassMethod, ClassStmt, CommaExpr, ConditionalExpr, DeclareFunctionStmt, DeclareVarStmt, Expression, ExpressionStatement, ExpressionType, ExpressionVisitor, ExternalExpr, ExternalReference, literalMap, FunctionExpr, IfStmt, InstantiateExpr, InvokeFunctionExpr, LiteralArrayExpr, LiteralExpr, LiteralMapExpr, MapType, NotExpr, NONE_TYPE, ReadKeyExpr, ReadPropExpr, ReadVarExpr, ReturnStatement, StatementVisitor, TaggedTemplateExpr, TemplateLiteral, TemplateLiteralElement, ThrowStmt, TryCatchStmt, Type, TypeVisitor, WrappedNodeExpr, WriteKeyExpr, WritePropExpr, WriteVarExpr, StmtModifier, Statement, STRING_TYPE, TypeofExpr, collectExternalReferences, jsDocComment, leadingComment, LeadingComment, JSDocComment, UnaryOperator, UnaryOperatorExpr, LocalizedString} from './output/output_ast'; +export {ArrayType, AssertNotNull, DYNAMIC_TYPE, BinaryOperator, BinaryOperatorExpr, BuiltinType, BuiltinTypeName, BuiltinVar, CastExpr, ClassField, ClassMethod, ClassStmt, CommaExpr, ConditionalExpr, DeclareFunctionStmt, DeclareVarStmt, Expression, ExpressionStatement, ExpressionType, ExpressionVisitor, ExternalExpr, ExternalReference, literalMap, FunctionExpr, IfStmt, InstantiateExpr, InvokeFunctionExpr, LiteralArrayExpr, LiteralExpr, LiteralMapExpr, MapType, NotExpr, NONE_TYPE, ReadKeyExpr, ReadPropExpr, ReadVarExpr, ReturnStatement, StatementVisitor, TaggedTemplateExpr, TemplateLiteral, TemplateLiteralElement, ThrowStmt, TryCatchStmt, Type, TypeVisitor, WrappedNodeExpr, WriteKeyExpr, WritePropExpr, WriteVarExpr, StmtModifier, Statement, STRING_TYPE, TypeofExpr, collectExternalReferences, jsDocComment, leadingComment, LeadingComment, JSDocComment, UnaryOperator, UnaryOperatorExpr, LocalizedString} from './output/output_ast'; export {EmitterVisitorContext} from './output/abstract_emitter'; export {JitEvaluator} from './output/output_jit'; export * from './parse_util'; diff --git a/packages/compiler/src/output/abstract_emitter.ts b/packages/compiler/src/output/abstract_emitter.ts index 73881ad25f5..bad9cd19a70 100644 --- a/packages/compiler/src/output/abstract_emitter.ts +++ b/packages/compiler/src/output/abstract_emitter.ts @@ -7,6 +7,7 @@ */ import {ParseSourceSpan} from '../parse_util'; + import * as o from './output_ast'; import {SourceMapGenerator} from './source_map'; @@ -16,10 +17,6 @@ const _INDENT_WITH = ' '; export const CATCH_ERROR_VAR = o.variable('error', null, null); export const CATCH_STACK_VAR = o.variable('stack', null, null); -export interface OutputEmitter { - emitStatements(genFilePath: string, stmts: o.Statement[], preamble?: string|null): string; -} - class _EmittedLine { partsLength = 0; parts: string[] = []; @@ -34,7 +31,6 @@ export class EmitterVisitorContext { private _lines: _EmittedLine[]; private _classes: o.ClassStmt[] = []; - private _preambleLineCount = 0; constructor(private _indent: number) { this._lines = [new _EmittedLine(_indent)]; @@ -168,12 +164,8 @@ export class EmitterVisitorContext { return map; } - setPreambleLineCount(count: number) { - return this._preambleLineCount = count; - } - spanOf(line: number, column: number): ParseSourceSpan|null { - const emittedLine = this._lines[line - this._preambleLineCount]; + const emittedLine = this._lines[line]; if (emittedLine) { let columnsLeft = column - _createIndent(emittedLine.indent).length; for (let partIndex = 0; partIndex < emittedLine.parts.length; partIndex++) { @@ -320,8 +312,6 @@ export abstract class AbstractEmitterVisitor implements o.StatementVisitor, o.Ex return null; } - abstract getBuiltinMethodName(method: o.BuiltinMethod): string; - visitInvokeFunctionExpr(expr: o.InvokeFunctionExpr, ctx: EmitterVisitorContext): any { expr.fn.visitExpression(this, ctx); ctx.print(expr, `(`); diff --git a/packages/compiler/src/output/abstract_js_emitter.ts b/packages/compiler/src/output/abstract_js_emitter.ts index 953ad111865..93c501ae367 100644 --- a/packages/compiler/src/output/abstract_js_emitter.ts +++ b/packages/compiler/src/output/abstract_js_emitter.ts @@ -216,22 +216,4 @@ export abstract class AbstractJsEmitterVisitor extends AbstractEmitterVisitor { private _visitParams(params: o.FnParam[], ctx: EmitterVisitorContext): void { this.visitAllObjects(param => ctx.print(null, param.name), params, ctx, ','); } - - override getBuiltinMethodName(method: o.BuiltinMethod): string { - let name: string; - switch (method) { - case o.BuiltinMethod.ConcatArray: - name = 'concat'; - break; - case o.BuiltinMethod.SubscribeObservable: - name = 'subscribe'; - break; - case o.BuiltinMethod.Bind: - name = 'bind'; - break; - default: - throw new Error(`Unknown builtin method: ${method}`); - } - return name; - } } diff --git a/packages/compiler/src/output/output_ast.ts b/packages/compiler/src/output/output_ast.ts index 81a325a1e3d..584d13a33fa 100644 --- a/packages/compiler/src/output/output_ast.ts +++ b/packages/compiler/src/output/output_ast.ts @@ -415,12 +415,6 @@ export class WritePropExpr extends Expression { } } -export enum BuiltinMethod { - ConcatArray, - SubscribeObservable, - Bind -} - export class InvokeFunctionExpr extends Expression { constructor( public fn: Expression, public args: Expression[], type?: Type|null,