Splitting vasm and vasm_core

This commit is contained in:
2023-01-01 17:25:00 -06:00
parent 25afdb8890
commit 63d58b63e3
13 changed files with 47 additions and 13 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
[package]
name = "vasm"
name = "vasm_core"
version = "0.1.0"
edition = "2021"
+2 -3
View File
@@ -1,8 +1,8 @@
use std::collections::btree_map::BTreeMap;
use crate::ast::{Label, Scope, VASMLine};
use crate::parse_error::{AssembleError, Location};
use crate::vasm_evaluator::eval;
use crate::vasm_preprocessor::{Line, LineSource};
use std::collections::BTreeMap;
use std::fs;
/// This will solve all the .equ directives and return a symbol table of them.
@@ -163,7 +163,7 @@ fn code_bounds(
/// bytes long and index 0 will represent 0x400.
/// ```
/// assert_eq!(
/// vasm::assemble_snippet(".org 0x400 \n push 5 \n add 7".lines().map(String::from)),
/// vasm_core::assemble_snippet(".org 0x400 \n push 5 \n add 7".lines().map(String::from)),
/// Ok(vec![0x01, 0x05, 0x05, 0x07])
/// )
/// ```
@@ -186,7 +186,6 @@ pub fn assemble_snippet<T: IntoIterator<Item = String>>(
pub fn assemble_file(filename: &str) -> Result<Vec<u8>, AssembleError> {
let lines = lines_from_file(filename)?;
let line_results: Vec<Result<Line, AssembleError>> = LineSource::new(filename, lines, |file| {
println!("Including {}", file);
lines_from_file(file.as_str())
})
.collect();
+1 -1
View File
@@ -1,7 +1,7 @@
use std::collections::vec_deque::VecDeque;
use crate::ast::{Macro, VASMLine};
use crate::parse_error::{AssembleError, Location};
use crate::vasm_parser::parse_vasm_line;
use std::collections::VecDeque;
use std::iter::Enumerate;
#[derive(Debug, PartialEq, Clone)]