From f02c7db4109d1785b4528757aa50f24948e896ae Mon Sep 17 00:00:00 2001 From: Richard Moore Date: Mon, 3 Feb 2020 23:09:32 -0500 Subject: [PATCH] Renamed AST nodes for teh assembler. --- packages/asm/src.ts/assembler.ts | 9 +++++---- packages/asm/src.ts/index.ts | 3 +-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/asm/src.ts/assembler.ts b/packages/asm/src.ts/assembler.ts index bbbab708..fe2cf721 100644 --- a/packages/asm/src.ts/assembler.ts +++ b/packages/asm/src.ts/assembler.ts @@ -195,14 +195,15 @@ export abstract class Node { } } +/* export abstract class CodeNode extends Node { constructor(guard: any, location: Location, options: { [ key: string ]: any }) { logger.checkAbstract(new.target, CodeNode); super(guard, location, options); } } - -export abstract class ValueNode extends CodeNode { +*/ +export abstract class ValueNode extends Node { constructor(guard: any, location: Location, options: { [ key: string ]: any }) { logger.checkAbstract(new.target, ValueNode); super(guard, location, options); @@ -358,7 +359,7 @@ export class OpcodeNode extends ValueNode { } } -export abstract class LabelledNode extends CodeNode { +export abstract class LabelledNode extends Node { readonly name: string; constructor(guard: any, location: Location, name: string, values?: { [ key: string ]: any }) { @@ -467,7 +468,7 @@ export class EvaluationNode extends ValueNode { } } -export class ExecutionNode extends CodeNode { +export class ExecutionNode extends Node { readonly script: string; constructor(guard: any, location: Location, script: string) { diff --git a/packages/asm/src.ts/index.ts b/packages/asm/src.ts/index.ts index 40299baa..4e453fc6 100644 --- a/packages/asm/src.ts/index.ts +++ b/packages/asm/src.ts/index.ts @@ -1,6 +1,6 @@ "use strict"; -import { assemble, CodeNode, DataNode, disassemble, EvaluationNode, ExecutionNode, formatBytecode, LabelNode, LabelledNode, LinkNode, LiteralNode, Node, OpcodeNode, parse, ScopeNode, ValueNode } from "./assembler"; +import { assemble, DataNode, disassemble, EvaluationNode, ExecutionNode, formatBytecode, LabelNode, LabelledNode, LinkNode, LiteralNode, Node, OpcodeNode, parse, ScopeNode, ValueNode } from "./assembler"; import { Opcode } from "./opcodes"; import { AssemblerOptions, AssembleVisitFunc, Bytecode, Location, Operation, VisitFunc } from "./assembler"; @@ -16,7 +16,6 @@ export { parse, // Assembly AST Nodes - CodeNode, DataNode, EvaluationNode, ExecutionNode,