Macintosh-Tools/moa
1
0
Fork 0
mirror of https://github.com/transistorfet/moa.git synced 2024-12-22 12:29:51 +00:00
Code Issues Projects Releases Wiki Activity

Moved parser to its own library

Browse Source
This commit is contained in:
transistor 2023-04-23 12:40:34 -07:00
parent 1447ca1048
commit f298d1b341
6 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.lock generated
View File

@ -634,6 +634,7 @@ name = "moa_m68k"
version = "0.1.0"
dependencies = [
"moa_core",
"moa_parsing",
]
[[package]]
@ -663,6 +664,13 @@ dependencies = [
"simple_logger",
]
[[package]]
name = "moa_parsing"
version = "0.1.0"
dependencies = [
"moa_core",
]
[[package]]
name = "moa_peripherals_generic"
version = "0.1.0"

1
emulator/core/src/lib.rs
View File

@ -10,7 +10,6 @@ mod signals;
mod system;
pub mod host;
pub mod parser;
pub mod timers;
pub use log::{trace, debug, info, warn, error};

1
emulator/cpus/m68k/Cargo.toml
View File

@ -5,3 +5,4 @@ edition = "2021"
[dependencies]
moa_core = { path = "../../core" }
moa_parsing = { path = "../../libraries/parsing" }

2
emulator/cpus/m68k/src/assembler.rs
View File

@ -2,7 +2,7 @@
use std::collections::HashMap;
use moa_core::Error;
use moa_core::parser::{self, AssemblyLine, AssemblyOperand, AssemblyParser};
use moa_parsing::{self as parser, AssemblyLine, AssemblyOperand, AssemblyParser};
use super::state::M68kType;
use super::instructions::Size;

7
emulator/libraries/parsing/Cargo.toml Normal file
View File

@ -0,0 +1,7 @@
[package]
name = "moa_parsing"
version = "0.1.0"
edition = "2021"
[dependencies]
moa_core = { path = "../../core" }

2
emulator/core/src/parser.rs → emulator/libraries/parsing/src/lib.rs
View File

@ -2,7 +2,7 @@
use std::str::Chars;
use std::iter::Peekable;
use crate::error::Error;
use moa_core::Error;
#[derive(Debug)]