Split binary and lib

Author: NULLx76

Cargo.lock

@@ -1,13 +1,6 @@
-[package]
-name = "roll-rs"
-version = "0.1.0"
-authors = ["Victor Roest <victor@xirion.net>"]
-edition = "2018"
+[workspace]
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-rand_core = {version="0.5", features=["getrandom"] }
-
-[dev-dependencies]
-bnf = "0.3"
+members = [
+ "roll",
+ "roll-lib"
+]

Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "roll-lib"
+version = "0.1.0"
+authors = ["Victor Roest <victor@xirion.net>"]
+edition = "2018"
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[dependencies]
+rand_core = {version="0.5", features=["getrandom"] }
+
+[dev-dependencies]
+bnf = "0.3"

roll-lib/Cargo.toml

@@ -0,0 +1,40 @@
+mod filtermodifier;
+mod interpreter;
+mod options;
+mod parser;
+mod roll;
+
+pub use crate::parser::*;
+pub use crate::roll::*;
+pub use rand_core;
+
+#[cfg(test)]
+mod test {
+ use crate::parser::Parser;
+
+ fn grammar() -> bnf::Grammar {
+ include_str!("../../grammar.bnf").parse().unwrap()
+ }
+
+ fn generate_sentence() -> String {
+ loop {
+ let res = grammar().generate();
+ match res {
+ Ok(i) => break i,
+ Err(bnf::Error::RecursionLimit(_)) => continue,
+ _ => panic!("aaaaa")
+ }
+ }
+ }
+
+ #[test]
+ fn fuzz() {
+ for _ in 0..500 {
+ let sentence = generate_sentence();
+ if let Err(e) = Parser::new(&sentence).advanced().parse() {
+ println!("failed with sentence \"{}\" and error: {:?}", sentence, e);
+ break;
+ }
+ }
+ }
+}

src/filtermodifier.rs renamed to roll-lib/src/filtermodifier.rs

@@ -60,6 +60,30 @@ pub fn roll_die(
  }
 }
 
+const DIR: &[&str] = &[
+ "North",
+ "North East",
+ "East",
+ "South East",
+ "South",
+ "South West",
+ "West",
+ "North West",
+ "Stay",
+];
+
+pub fn roll_direction(rng: impl RngCore) -> String {
+ let value = roll_die(
+ 1,
+ NonZeroU64::new(DIR.len() as u64).unwrap(),
+ FilterModifier::None,
+ rng,
+ );
+ return DIR[value.total as usize - 1].to_string()
+}
+
+
+
 #[cfg(test)]
 mod tests {
  use super::*;

src/interpreter.rs renamed to roll-lib/src/interpreter.rs

@@ -0,0 +1,10 @@
+[package]
+name = "roll"
+version = "0.1.0"
+authors = ["Victor Roest <victor@xirion.net>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+roll-lib = { path = "../roll-lib" }