{"header":{"message":"fix: progress on magister script","description":null,"timestamp":"2024-02-27T19:44:21.085336Z","authors":[{}]},"hash":"R4BNXW73CX6FV2YWLIX4T44GACYKT2E4BWNZLVJRSGMKSCOYMLGAC","authors":[{"login":"Jengamon","key":"AFEuLzv5ecUJzaewFwoWh4jeCDqWZztr7dswYwyG9vfU"}],"deps":{"hashes":[["R4BNXW73CX6FV2YWLIX4T44GACYKT2E4BWNZLVJRSGMKSCOYMLGAC","fix: progress on magister script"],["AA",null],["EESTKVPSYRTI5WHXZUTDXHFP2TP474YOAA526J37XNWSVF6J2JLQC","feat: start skecthing how to impl cards"],["IS35SKPK2SBXMJ3GH6SLBAIJQVEX6RQP7NOHCY4FUGWJCT6BU75AC","fix: rename card-event to event"]],"deps":["EESTKVPSYRTI5WHXZUTDXHFP2TP474YOAA526J37XNWSVF6J2JLQC"],"known":["IS35SKPK2SBXMJ3GH6SLBAIJQVEX6RQP7NOHCY4FUGWJCT6BU75AC"]},"hunks":[{"Replacement":{"inode":{"change":2,"pos":252},"path":"magister_script/src/lib.rs","line":3,"ins":{"up_context":[{"change":2,"pos":302}],"down_context":[{"change":2,"pos":362}],"flag":"BLOCK","start":0,"end":41,"inode":{"change":2,"pos":252}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":302},"to":{"change":2,"start":302,"end":362},"introduced_by":2}],"inode":{"change":2,"pos":252}},"ins_contents":[{"Add":"use std::{collections::HashMap, rc::Rc};"}],"del_contents":[{"Del":"use std::{collections::HashMap, rc::Rc, str::MatchIndices};\n"}]}},{"Edit":{"inode":{"change":2,"pos":252},"path":"magister_script/src/lib.rs","line":5,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":363}],"down_context":[{"change":2,"pos":363}],"flag":"BLOCK","start":42,"end":63,"inode":{"change":2,"pos":252}}},"contents":[{"Add":"use chumsky::Parser;"}]}},{"Edit":{"inode":{"change":2,"pos":252},"path":"magister_script/src/lib.rs","line":88,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":2989}],"down_context":[{"change":2,"pos":2989}],"flag":"BLOCK","start":64,"end":288,"inode":{"change":2,"pos":252}}},"contents":[{"Add":" // TODO allow these to refer to amounts"},{"Add":" // 0 [x] static amounts"},{"Add":" // 1 [ ] input variable amounts (cost pre-declared X and Y, overlay count O)"},{"Add":" // 2 [ ] arbitrary amounts (\"number of Horrowshow magister/aides\")"}]}},{"Replacement":{"inode":{"change":2,"pos":252},"path":"magister_script/src/lib.rs","line":128,"ins":{"up_context":[{"change":2,"pos":4180}],"down_context":[{"change":2,"pos":5039}],"flag":"BLOCK","start":289,"end":2540,"inode":{"change":2,"pos":252}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4180},"to":{"change":2,"start":4180,"end":5039},"introduced_by":2}],"inode":{"change":2,"pos":252}},"ins_contents":[{"Add":" fn compact_parser<'a>() -> impl Parser<"},{"Add":" 'a,"},{"Add":" &'a str,"},{"Add":" Vec<(Option, usize)>,"},{"Add":" chumsky::extra::Err>,"},{"Add":" > {"},{"Add":" use chumsky::prelude::*;"},{"Add":" choice(("},{"Add":" just('m')"},{"Add":" .repeated()"},{"Add":" .at_least(1)"},{"Add":" .collect::()"},{"Add":" .map(|s: String| (Some(Color::Mundane), s.len())),"},{"Add":" just('d')"},{"Add":" .repeated()"},{"Add":" .at_least(1)"},{"Add":" .collect::()"},{"Add":" .map(|s: String| (Some(Color::Divine), s.len())),"},{"Add":" just('r')"},{"Add":" .repeated()"},{"Add":" .at_least(1)"},{"Add":" .collect::()"},{"Add":" .map(|s: String| (Some(Color::Revelation), s.len())),"},{"Add":" just('a')"},{"Add":" .repeated()"},{"Add":" .at_least(1)"},{"Add":" .collect::()"},{"Add":" .map(|s: String| (Some(Color::Grace), s.len())),"},{"Add":" just('g')"},{"Add":" .repeated()"},{"Add":" .at_least(1)"},{"Add":" .collect::()"},{"Add":" .map(|s: String| (Some(Color::Growth), s.len())),"},{"Add":" just('u')"},{"Add":" .repeated()"},{"Add":" .at_least(1)"},{"Add":" .collect::()"},{"Add":" .map(|s: String| (Some(Color::Crusade), s.len())),"},{"Add":" just('s')"},{"Add":" .repeated()"},{"Add":" .at_least(1)"},{"Add":" .collect::()"},{"Add":" .map(|s: String| (Some(Color::Suffering), s.len())),"},{"Add":" text::int(10).try_map(|i: &str, span| {"},{"Add":" i.parse::()"},{"Add":" .map(|i| (None, i))"},{"Add":" .map_err(|e| Rich::custom(span, e))"},{"Add":" }),"},{"Add":" ))"},{"Add":" .repeated()"},{"Add":" .collect()"},{"Add":" }"},{"Add":""},{"Add":" fn compact(notation: String) -> Result, String> {"},{"Add":" let notation_input = notation.to_ascii_lowercase();"},{"Add":" let (output, errs) = Self::compact_parser()"},{"Add":" .parse(¬ation_input)"},{"Add":" .into_output_errors();"},{"Add":" match output {"},{"Add":" Some(outputs) => {"},{"Add":" let mut mana = HashMap::new();"},{"Add":" for (maybe_color, count) in outputs.into_iter() {"},{"Add":" *mana.entry(maybe_color).or_insert(0) += count;"}],"del_contents":[{"Del":" fn compact(notation: String) -> Vec {\n let mut mana = HashMap::new();\n let mut start_index = 0;\n let mut end_index = 0;\n let notation = notation.to_ascii_lowercase();\n while start_index < notation.len() {\n // inc end_index\n end_index += 1;\n let slice = ¬ation[start_index..end_index];\n match slice {\n \"m\" => {\n *mana.entry(Some(Color::Mundane)).or_insert(0) += 1;\n start_index = end_index;\n }\n \"d\" => {\n *mana.entry(Some(Color::Divine)).or_insert(0) += 1;\n start_index = end_index;\n }\n \"r\" => {\n *mana.entry(Some(Color::Revelation)).or_insert(0) += 1;\n start_index = end_index;\n"}]}},{"Replacement":{"inode":{"change":2,"pos":252},"path":"magister_script/src/lib.rs","line":192,"ins":{"up_context":[{"change":2,"pos":5057}],"down_context":[{"change":2,"pos":6408}],"flag":"BLOCK","start":2541,"end":3774,"inode":{"change":2,"pos":252}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":5057},"to":{"change":2,"start":5057,"end":6408},"introduced_by":2}],"inode":{"change":2,"pos":252}},"ins_contents":[{"Add":" Ok(mana"},{"Add":" .into_iter()"},{"Add":" .map(|(k, v)| {"},{"Add":" if let Some(color) = k {"},{"Add":" Mana::Color(v, color)"},{"Add":" } else {"},{"Add":" Mana::Any(v)"},{"Add":" }"},{"Add":" })"},{"Add":" .collect())"},{"Add":" }"},{"Add":" None => {"},{"Add":" // Technically incorrect usage (we assume stderr), but w/e, this should"},{"Add":" // be running on desktops/laptops/non-web anyways"},{"Add":" errs.into_iter().for_each(|e| {"},{"Add":" ariadne::Report::build(ariadne::ReportKind::Error, (), e.span().start)"},{"Add":" .with_message(e.to_string())"},{"Add":" .with_label("},{"Add":" ariadne::Label::new(e.span().into_range())"},{"Add":" .with_message(e.reason().to_string())"},{"Add":" .with_color(ariadne::Color::Red),"},{"Add":" )"},{"Add":" .finish()"},{"Add":" .eprint(ariadne::Source::from(¬ation))"},{"Add":" .unwrap()"},{"Add":" });"},{"Add":" Err(format!(\"Failed to parse compact mana string: {notation}\"))"}],"del_contents":[{"Del":" \"a\" => {\n *mana.entry(Some(Color::Grace)).or_insert(0) += 1;\n start_index = end_index;\n }\n \"g\" => {\n *mana.entry(Some(Color::Growth)).or_insert(0) += 1;\n start_index = end_index;\n }\n \"u\" => {\n *mana.entry(Some(Color::Crusade)).or_insert(0) += 1;\n start_index = end_index;\n }\n \"s\" => {\n *mana.entry(Some(Color::Suffering)).or_insert(0) += 1;\n start_index = end_index;\n }\n _ => {\n while end_index <= notation.len()\n && notation[start_index..end_index]\n .chars()\n .all(|c| c.is_digit(10))\n {\n end_index += 1;\n }\n // End index is 1 too high, sub 1\n end_index -= 1;\n let number: usize = notation[start_index..end_index]\n .parse()\n .expect(\"expected parseable base-10 digit string\");\n *mana.entry(None).or_insert(0) += number;\n start_index = end_index;\n }\n"}]}},{"Edit":{"inode":{"change":2,"pos":252},"path":"magister_script/src/lib.rs","line":221,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":6432},"to":{"change":2,"start":6432,"end":6682},"introduced_by":2}],"inode":{"change":2,"pos":252}}},"contents":[{"Del":" mana.into_iter()\n .map(|(k, v)| {\n if let Some(color) = k {\n Mana::Color(v, color)\n } else {\n Mana::Any(v)\n }\n })\n .collect()\n"}]}},{"Edit":{"inode":{"change":2,"pos":8853},"path":"magister_script/Cargo.toml","line":9,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":9038}],"down_context":[{"change":2,"pos":9038}],"flag":"BLOCK","start":3775,"end":3849,"inode":{"change":2,"pos":8853}}},"contents":[{"Add":"ariadne = \"0.4.0\""},{"Add":"chumsky = { version = \"~1.0.0-alpha.6\", features = [] }"}]}}],"owner":"Jengamon","repo":"magister_testbed","token":"Rwpieap9pl3APjLbFDInYD+tA2a1HrYIO97vdKe/eXc=","login":null}

…

Dependencies

Change contents