[assembler] Move tape reader leader from base module into assembler.

Rationale: the assembler (and disassembler) code is the only user.

Author: youngman-g

assembler/src/asmlib/driver/output.rs

@@ -4,10 +4,11 @@ use std::path::Path;
 use tracing::{event, span, Level};
 
 use base::prelude::{
-    join_halves, reader_leader, split_halves, u18, u5, u6, unsplay, Address, Instruction, Opcode,
-    OperandAddress, Signed18Bit, SymbolicInstruction, Unsigned18Bit, Unsigned36Bit, Unsigned6Bit,
+    join_halves, split_halves, u18, u5, u6, unsplay, Address, Instruction, Opcode, OperandAddress,
+    Signed18Bit, SymbolicInstruction, Unsigned18Bit, Unsigned36Bit, Unsigned6Bit,
 };
 
+use super::super::readerleader::reader_leader;
 use super::super::types::AssemblerFailure;
 use super::Binary;
 

assembler/src/asmlib/lib.rs

@@ -8,11 +8,13 @@ mod glyph;
 mod lexer;
 mod listing;
 mod parser;
+mod readerleader;
 mod span;
 mod state;
 mod symbol;
 mod symtab;
 mod types;
 
 pub use driver::*;
+pub use readerleader::*;
 pub use types::Fail;

base/src/readerleader.rs assembler/src/asmlib/readerleader.rsbase/src/readerleader.rs renamed to assembler/src/asmlib/readerleader.rs

@@ -1,7 +1,5 @@
-use super::instruction::{Instruction, Opcode, OperandAddress, SymbolicInstruction};
-use super::onescomplement::unsigned::*;
-use super::types::Address;
-use super::{u18, u5, u6};
+use base::instruction::{Instruction, Opcode, OperandAddress, SymbolicInstruction};
+use base::prelude::*;
 
 /// Convert a bit designator (as described in the documentation for
 /// the SKM opcode on page 3-34 of the User Handbook) into an

assembler/src/tx2dis/main.rs

@@ -175,7 +175,7 @@ fn disassemble_chunk<R: Read>(input: &mut R, checksum: &mut Signed18Bit) -> Resu
 }
 
 fn check_header<R: Read>(input: &mut R) -> Result<(), Fail> {
-    let expected_leader = reader_leader();
+    let expected_leader = assembler::reader_leader();
     let header = read_splayed_words(input, expected_leader.len(), None)?;
     for (pos, (want, got)) in expected_leader.iter().zip(header.iter()).enumerate() {
         if want != got {

base/src/lib.rs

@@ -14,7 +14,6 @@ pub mod charset;
 pub mod collections;
 pub mod instruction;
 pub mod prelude;
-pub mod readerleader;
 pub mod splay;
 pub mod subword;
 pub use onescomplement::error;

base/src/prelude.rs

@@ -5,7 +5,6 @@ pub use super::instruction::*;
 pub use super::onescomplement::error::*;
 pub use super::onescomplement::signed::*;
 pub use super::onescomplement::unsigned::*;
-pub use super::readerleader::reader_leader;
 pub use super::splay::{cycle_and_splay, unsplay};
 pub use super::subword::{join_halves, join_quarters, left_half, right_half, split_halves};
 pub use super::types::IndexBy;