aboutsummaryrefslogtreecommitdiffgithub
diff options
context:
space:
mode:
authorAustin Adams <git@austinjadams.com>2019-01-14 18:56:14 -0500
committerAustin Adams <git@austinjadams.com>2019-01-14 18:56:14 -0500
commitabe2f9d94c11bd325a372ec702c13e4b8c17f627 (patch)
tree1d1f9f3ab3c2ffcc476b56b6a29a6fde855958b4
parentf2371c51df1857feb64b4757b6a8cff5102c798c (diff)
downloadnovice-abe2f9d94c11bd325a372ec702c13e4b8c17f627.tar.gz
novice-abe2f9d94c11bd325a372ec702c13e4b8c17f627.tar.xz
Move isa module to top-level
-rw-r--r--novice/assembler/assembler.ts2
-rw-r--r--novice/assembler/codegen/base.ts2
-rw-r--r--novice/assembler/codegen/codegen.ts2
-rw-r--r--novice/assembler/index.ts2
-rw-r--r--novice/assembler/opspec/opspec.ts2
-rw-r--r--novice/assembler/parsers/complx.ts2
-rw-r--r--novice/assembler/parsers/parser.ts2
-rw-r--r--novice/assembler/serializers/complx.ts2
-rw-r--r--novice/assembler/serializers/serializer.ts2
-rw-r--r--novice/isa/index.ts (renamed from novice/assembler/isa/index.ts)0
-rw-r--r--novice/isa/isa.ts (renamed from novice/assembler/isa/isa.ts)0
-rw-r--r--novice/isa/lc3.ts (renamed from novice/assembler/isa/lc3.ts)0
-rw-r--r--novice/isa/state.ts (renamed from novice/assembler/isa/state.ts)0
13 files changed, 9 insertions, 9 deletions
diff --git a/novice/assembler/assembler.ts b/novice/assembler/assembler.ts
index 67b8379..124b5e4 100644
--- a/novice/assembler/assembler.ts
+++ b/novice/assembler/assembler.ts
@@ -1,6 +1,6 @@
import { Readable, Writable } from 'stream';
+import { Isa } from '../isa';
import { MachineCodeGenerator, MachineCodeSection } from './codegen';
-import { Isa } from './isa';
import { PseudoOpSpec } from './opspec';
import { ParsedAssembly, Parser } from './parsers';
import { Scanner } from './scanner';
diff --git a/novice/assembler/codegen/base.ts b/novice/assembler/codegen/base.ts
index 1fbfabd..22776dc 100644
--- a/novice/assembler/codegen/base.ts
+++ b/novice/assembler/codegen/base.ts
@@ -1,4 +1,4 @@
-import { Instruction as IsaInstruction, Isa } from '../isa';
+import { Instruction as IsaInstruction, Isa } from '../../isa';
import { AsmContext, OpOperands, OpSpec, PseudoOpSpec } from '../opspec';
import { Instruction, ParsedAssembly, PseudoOp, Section } from '../parsers';
import { MachineCodeGenerator, MachineCodeSection } from './codegen';
diff --git a/novice/assembler/codegen/codegen.ts b/novice/assembler/codegen/codegen.ts
index e4724fc..92f711f 100644
--- a/novice/assembler/codegen/codegen.ts
+++ b/novice/assembler/codegen/codegen.ts
@@ -1,4 +1,4 @@
-import { Isa } from '../isa';
+import { Isa } from '../../isa';
import { PseudoOpSpec } from '../opspec';
import { ParsedAssembly } from '../parsers';
diff --git a/novice/assembler/index.ts b/novice/assembler/index.ts
index 49e5094..848df0e 100644
--- a/novice/assembler/index.ts
+++ b/novice/assembler/index.ts
@@ -1,7 +1,7 @@
+import { Isa, isas } from '../isa';
import { Assembler, AssemblerConfig } from './assembler';
import { BaseMachineCodeGenerator, MachineCodeGenerator } from './codegen';
import { configs } from './configs';
-import { Isa, isas } from './isa';
import { opSpecs, PseudoOpSpec } from './opspec';
import { Parser, parsers } from './parsers';
import { Serializer, serializers } from './serializers';
diff --git a/novice/assembler/opspec/opspec.ts b/novice/assembler/opspec/opspec.ts
index f7629ea..58dce93 100644
--- a/novice/assembler/opspec/opspec.ts
+++ b/novice/assembler/opspec/opspec.ts
@@ -1,4 +1,4 @@
-import { Isa } from '../isa';
+import { Isa } from '../../isa';
interface AsmContext {
isa: Isa;
diff --git a/novice/assembler/parsers/complx.ts b/novice/assembler/parsers/complx.ts
index a110ecf..27f5a7e 100644
--- a/novice/assembler/parsers/complx.ts
+++ b/novice/assembler/parsers/complx.ts
@@ -1,5 +1,5 @@
// Parser for complx syntax
-import { Isa } from '../isa';
+import { Isa } from '../../isa';
import { ParseTable, ParseTree } from '../lr1';
import { Grammar } from './grammar';
import { grammar, NT, T } from './grammars/complx';
diff --git a/novice/assembler/parsers/parser.ts b/novice/assembler/parsers/parser.ts
index 135816e..e67dd23 100644
--- a/novice/assembler/parsers/parser.ts
+++ b/novice/assembler/parsers/parser.ts
@@ -1,5 +1,5 @@
import { Readable } from 'stream';
-import { Isa } from '../isa';
+import { Isa } from '../../isa';
import { Parser as LR1Parser, ParseTable, ParseTree,
TableGenerator } from '../lr1';
import { Line, Scanner, Token } from '../scanner';
diff --git a/novice/assembler/serializers/complx.ts b/novice/assembler/serializers/complx.ts
index a467ccf..a9cf581 100644
--- a/novice/assembler/serializers/complx.ts
+++ b/novice/assembler/serializers/complx.ts
@@ -1,6 +1,6 @@
import { Writable } from 'stream';
+import { Isa } from '../../isa';
import { MachineCodeSection } from '../codegen';
-import { Isa } from '../isa';
import { Serializer } from './serializer';
class ComplxObjectFileSerializer implements Serializer {
diff --git a/novice/assembler/serializers/serializer.ts b/novice/assembler/serializers/serializer.ts
index 799cd94..333c643 100644
--- a/novice/assembler/serializers/serializer.ts
+++ b/novice/assembler/serializers/serializer.ts
@@ -1,6 +1,6 @@
import { Writable } from 'stream';
+import { Isa } from '../../isa';
import { MachineCodeSection } from '../codegen';
-import { Isa } from '../isa';
interface Serializer {
serialize(isa: Isa, code: MachineCodeSection[], fp: Writable): void;
diff --git a/novice/assembler/isa/index.ts b/novice/isa/index.ts
index 53a5623..53a5623 100644
--- a/novice/assembler/isa/index.ts
+++ b/novice/isa/index.ts
diff --git a/novice/assembler/isa/isa.ts b/novice/isa/isa.ts
index f3dcbaf..f3dcbaf 100644
--- a/novice/assembler/isa/isa.ts
+++ b/novice/isa/isa.ts
diff --git a/novice/assembler/isa/lc3.ts b/novice/isa/lc3.ts
index 6ea91d9..6ea91d9 100644
--- a/novice/assembler/isa/lc3.ts
+++ b/novice/isa/lc3.ts
diff --git a/novice/assembler/isa/state.ts b/novice/isa/state.ts
index 1105d53..1105d53 100644
--- a/novice/assembler/isa/state.ts
+++ b/novice/isa/state.ts