{"header":{"message":"update to 0.2.1","description":null,"timestamp":"2022-01-12T13:20:12.355081Z","authors":[{}]},"hash":"YOUD2UWO6XXL3CV6UCF7VDY2SV4VZOALPQNUCQMK37ITYO6YEYAAC","authors":[{"login":"ammkrn","key":"8pRcgpBDWybJEh4eZbHW8iV75uVLVJ5dkoYnwL7kkMgE"}],"deps":{"hashes":[["YOUD2UWO6XXL3CV6UCF7VDY2SV4VZOALPQNUCQMK37ITYO6YEYAAC","update to 0.2.1"],["AA",null],["O7HVFFGPDNLLC3NM7LRNJQTKEMZNACPJARIP35NGBKMGRW5CLEIAC","bump version, refactor math parser, add prec disambiguation map"],["F4Z7XBCF3K6TRYGQT5JW2Y7Z2Y2GELCWCBX2IC5WDYFDIKWBESZQC","forgot to add recursively"],["GR4ZOYWLFJRQARLVGMT4WT5TP5XSMGTBNF5UDUJISDM55CWN62VAC","first commit to pijul"]],"deps":["O7HVFFGPDNLLC3NM7LRNJQTKEMZNACPJARIP35NGBKMGRW5CLEIAC"],"known":["GR4ZOYWLFJRQARLVGMT4WT5TP5XSMGTBNF5UDUJISDM55CWN62VAC","F4Z7XBCF3K6TRYGQT5JW2Y7Z2Y2GELCWCBX2IC5WDYFDIKWBESZQC"]},"hunks":[{"FileDel":{"deleted_names":[{"basename":"short.mmb","metadata":420}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":17},"to":{"change":3,"start":0,"end":11},"introduced_by":3},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":11},"to":{"change":3,"start":12,"end":12},"introduced_by":3}],"inode":{"change":3,"pos":12}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":12},"to":{"change":3,"start":13,"end":736},"introduced_by":3}],"inode":{"change":3,"pos":12}},"content":[]}},{"FileDel":{"deleted_names":[{"basename":"short.mm1","metadata":420}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":17},"to":{"change":3,"start":737,"end":748},"introduced_by":3},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":748},"to":{"change":3,"start":749,"end":749},"introduced_by":3}],"inode":{"change":3,"pos":749}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":749},"to":{"change":3,"start":750,"end":1506},"introduced_by":3}],"inode":{"change":3,"pos":749}},"content":[{"Del":"delimiter $ ( [ { ~ $\n $ } ] ) , $;\n--| Well formed formulas, or propositions - true or false.\nstrict provable sort wff;\n--| Implication: if p, then q.\nterm im (p q: wff): wff; infixr im: $->$ prec 25;\n--| Negation: p is false.\nterm not (p: wff): wff; prefix not: $~$ prec 41;\n\n--| Axiom 1 of Lukasiewicz' axioms for classical propositional logic.\naxiom ax_1 (a b: wff): $ a -> b -> a $;\n--| Axiom 2 of Lukasiewicz' axioms for classical propositional logic.\naxiom ax_2 (a b c: wff): $ (a -> b -> c) -> (a -> b) -> a -> c $;\n--| Axiom 3 of Lukasiewicz' axioms for classical propositional logic.\naxiom ax_3 (a b: wff): $ (~a -> ~b) -> b -> a $;\n--| Modus ponens: from `a -> b` and `a`, infer `b`.\naxiom ax_mp (a b: wff): $ a -> b $ > $ a $ > $ b $;\n"}]}},{"FileDel":{"deleted_names":[{"basename":"short.mm0","metadata":420}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":17},"to":{"change":3,"start":1507,"end":1518},"introduced_by":3},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":1518},"to":{"change":3,"start":1519,"end":1519},"introduced_by":3}],"inode":{"change":3,"pos":1519}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1519},"to":{"change":3,"start":1520,"end":2257},"introduced_by":3}],"inode":{"change":3,"pos":1519}},"content":[{"Del":"delimiter $ ( ) ~ { } , $;\n--| Well formed formulas, or propositions - true or false.\nstrict provable sort wff;\n--| Implication: if p, then q.\nterm im (p q: wff): wff; infixr im: $->$ prec 25;\n--| Negation: p is false.\nterm not (p: wff): wff; prefix not: $~$ prec 41;\n\n--| Axiom 1 of Lukasiewicz' axioms for classical propositional logic.\naxiom ax_1 (a b: wff): $ a -> b -> a $;\n--| Axiom 2 of Lukasiewicz' axioms for classical propositional logic.\naxiom ax_2 (a b c: wff): $ (a -> b -> c) -> (a -> b) -> a -> c $;\n--| Axiom 3 of Lukasiewicz' axioms for classical propositional logic.\naxiom ax_3 (a b: wff): $ (~a -> ~b) -> b -> a $;\n--| Modus ponens: from `a -> b` and `a`, infer `b`.\naxiom ax_mp (a b: wff): $ a -> b $ > $ a $ > $ b $;"}]}},{"AddRoot":{"inode":{"change":1,"pos":1},"atom":{"NewVertex":{"up_context":[{"change":0,"pos":1}],"down_context":[],"flag":"BLOCK | FOLDER","start":2,"end":2,"inode":{"change":1,"pos":1}}},"name":{"NewVertex":{"up_context":[{"change":1,"pos":1}],"down_context":[],"flag":"BLOCK | FOLDER","start":1,"end":1,"inode":{"change":1,"pos":1}}}}},{"FileMove":{"meta":{"basename":"test_resources","metadata":576},"old":[{"basename":"test_resources","metadata":1005}],"up":[{"change":0,"pos":2}],"down":[{"change":3,"pos":17}],"show_perms":true}},{"FileMove":{"meta":{"basename":"g.mm1","metadata":0},"old":[{"basename":"g.mm1","metadata":420}],"up":[{"change":3,"pos":17}],"down":[{"change":3,"pos":2266}],"show_perms":true}},{"FileMove":{"meta":{"basename":"g.mm0","metadata":0},"old":[{"basename":"g.mm0","metadata":420}],"up":[{"change":3,"pos":17}],"down":[{"change":3,"pos":2353}],"show_perms":true}},{"FileMove":{"meta":{"basename":"f.mm1","metadata":0},"old":[{"basename":"f.mm1","metadata":420}],"up":[{"change":3,"pos":17}],"down":[{"change":3,"pos":2439}],"show_perms":true}},{"FileMove":{"meta":{"basename":"f.mm0","metadata":0},"old":[{"basename":"f.mm0","metadata":420}],"up":[{"change":3,"pos":17}],"down":[{"change":3,"pos":2524}],"show_perms":true}},{"FileMove":{"meta":{"basename":"e.mm1","metadata":0},"old":[{"basename":"e.mm1","metadata":420}],"up":[{"change":3,"pos":17}],"down":[{"change":3,"pos":2609}],"show_perms":true}},{"FileMove":{"meta":{"basename":"e.mm0","metadata":0},"old":[{"basename":"e.mm0","metadata":420}],"up":[{"change":3,"pos":17}],"down":[{"change":3,"pos":2694}],"show_perms":true}},{"FileMove":{"meta":{"basename":"diamond","metadata":576},"old":[{"basename":"diamond","metadata":1005}],"up":[{"change":3,"pos":17}],"down":[{"change":3,"pos":2781}],"show_perms":true}},{"FileMove":{"meta":{"basename":"g.mm1","metadata":0},"old":[{"basename":"g.mm1","metadata":420}],"up":[{"change":3,"pos":2781}],"down":[{"change":3,"pos":2790}],"show_perms":true}},{"FileMove":{"meta":{"basename":"g.mm0","metadata":0},"old":[{"basename":"g.mm0","metadata":420}],"up":[{"change":3,"pos":2781}],"down":[{"change":3,"pos":2877}],"show_perms":true}},{"FileMove":{"meta":{"basename":"f.mm1","metadata":0},"old":[{"basename":"f.mm1","metadata":420}],"up":[{"change":3,"pos":2781}],"down":[{"change":3,"pos":2963}],"show_perms":true}},{"FileMove":{"meta":{"basename":"f.mm0","metadata":0},"old":[{"basename":"f.mm0","metadata":420}],"up":[{"change":3,"pos":2781}],"down":[{"change":3,"pos":3048}],"show_perms":true}},{"FileMove":{"meta":{"basename":"e.mm1","metadata":0},"old":[{"basename":"e.mm1","metadata":420}],"up":[{"change":3,"pos":2781}],"down":[{"change":3,"pos":3133}],"show_perms":true}},{"FileMove":{"meta":{"basename":"e.mm0","metadata":0},"old":[{"basename":"e.mm0","metadata":420}],"up":[{"change":3,"pos":2781}],"down":[{"change":3,"pos":3219}],"show_perms":true}},{"FileMove":{"meta":{"basename":"d.mm1","metadata":0},"old":[{"basename":"d.mm1","metadata":420}],"up":[{"change":3,"pos":2781}],"down":[{"change":3,"pos":3304}],"show_perms":true}},{"FileMove":{"meta":{"basename":"d.mm0","metadata":0},"old":[{"basename":"d.mm0","metadata":420}],"up":[{"change":3,"pos":2781}],"down":[{"change":3,"pos":3389}],"show_perms":true}},{"FileMove":{"meta":{"basename":"c.mm1","metadata":0},"old":[{"basename":"c.mm1","metadata":420}],"up":[{"change":3,"pos":2781}],"down":[{"change":3,"pos":3474}],"show_perms":true}},{"FileMove":{"meta":{"basename":"c.mm0","metadata":0},"old":[{"basename":"c.mm0","metadata":420}],"up":[{"change":3,"pos":2781}],"down":[{"change":3,"pos":3607}],"show_perms":true}},{"FileMove":{"meta":{"basename":"b.mm1","metadata":0},"old":[{"basename":"b.mm1","metadata":420}],"up":[{"change":3,"pos":2781}],"down":[{"change":3,"pos":3740}],"show_perms":true}},{"FileMove":{"meta":{"basename":"b.mm0","metadata":0},"old":[{"basename":"b.mm0","metadata":420}],"up":[{"change":3,"pos":2781}],"down":[{"change":3,"pos":3903}],"show_perms":true}},{"FileMove":{"meta":{"basename":"a.mmb","metadata":0},"old":[{"basename":"a.mmb","metadata":420}],"up":[{"change":3,"pos":2781}],"down":[{"change":3,"pos":4021}],"show_perms":true}},{"Replacement":{"inode":{"change":3,"pos":4021},"path":"test_resources/diamond/a.mmb","line":1,"ins":{"up_context":[{"change":3,"pos":4021}],"down_context":[],"flag":"BLOCK","start":371,"end":1667,"inode":{"change":3,"pos":4021}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":4021},"to":{"change":3,"start":4022,"end":5586},"introduced_by":3}],"inode":{"change":3,"pos":4021}},"ins_contents":[],"del_contents":[]}},{"FileMove":{"meta":{"basename":"a.mm1","metadata":0},"old":[{"basename":"a.mm1","metadata":420}],"up":[{"change":3,"pos":2781}],"down":[{"change":3,"pos":5595}],"show_perms":true}},{"FileMove":{"meta":{"basename":"a.mm0","metadata":0},"old":[{"basename":"a.mm0","metadata":420}],"up":[{"change":3,"pos":2781}],"down":[{"change":3,"pos":5716}],"show_perms":true}},{"FileMove":{"meta":{"basename":"d.mm1","metadata":0},"old":[{"basename":"d.mm1","metadata":420}],"up":[{"change":3,"pos":17}],"down":[{"change":3,"pos":5837}],"show_perms":true}},{"FileMove":{"meta":{"basename":"d.mm0","metadata":0},"old":[{"basename":"d.mm0","metadata":420}],"up":[{"change":3,"pos":17}],"down":[{"change":3,"pos":5922}],"show_perms":true}},{"FileMove":{"meta":{"basename":"cycle","metadata":576},"old":[{"basename":"cycle","metadata":1005}],"up":[{"change":3,"pos":17}],"down":[{"change":3,"pos":6007}],"show_perms":true}},{"FileMove":{"meta":{"basename":"cycleB.mm0","metadata":0},"old":[{"basename":"cycleB.mm0","metadata":420}],"up":[{"change":3,"pos":6007}],"down":[{"change":3,"pos":6021}],"show_perms":true}},{"FileMove":{"meta":{"basename":"cycleA.mm0","metadata":0},"old":[{"basename":"cycleA.mm0","metadata":420}],"up":[{"change":3,"pos":6007}],"down":[{"change":3,"pos":6104}],"show_perms":true}},{"FileMove":{"meta":{"basename":"cycle.mmb","metadata":0},"old":[{"basename":"cycle.mmb","metadata":420}],"up":[{"change":3,"pos":6007}],"down":[{"change":3,"pos":6186}],"show_perms":true}},{"Edit":{"inode":{"change":3,"pos":6186},"path":"test_resources/cycle/cycle.mmb","line":1,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":6186}],"down_context":[],"flag":"BLOCK","start":1818,"end":3114,"inode":{"change":3,"pos":6186}}},"contents":[]}},{"FileMove":{"meta":{"basename":"c.mm1","metadata":0},"old":[{"basename":"c.mm1","metadata":420}],"up":[{"change":3,"pos":17}],"down":[{"change":3,"pos":6196}],"show_perms":true}},{"FileMove":{"meta":{"basename":"c.mm0","metadata":0},"old":[{"basename":"c.mm0","metadata":420}],"up":[{"change":3,"pos":17}],"down":[{"change":3,"pos":6313}],"show_perms":true}},{"FileMove":{"meta":{"basename":"b.mm1","metadata":0},"old":[{"basename":"b.mm1","metadata":420}],"up":[{"change":3,"pos":17}],"down":[{"change":3,"pos":6430}],"show_perms":true}},{"FileMove":{"meta":{"basename":"b.mm0","metadata":0},"old":[{"basename":"b.mm0","metadata":420}],"up":[{"change":3,"pos":17}],"down":[{"change":3,"pos":6593}],"show_perms":true}},{"FileMove":{"meta":{"basename":"a.mmb","metadata":0},"old":[{"basename":"a.mmb","metadata":420}],"up":[{"change":3,"pos":17}],"down":[{"change":3,"pos":6711}],"show_perms":true}},{"Replacement":{"inode":{"change":3,"pos":6711},"path":"test_resources/a.mmb","line":1,"ins":{"up_context":[{"change":3,"pos":6711}],"down_context":[],"flag":"BLOCK","start":3200,"end":4496,"inode":{"change":3,"pos":6711}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":6711},"to":{"change":3,"start":6712,"end":8276},"introduced_by":3}],"inode":{"change":3,"pos":6711}},"ins_contents":[],"del_contents":[]}},{"FileMove":{"meta":{"basename":"a.mm1","metadata":0},"old":[{"basename":"a.mm1","metadata":420}],"up":[{"change":3,"pos":17}],"down":[{"change":3,"pos":8285}],"show_perms":true}},{"FileMove":{"meta":{"basename":"a.mm0","metadata":0},"old":[{"basename":"a.mm0","metadata":420}],"up":[{"change":3,"pos":17}],"down":[{"change":3,"pos":8406}],"show_perms":true}},{"FileMove":{"meta":{"basename":"src","metadata":576},"old":[{"basename":"src","metadata":1005}],"up":[{"change":0,"pos":2}],"down":[{"change":3,"pos":24}],"show_perms":true}},{"FileMove":{"meta":{"basename":"util.rs","metadata":0},"old":[{"basename":"util.rs","metadata":420}],"up":[{"change":3,"pos":24}],"down":[{"change":3,"pos":8529}],"show_perms":true}},{"Edit":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":1,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8529},"to":{"change":3,"start":8530,"end":8600},"introduced_by":3}],"inode":{"change":3,"pos":8529}}},"contents":[{"Del":"use std::convert::{ TryFrom, TryInto };\nuse std::marker::PhantomData;\n"}]}},{"Edit":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":3,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8724},"to":{"change":3,"start":8724,"end":8959},"introduced_by":3}],"inode":{"change":3,"pos":8529}}},"contents":[{"Del":"\nuse crate::mmb::unify::UnifyIter;\nuse crate::mmb::proof::ProofIter;\nuse crate::mmb::stmt::StmtCmd;\n\n\n/// 10000000_11111111_11111111_11111111_11111111_11111111_11111111_11111111\nconst TYPE_SORT_MASK: u64 = (1 << 63) | ((1 << 56) - 1);\n"}]}},{"Edit":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":4,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":8960}],"down_context":[{"change":3,"pos":8960}],"flag":"BLOCK","start":4565,"end":4652,"inode":{"change":3,"pos":8529}}},"contents":[{"Add":"use mm0b_parser::NumdStmtCmd;"},{"Add":"use mm0b_parser::ProofIter;"},{"Add":"use mm0b_parser::ParseError;"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":16,"ins":{"up_context":[{"change":3,"pos":9118}],"down_context":[{"change":3,"pos":9140}],"flag":"BLOCK","start":4653,"end":4677,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":9118},"to":{"change":3,"start":9118,"end":9140},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":"macro_rules! none_err {"}],"del_contents":[{"Del":"macro_rules! io_err {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":18,"ins":{"up_context":[{"change":3,"pos":9161}],"down_context":[{"change":3,"pos":9232}],"flag":"BLOCK","start":4678,"end":4732,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":9161},"to":{"change":3,"start":9161,"end":9232},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":" $e.ok_or(VerifErr::NoneErr(file!(), line!()))"}],"del_contents":[{"Del":" $e.map_err(|e| VerifErr::IoErr(file!(), line!(), Box::new(e)))\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":23,"ins":{"up_context":[{"change":3,"pos":9257}],"down_context":[{"change":3,"pos":9281}],"flag":"BLOCK","start":4733,"end":4757,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":9257},"to":{"change":3,"start":9257,"end":9281},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":"macro_rules! conv_err {"}],"del_contents":[{"Del":"macro_rules! none_err {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":25,"ins":{"up_context":[{"change":3,"pos":9302}],"down_context":[{"change":3,"pos":9356}],"flag":"BLOCK","start":4758,"end":4818,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":9302},"to":{"change":3,"start":9302,"end":9356},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":" $e.map_err(|_| VerifErr::ConvErr(file!(), line!()))"}],"del_contents":[{"Del":" $e.ok_or(VerifErr::NoneErr(file!(), line!()))\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":30,"ins":{"up_context":[{"change":3,"pos":9381}],"down_context":[{"change":3,"pos":9486}],"flag":"BLOCK","start":4819,"end":4923,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":9381},"to":{"change":3,"start":9381,"end":9486},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":"macro_rules! io_err {"},{"Add":" ( $r:expr ) => {"},{"Add":" $r.map_err(|e| VerifErr::IoErr(file!(), line!(), e))"}],"del_contents":[{"Del":"macro_rules! conv_err {\n ( $e:expr ) => {\n $e.map_err(|_| VerifErr::ConvErr(file!(), line!()))\n"}]}},{"Edit":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":45,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":9656},"to":{"change":3,"start":9656,"end":11565},"introduced_by":3}],"inode":{"change":3,"pos":8529}}},"contents":[{"Del":"macro_rules! bin_parser {\n ( $(($name: ident, $t:ident))* ) => {\n $(\n pub fn $name(source: &[u8]) -> Res<($t, &[u8])> {\n let int_bytes =\n source\n .get(0..std::mem::size_of::<$t>())\n .ok_or_else(|| {\n VerifErr::Msg(format!(\"binary parser ran out of input @ {}: {}\", file!(), line!()))\n })?;\n\n let new_pos = std::mem::size_of::<$t>();\n Ok(\n ($t::from_le_bytes(int_bytes.try_into().unwrap()), &source[new_pos..])\n )\n }\n )*\n };\n}\n\nbin_parser! {\n (parse_u8, u8)\n (parse_u16, u16)\n (parse_u32, u32)\n (parse_u64, u64)\n}\n\nmacro_rules! bitwise_inner {\n ( $($t:ident),* ) => {\n $(\n impl std::ops::BitAnd<$t> for $t {\n type Output = Self;\n fn bitand(self, rhs: Self) -> Self::Output {\n $t { inner: self.inner & rhs.inner }\n }\n }\n\n impl std::ops::BitAndAssign<$t> for $t {\n fn bitand_assign(&mut self, other: Self) {\n self.inner &= other.inner\n }\n }\n\n impl std::ops::BitOr<$t> for $t {\n type Output = Self;\n fn bitor(self, rhs: Self) -> Self::Output {\n $t { inner: self.inner | rhs.inner }\n }\n }\n\n impl std::ops::BitOrAssign<$t> for $t {\n fn bitor_assign(&mut self, other: Self) {\n self.inner |= other.inner\n }\n }\n\n impl std::ops::Not for $t {\n type Output = $t;\n fn not(self) -> Self::Output {\n $t { inner: !self.inner }\n }\n }\n )*\n }\n}\n\nbitwise_inner!(Type, Mods);\n\n\n"}]}},{"Edit":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":47,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":11666},"to":{"change":3,"start":11666,"end":11739},"introduced_by":3}],"inode":{"change":3,"pos":8529}}},"contents":[{"Del":"pub type SortNum = u8;\npub type TermNum = u32;\npub type AssertNum = u32;\n"}]}},{"Edit":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":51,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":11844},"to":{"change":3,"start":11844,"end":11954},"introduced_by":3}],"inode":{"change":3,"pos":8529}}},"contents":[{"Del":"\n#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]\npub struct Ptr<'a, A>(pub u32, pub PhantomData<&'a A>);\n\n\n"}]}},{"Edit":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":68,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":12320},"to":{"change":3,"start":12320,"end":12322},"introduced_by":3}],"inode":{"change":3,"pos":8529}}},"contents":[{"Del":"\n\n"}]}},{"Edit":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":73,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":12412},"to":{"change":3,"start":12412,"end":15809},"introduced_by":3}],"inode":{"change":3,"pos":8529}}},"contents":[{"Del":"}\n\npub type Arg = Type;\n\n#[derive(Clone, Copy, PartialEq, Eq, Hash)]\npub struct Type {\n pub inner: u64\n}\n\nimpl std::default::Default for Type {\n fn default() -> Self {\n Type { inner: 0 }\n }\n}\n\nimpl Type {\n pub fn high_bit(self) -> Self {\n Type { inner: self.inner & (!crate::mmb::TYPE_DEPS_MASK) }\n }\n\n pub fn disjoint(self, other: Self) -> bool {\n (self.inner & other.inner) == 0\n }\n\n pub fn new_bound() -> Self {\n Type { inner: 1 << 63 }\n }\n \n pub fn new(bound: bool) -> Self {\n if bound {\n Type { inner: 1 << 63 }\n } else {\n Type { inner: 0 }\n }\n }\n\n pub fn new_with_sort(sort_num: u8) -> Self {\n Type { inner: (sort_num as u64) << 56 }\n }\n\n #[inline]\n pub fn is_bound(self) -> bool {\n self.inner & (1 << 63) != 0\n }\n \n pub fn add_sort(&mut self, sort_id: u8) {\n // clear existing sort if any;\n self.inner &= TYPE_SORT_MASK;\n // Add new sort\n self.inner |= ((sort_id as u64) << 56);\n }\n\n\n /// Add a dependency on bv_idx\n pub fn add_dep(&mut self, bv_idx: u64) {\n self.inner |= 1 << bv_idx.checked_sub(1).expect(\"No 0th bv to depend on\")\n }\n\n pub fn sort(self) -> u8 {\n u8::try_from((self.inner >> 56) & 0x7F).unwrap()\n }\n\n pub fn depends_on_(self, j: u64) -> bool {\n self.inner & (1u64 << j.checked_sub(1).expect(\"No 0th to depend on\")) != 0\n }\n\n /// If this is the type of a bound variable, return a u64 \n /// whose only activated bit is the bit indicating which bv\n /// it is.\n pub fn bound_digit(self) -> Res {\n if self.is_bound() {\n Ok(self.inner & !(0xFF << 56))\n } else {\n Err(VerifErr::Msg(format!(\"Not bound\")))\n }\n }\n\n /// The POSITION (1 - 55) of this bound variable, NOT the literal u64.\n pub fn bound_pos(self) -> Res {\n if self.is_bound() {\n for i in 0..56 {\n if ((1 << i) & self.inner) != 0 {\n return Ok(i + 1)\n }\n }\n Err(VerifErr::Msg(format!(\"should be unreachable\")))\n } else {\n Err(VerifErr::Msg(format!(\"Not bound\")))\n }\n }\n\n pub fn has_deps(self) -> bool {\n if self.is_bound() {\n false\n } else {\n (self.inner & crate::mmb::TYPE_DEPS_MASK) > 0\n }\n }\n\n /// If this is a regular/not-bound variable, return a u64\n /// whose only activated bits are the ones marking the bvs\n /// on which it depends.\n pub fn deps(self) -> Res {\n if !self.is_bound() {\n Ok(self.inner & !(0xFF << 56))\n } else {\n Err(VerifErr::Msg(format!(\"No deps\")))\n }\n }\n}\n\n#[test]\nfn bound1() {\n let mut t1 = Type::new_bound();\n t1 |= Type { inner: (1 << 15) };\n assert_eq!(t1.bound_pos().unwrap(), 16);\n}\n\n#[test]\nfn bound2() {\n let mut t1 = Type::new_bound();\n t1 |= Type { inner: (1 << 0) };\n assert_eq!(t1.bound_pos().unwrap(), 1);\n}\n\n#[test]\nfn bound3() {\n let mut t1 = Type::new_bound();\n t1 |= Type { inner: (1 << 55) };\n assert_eq!(t1.bound_pos().unwrap(), 56);\n}\n\n#[test]\nfn bound_err1() {\n let t1 = Type::new_bound();\n assert!(t1.bound_pos().is_err())\n}\n\n#[test]\nfn bound_err2() {\n let t1 = Type::new(false);\n assert!(t1.bound_pos().is_err())\n"}]}},{"Edit":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":74,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":15811},"to":{"change":3,"start":15811,"end":16003},"introduced_by":3}],"inode":{"change":3,"pos":8529}}},"contents":[{"Del":"\n#[test]\nfn deps1() {\n let t0 = Type { inner: 0 };\n let mut t1_v = Type { inner: 0 };\n let mut t1 = Type { inner: 0 };\n let t2 = Type { inner: 1 };\n let t3 = Type::new_bound();\n"}]}},{"Edit":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":75,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":16004},"to":{"change":3,"start":16004,"end":16613},"introduced_by":3}],"inode":{"change":3,"pos":8529}}},"contents":[{"Del":" assert!(!t0.has_deps());\n assert!(!t1.has_deps());\n assert!(t2.has_deps());\n assert!(!t3.has_deps());\n\n assert_eq!(t2.deps().unwrap(), 1);\n t1.add_dep(1);\n t1.add_dep(2);\n t1.add_dep(4);\n assert!(t1.has_deps());\n assert_eq!(t1.deps().unwrap(), 11);\n\n t1_v.add_dep(4);\n t1_v.add_dep(1);\n t1_v.add_dep(2);\n assert!(t1_v.has_deps());\n assert_eq!(t1_v.deps().unwrap(), 11);\n println!(\"t3: {:?}\", t3);\n let bound_1 = Type { inner: Type::new_bound().inner | (1 << 8) };\n println!(\"bound idx: {:?}\", bound_1.bound_digit());\n assert!(bound_1.is_bound());\n}\n\n\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":83,"ins":{"up_context":[{"change":3,"pos":16806}],"down_context":[{"change":3,"pos":16878}],"flag":"BLOCK","start":4924,"end":4997,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":16806},"to":{"change":3,"start":16806,"end":16878},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":" // Create a rough backtrace; use the `localize!` macro to make this."}],"del_contents":[{"Del":" // Crate a rough backtrace; use the `localize!` macro to make this.\n"}]}},{"Edit":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":135,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":18743},"to":{"change":3,"start":18743,"end":30585},"introduced_by":3}],"inode":{"change":3,"pos":8529}}},"contents":[{"Del":" }\n }\n}\n\n /// A reference to an entry in the term table.\n#[derive(Debug, Clone, Copy)]\npub struct Term<'a> {\n /// The sort of the term.\n pub term_num: u32,\n pub sort: u8,\n /// Number of args NOT including `ret`\n pub args_start: &'a [u8],\n // The pointer to the start of the unify stream.\n pub unify: UnifyIter<'a>,\n}\n\n/// An iterator over the arguments of a term/assertion that doesn't require allocation\n/// of a vector, instead reading them from the source file each time.\n#[derive(Debug, Clone, Copy)]\npub struct Args<'a> {\n source: &'a [u8],\n}\n\nimpl<'a> DoubleEndedIterator for Args<'a> {\n fn next_back(&mut self) -> Option {\n if self.source.is_empty() {\n None\n } else {\n let split = self.source.len().checked_sub(8)?;\n let (lhs, rhs) = self.source.split_at(split);\n self.source = lhs;\n match parse_u64(rhs) {\n Err(_) => unreachable!(\"Should have been guaranteed by check in `prefix_args`\"),\n Ok((parsed, rest)) => {\n assert!(rest.is_empty());\n Some(Type { inner: parsed })\n }\n }\n }\n }\n}\n\n\nimpl<'a> ExactSizeIterator for Args<'a> {\n fn len(&self) -> usize {\n self.source.len() / std::mem::size_of::()\n }\n}\n\nimpl<'a> Iterator for Args<'a> {\n type Item = Arg;\n fn next(&mut self) -> Option {\n if self.source.is_empty() {\n return None\n }\n match parse_u64(self.source) {\n Err(_) => unreachable!(\"Should have been guaranteed by check in `prefix_args`\"),\n Ok((parsed, rest)) => {\n self.source = rest;\n Some(Type { inner: parsed })\n }\n }\n }\n\n // Needed for `len` to work correctly.\n fn size_hint(&self) -> (usize, Option) {\n (\n self.source.len() / std::mem::size_of::(),\n Some(self.source.len() / std::mem::size_of::())\n )\n }\n}\n\n\n#[test]\nfn args_back1() {\n let s1 = &[\n 10, 11, 12, 13, 14, 15, 16, 17,\n 18, 19, 20, 21, 22, 23, 24, 25,\n 26, 27, 28, 29, 30, 31, 32, 33\n ];\n let s2 = &[\n 10, 11, 12, 13, 14, 15, 16, 17,\n 18, 19, 20, 21, 22, 23, 24, 25,\n ];\n let s3 = &[\n 10, 11, 12, 13, 14, 15, 16, 17,\n ];\n let tgt1 = [26, 27, 28, 29, 30, 31, 32, 33];\n let tgt2 = [18, 19, 20, 21, 22, 23, 24, 25];\n let tgt3 = [10, 11, 12, 13, 14, 15, 16, 17];\n\n let mut args = Args { source: s1 };\n let back = args.next_back().unwrap();\n assert_eq!(back.inner, u64::from_le_bytes(tgt1));\n assert_eq!(args.source, s2);\n let back = args.next_back().unwrap();\n assert_eq!(back.inner, u64::from_le_bytes(tgt2));\n assert_eq!(args.source, s3);\n let back = args.next_back().unwrap();\n assert_eq!(back.inner, u64::from_le_bytes(tgt3));\n assert!(args.source.is_empty());\n}\n\n\n#[test]\nfn args_back_err1() {\n let s1 = &[10, 11, 12, 13, 14, 15, 16];\n let mut args = Args { source: s1 };\n let back = args.next_back();\n assert!(back.is_none());\n}\n\n#[test]\nfn args_no_ret1() {\n let fake_unify = UnifyIter { buf: &[], pos: 0 };\n let s1 = &[\n 10, 11, 12, 13, 14, 15, 16, 17,\n 18, 19, 20, 21, 22, 23, 24, 25,\n 26, 27, 28, 29, 30, 31, 32, 33\n ];\n let t = Term { term_num: 0, sort: 0, args_start: s1, unify: fake_unify };\n let s2 = &[\n 10, 11, 12, 13, 14, 15, 16, 17,\n 18, 19, 20, 21, 22, 23, 24, 25,\n ];\n\n let args_no_ret = t.args_no_ret();\n assert_eq!(args_no_ret.source, s2);\n}\n\n#[test]\nfn args_no_ret2() {\n let fake_unify = UnifyIter { buf: &[], pos: 0 };\n let s1 = &[\n 10, 11, 12, 13, 14, 15, 16, 17,\n ];\n let t = Term { term_num: 0, sort: 0, args_start: s1, unify: fake_unify };\n\n let args_no_ret = t.args_no_ret();\n assert_eq!(args_no_ret.source, &[]);\n}\n\nimpl<'a> Term<'a> {\n\n /// Returns true if this is a `def`, false for a `term`.\n #[inline]\n pub fn is_def(&self) -> bool {\n self.sort & 0x80 != 0\n }\n /// The return sort of this term/def.\n #[inline]\n pub fn sort(&self) -> SortNum {\n self.sort & 0x7F\n }\n\n /// args; including the `ret` element at the end.\n #[inline]\n pub fn args(&self) -> Args<'a> {\n Args {\n source: self.args_start,\n }\n }\n\n /// args without the `ret` element at the end.\n /// This will panic if there are less than 8 bytes in `source`,\n /// which seems fine for now, since that would mean we had an invalid `Args` \n /// to start with.\n #[inline]\n pub fn args_no_ret(&self) -> Args<'a> {\n Args {\n source: &self.args_start[..(self.args_start.len() - std::mem::size_of::())],\n }\n } \n\n pub fn num_args_no_ret(&self) -> u16 {\n u16::try_from(self.args().len().checked_sub(1).unwrap()).unwrap()\n }\n\n /// The return sort and dependencies.\n pub fn ret(&self) -> Type {\n self.args().last().unwrap()\n }\n\n /// The beginning of the unify stream for the term.\n #[inline]\n pub fn unify(&self) -> UnifyIter<'_> {\n self.unify.clone()\n }\n}\n\n/// A reference to an entry in the theorem table.\n#[derive(Debug, Clone, Copy)]\npub struct Assert<'a> {\n /// The array of arguments.\n // `Arg` is a u64\n pub assert_num: u32,\n pub args_start: &'a [u8],\n /// The pointer to the start of the unify stream.\n pub unify: UnifyIter<'a>,\n}\n\nimpl<'a> Assert<'a> {\n /// The list of arguments of this axiom/theorem.\n #[inline]\n pub fn args(&self) -> Args<'a> {\n Args {\n source: self.args_start,\n }\n }\n\n /// The beginning of the unify stream.\n #[inline]\n pub fn unify(&self) -> UnifyIter<'a> {\n self.unify.clone()\n }\n\n pub fn num_args(&self) -> u16 {\n u16::try_from(self.args().len()).unwrap()\n }\n}\n\n#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]\n#[repr(transparent)]\npub struct Mods {\n pub inner: u8,\n}\n\n#[test]\nfn test_mods1() {\n let m = Mods { inner: 1 };\n assert!(!m.is_provable());\n let m = Mods { inner: 2 };\n assert!(!m.is_provable());\n let m = Mods { inner: 4 };\n assert!(m.is_provable());\n let m = Mods { inner: 8 };\n assert!(!m.is_provable());\n let m = Mods { inner: 3 };\n assert!(!m.is_provable());\n let m = Mods { inner: 12 };\n assert!(m.is_provable());\n let m = Mods { inner: 7 };\n assert!(m.is_provable());\n}\n\nimpl Mods {\n pub fn new() -> Self {\n Mods { inner: 0u8 }\n }\n\n pub fn is_provable(self) -> bool {\n (self.inner & Mods::provable().inner) != 0\n }\n\n pub fn pure() -> Self {\n Mods { inner: 1 }\n }\n \n pub fn strict() -> Self {\n Mods { inner: 2 }\n }\n\n pub fn provable() -> Self {\n Mods { inner: 4 }\n }\n\n pub fn free() -> Self {\n Mods { inner: 8 }\n }\n}\n\n/// An iterator over the declaration stream. This is the main provider of \n/// verification obligations for mmb items, giving you both the target (for example,\n/// `public term, number 13`) as well as the proof stream. The unification stream\n/// Is later looked up using the item number when it's needed.\n#[derive(Debug, Clone)]\npub struct DeclIter<'a> {\n /// The full source file.\n pub mmb: &'a [u8],\n /// The index of the current declaration in the file.\n /// Starts at `proof_stream_start` from the header file.\n pub pos: usize,\n pub next_sort_num: u8,\n pub next_termdef_num: u32,\n pub next_assert_num: u32,\n}\n\n/// We pair the item number (sortnum, termnum, assertnum) with the statement\n/// So that during parallel checking of mmb declarations, we know which item is\n/// which, since they may be checked out of order.\nimpl<'a> Iterator for DeclIter<'a> {\n type Item = Result<(StmtCmd, ProofIter<'a>), VerifErr>;\n fn next(&mut self) -> Option {\n match try_next_decl(self.mmb, self.pos)? {\n Err(e) => Some(Err(e)),\n Ok((stmt, pr, rest)) => {\n let stmt = match stmt {\n StmtCmd::Sort {..} => {\n let num = self.next_sort_num;\n self.next_sort_num += 1;\n StmtCmd::Sort { num: Some(num) }\n }\n StmtCmd::TermDef {local, ..} => {\n let num = self.next_termdef_num;\n self.next_termdef_num += 1;\n StmtCmd::TermDef { num: Some(num), local }\n }\n StmtCmd::Axiom {..} => {\n let num = self.next_assert_num;\n self.next_assert_num += 1;\n StmtCmd::Axiom { num: Some(num) }\n }\n StmtCmd::Thm {local, ..} => {\n let num = self.next_assert_num;\n self.next_assert_num += 1;\n StmtCmd::Thm { num: Some(num), local }\n }\n };\n self.pos = rest;\n Some(Ok((stmt, pr)))\n }\n }\n }\n}\n\n/// is only used for `DeclIter::next`.\n/// This always gets the full mmb file\nfn try_next_decl(mmb: &[u8], pos: usize) -> Option, usize)>> {\n let (cmd, data, rest) = match try_next_cmd(mmb, pos) {\n // Means cmd == 0, but here is unreachable\n Ok(None) => return None,\n // Means there was an error slicing in `try_next_cmd`\n Err(e) => return Some(Err(e)),\n Ok(Some(((cmd, data), rest))) => (cmd, data, rest)\n };\n\n let next2 = pos + data as usize;\n\n\n let pr = ProofIter {\n buf: mmb,\n pos: rest,\n ends_at: pos + (data as usize)\n };\n Some(Ok((\n StmtCmd::try_from(cmd).ok()?,\n pr, \n next2\n )))\n}\n\n// used by proof and unify\n// This now always gets the full mmb file.\npub fn try_next_cmd(mmb: &[u8], pos: usize) -> Res> \nwhere T: TryFrom<(u8, u32)> {\n let (cmd, data, new_pos) = parse_cmd(mmb, pos)?;\n if cmd == 0 {\n return Ok(None);\n }\n\n Ok(Some((\n T::try_from((cmd, data)).map_err(|_| VerifErr::Msg(format!(\"try_next_cmd failed @ pos {}\", pos)))?,\n new_pos\n )))\n}\n\n\n\n\n/// Constants used in the MMB specification.\npub mod cmd {\n /// `DATA_8 = 0x40`, used as a command mask for an 8 bit data field\n pub const DATA_8: u8 = 0x40;\n /// `DATA_16 = 0x80`, used as a command mask for a 16 bit data field\n pub const DATA_16: u8 = 0x80;\n /// `DATA_32 = 0xC0`, used as a command mask for a 32 bit data field\n pub const DATA_32: u8 = 0xC0;\n /// `DATA_MASK = 0xC0`, selects one of `DATA_8`, `DATA_16`, or `DATA_32` for data size\n pub const DATA_MASK: u8 = 0xC0;\n}\n\nfn parse_cmd(mmb: &[u8], start_at: usize) -> Res<(u8, u32, usize)> {\n match mmb.get(start_at..) {\n None | Some([]) => Err(VerifErr::Msg(\"Parse cmd exhausted\".to_string())),\n Some([n, tl @ ..]) => {\n let cmd_kind = n & !cmd::DATA_MASK;\n let cmd_size = n & cmd::DATA_MASK;\n match cmd_size {\n 0 => Ok((cmd_kind, 0, mmb.len() - tl.len())),\n cmd::DATA_8 => {\n let (data, rest) = parse_u8(tl)?;\n Ok((cmd_kind, data as u32, mmb.len() - rest.len()))\n }\n cmd::DATA_16 => {\n let (data, rest) = parse_u16(tl)?;\n Ok((cmd_kind, data as u32, mmb.len() - rest.len()))\n }\n cmd::DATA_32 => {\n let (data, rest) = parse_u32(tl)?;\n Ok((cmd_kind, data, mmb.len() - rest.len()))\n }\n _ => Err(VerifErr::Msg(\"Parse cmd got unknown size\".to_string())),\n }\n"}]}},{"Edit":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":138,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":30603},"to":{"change":3,"start":30603,"end":30604},"introduced_by":3}],"inode":{"change":3,"pos":8529}}},"contents":[{"Del":"\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":141,"ins":{"up_context":[{"change":3,"pos":30697}],"down_context":[{"change":3,"pos":30823}],"flag":"BLOCK","start":4998,"end":5046,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":30697},"to":{"change":3,"start":30697,"end":30823},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":" pub file_view: &'a crate::fs::FileView<'a>,"}],"del_contents":[{"Del":" pub file_data: &'a crate::fs::FileData,\n pub header: crate::mmb::Header,\n pub index: crate::mmb::index::Index<'a>,\n\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":144,"ins":{"up_context":[{"change":3,"pos":30972}],"down_context":[{"change":3,"pos":31025}],"flag":"BLOCK","start":5047,"end":5104,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":30972},"to":{"change":3,"start":30972,"end":31025},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":" pub declarations: Vec<(NumdStmtCmd, ProofIter<'a>)>,"}],"del_contents":[{"Del":" pub declarations: Vec<(StmtCmd, ProofIter<'a>)>,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":151,"ins":{"up_context":[{"change":3,"pos":31160}],"down_context":[{"change":3,"pos":31643}],"flag":"BLOCK","start":5105,"end":5593,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":31160},"to":{"change":3,"start":31160,"end":31643},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":" pub fn mmb_num_sorts_done(&self) -> u8 {"},{"Add":" self.mmb_num_sorts_done.load(Relaxed)"},{"Add":" }"},{"Add":""},{"Add":" pub fn mmb_num_termdefs_done(&self) -> u32 {"},{"Add":" self.mmb_num_termdefs_done.load(Relaxed)"},{"Add":" }"},{"Add":""},{"Add":" pub fn mmb_num_asserts_done(&self) -> u32 {"},{"Add":" self.mmb_num_asserts_done.load(Relaxed)"},{"Add":" }"},{"Add":""},{"Add":" pub fn new_from(file_data: &'a crate::fs::FileView<'a>) -> Res {"},{"Add":" let declars : Result, ParseError> = file_data.mmb.proof().collect();"}],"del_contents":[{"Del":" pub fn new_from(file_data: &'a crate::fs::FileData) -> Res {\n let header = crate::mmb::parse_header(file_data.mmb_file.as_slice())?;\n let index = crate::mmb::index::parse_index(file_data.mmb_file.as_slice(), header)?;\n let declars = DeclIter {\n mmb: file_data.mmb_file.as_slice(),\n pos: header.proof_stream_start as usize,\n next_sort_num: 0,\n next_termdef_num: 0,\n next_assert_num: 0,\n };\n"}]}},{"Edit":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":166,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":31652},"to":{"change":3,"start":31652,"end":31773},"introduced_by":3}],"inode":{"change":3,"pos":8529}}},"contents":[{"Del":" let declarations: Vec<(StmtCmd, ProofIter)> = declars.collect::, VerifErr>>()?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":167,"ins":{"up_context":[{"change":3,"pos":31794}],"down_context":[{"change":3,"pos":31882}],"flag":"BLOCK","start":5594,"end":5709,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":31794},"to":{"change":3,"start":31794,"end":31882},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":" file_view: file_data,"},{"Add":" declarations: declars.map_err(|e| VerifErr::Msg(format!(\"{}\", e)))?,"}],"del_contents":[{"Del":" file_data,\n header,\n index,\n declarations,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":175,"ins":{"up_context":[{"change":3,"pos":32061}],"down_context":[{"change":3,"pos":32107}],"flag":"BLOCK","start":5710,"end":5760,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":32061},"to":{"change":3,"start":32061,"end":32107},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":" pub fn add_declar(&self, stmt: NumdStmtCmd) {"}],"del_contents":[{"Del":" pub fn add_declar(&self, stmt: StmtCmd) {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":177,"ins":{"up_context":[{"change":3,"pos":32128}],"down_context":[{"change":3,"pos":32328}],"flag":"BLOCK","start":5761,"end":6064,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":32128},"to":{"change":3,"start":32128,"end":32328},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":" NumdStmtCmd::Sort {..} => { self.mmb_num_sorts_done.fetch_add(1, Relaxed); },"},{"Add":" NumdStmtCmd::TermDef {..} => { self.mmb_num_termdefs_done.fetch_add(1, Relaxed); },"},{"Add":" NumdStmtCmd::Axiom {..} | NumdStmtCmd::Thm {..} => { self.mmb_num_asserts_done.fetch_add(1, Relaxed); },"}],"del_contents":[{"Del":" StmtCmd::Sort {..} => { self.next_sort(); },\n StmtCmd::TermDef {..} => { self.next_termdef(); },\n StmtCmd::Axiom {..} | StmtCmd::Thm {..} => { self.next_assert(); },\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":183,"ins":{"up_context":[{"change":3,"pos":32353}],"down_context":[{"change":3,"pos":32549}],"flag":"BLOCK","start":6065,"end":6274,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":32353},"to":{"change":3,"start":32353,"end":32549},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":" pub fn assert_mmz_done(&self, mmz: &crate::mmz::MmzMem<'a>) -> Res<()> {"},{"Add":" if mmz.num_sorts_done().into_inner() != self.file_view.mmb.header.num_sorts {"},{"Add":" return Err(VerifErr::Msg(format!("}],"del_contents":[{"Del":" pub fn assert_mmz_done(&self, mmz: &crate::mmz::MmzMem<'a>, errs: &mut Vec) {\n if mmz.num_sorts_done() != self.header.num_sorts {\n errs.push(VerifErr::Msg(format!(\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":187,"ins":{"up_context":[{"change":3,"pos":32657}],"down_context":[{"change":3,"pos":32734}],"flag":"BLOCK","start":6275,"end":6379,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":32657},"to":{"change":3,"start":32657,"end":32734},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":" mmz.num_sorts_done().into_inner(), "},{"Add":" self.file_view.mmb.header.num_sorts"}],"del_contents":[{"Del":" mmz.num_sorts_done(), \n self.header.num_sorts\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":192,"ins":{"up_context":[{"change":3,"pos":32761}],"down_context":[{"change":3,"pos":32868}],"flag":"BLOCK","start":6380,"end":6508,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":32761},"to":{"change":3,"start":32761,"end":32868},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":" if mmz.num_termdefs_done() != self.file_view.mmb.header.num_terms.get() {"},{"Add":" return Err(VerifErr::Msg(format!("}],"del_contents":[{"Del":" if mmz.num_termdefs_done() != self.header.num_terms {\n errs.push(VerifErr::Msg(format!(\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":196,"ins":{"up_context":[{"change":3,"pos":33018}],"down_context":[{"change":3,"pos":33056}],"flag":"BLOCK","start":6509,"end":6567,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":33018},"to":{"change":3,"start":33018,"end":33056},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":" self.file_view.mmb.header.num_terms.get()"}],"del_contents":[{"Del":" self.header.num_terms\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":200,"ins":{"up_context":[{"change":3,"pos":33083}],"down_context":[{"change":3,"pos":33188}],"flag":"BLOCK","start":6568,"end":6694,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":33083},"to":{"change":3,"start":33083,"end":33188},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":" if mmz.num_asserts_done() != self.file_view.mmb.header.num_thms.get() {"},{"Add":" return Err(VerifErr::Msg(format!("}],"del_contents":[{"Del":" if mmz.num_asserts_done() != self.header.num_thms {\n errs.push(VerifErr::Msg(format!(\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":204,"ins":{"up_context":[{"change":3,"pos":33342}],"down_context":[{"change":3,"pos":33379}],"flag":"BLOCK","start":6695,"end":6752,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":33342},"to":{"change":3,"start":33342,"end":33379},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":" self.file_view.mmb.header.num_thms.get()"}],"del_contents":[{"Del":" self.header.num_thms\n"}]}},{"Edit":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":207,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":33413}],"down_context":[{"change":3,"pos":33413}],"flag":"BLOCK","start":6753,"end":6768,"inode":{"change":3,"pos":8529}}},"contents":[{"Add":" Ok(())"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":210,"ins":{"up_context":[{"change":3,"pos":33420}],"down_context":[{"change":3,"pos":33591}],"flag":"BLOCK","start":6769,"end":6940,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":33420},"to":{"change":3,"start":33420,"end":33591},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":" pub fn assert_mmb_done(&self) -> Res<()> {"},{"Add":" if self.mmb_num_sorts_done() != self.file_view.mmb.header.num_sorts {"},{"Add":" return Err(VerifErr::Msg(format!("}],"del_contents":[{"Del":" pub fn assert_mmb_done(&self, errs: &mut Vec) {\n if self.mmb_num_sorts_done() != self.header.num_sorts {\n errs.push(VerifErr::Msg(format!(\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":215,"ins":{"up_context":[{"change":3,"pos":33743}],"down_context":[{"change":3,"pos":33781}],"flag":"BLOCK","start":6941,"end":6993,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":33743},"to":{"change":3,"start":33743,"end":33781},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":" self.file_view.mmb.header.num_sorts"}],"del_contents":[{"Del":" self.header.num_sorts\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":217,"ins":{"up_context":[{"change":3,"pos":33797}],"down_context":[{"change":3,"pos":33807}],"flag":"BLOCK","start":6994,"end":7005,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":33797},"to":{"change":3,"start":33797,"end":33807},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":" } "}],"del_contents":[{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":219,"ins":{"up_context":[{"change":3,"pos":33808}],"down_context":[{"change":3,"pos":33920}],"flag":"BLOCK","start":7006,"end":7139,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":33808},"to":{"change":3,"start":33808,"end":33920},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":" if self.mmb_num_termdefs_done() != self.file_view.mmb.header.num_terms.get() {"},{"Add":" return Err(VerifErr::Msg(format!("}],"del_contents":[{"Del":" if self.mmb_num_termdefs_done() != self.header.num_terms {\n errs.push(VerifErr::Msg(format!(\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":223,"ins":{"up_context":[{"change":3,"pos":34075}],"down_context":[{"change":3,"pos":34113}],"flag":"BLOCK","start":7140,"end":7198,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":34075},"to":{"change":3,"start":34075,"end":34113},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":" self.file_view.mmb.header.num_terms.get()"}],"del_contents":[{"Del":" self.header.num_terms\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":227,"ins":{"up_context":[{"change":3,"pos":34140}],"down_context":[{"change":3,"pos":34250}],"flag":"BLOCK","start":7199,"end":7330,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":34140},"to":{"change":3,"start":34140,"end":34250},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":" if self.mmb_num_asserts_done() != self.file_view.mmb.header.num_thms.get() {"},{"Add":" return Err(VerifErr::Msg(format!("}],"del_contents":[{"Del":" if self.mmb_num_asserts_done() != self.header.num_thms {\n errs.push(VerifErr::Msg(format!(\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":231,"ins":{"up_context":[{"change":3,"pos":34409}],"down_context":[{"change":3,"pos":34446}],"flag":"BLOCK","start":7331,"end":7388,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":34409},"to":{"change":3,"start":34409,"end":34446},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":" self.file_view.mmb.header.num_thms.get()"}],"del_contents":[{"Del":" self.header.num_thms\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":234,"ins":{"up_context":[{"change":3,"pos":34481}],"down_context":[{"change":3,"pos":37874}],"flag":"BLOCK","start":7389,"end":7404,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":34481},"to":{"change":3,"start":34481,"end":37874},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":" Ok(())"}],"del_contents":[{"Del":" }\n}\n\nimpl<'a> Outline<'a> {\n pub fn mmb(&self) -> &'a [u8] {\n self.file_data.mmb_file.as_slice()\n }\n\n pub fn mmb_num_sorts_done(&self) -> u8 {\n self.mmb_num_sorts_done.load(Relaxed)\n }\n\n pub fn mmb_num_termdefs_done(&self) -> u32 {\n self.mmb_num_termdefs_done.load(Relaxed)\n }\n\n pub fn mmb_num_asserts_done(&self) -> u32 {\n self.mmb_num_asserts_done.load(Relaxed)\n }\n\n fn next_sort(&self) -> u8 {\n self.mmb_num_sorts_done.fetch_add(1, Relaxed)\n }\n \n fn next_termdef(&self) -> u32 {\n self.mmb_num_termdefs_done.fetch_add(1, Relaxed)\n }\n\n fn next_assert(&self) -> u32 {\n self.mmb_num_asserts_done.fetch_add(1, Relaxed)\n }\n\n pub fn get_sort_mods(&self, n: usize) -> Res {\n none_err! {\n self\n .mmb()\n .get(self.header.sort_data_start as usize + n)\n .map(|byte| Mods { inner: *byte })\n }\n } \n\n /// Get a term (by number) from the mmb file\n pub fn get_term_by_num(&self, term_num: u32) -> Res> {\n let start_point = (self.header.terms_start as usize) + ((term_num as usize) * 8);\n let source = none_err!(self.mmb().get(start_point..))?;\n let (num_args, source) = parse_u16(source)?;\n let (sort, source) = parse_u8(source)?;\n let (_reserved, source) = parse_u8(source)?;\n let (term_args_start, _) = parse_u32(source)?;\n\n let args_start = none_err!(self.mmb().get(term_args_start as usize..))?;\n let split_point = none_err!{ std::mem::size_of::().checked_mul((num_args + 1) as usize) }?;\n let (args_start, unify_start) = args_start.split_at(split_point);\n\n let unify = UnifyIter {\n buf: self.mmb(),\n pos: self.mmb().len() - unify_start.len(),\n };\n\n Ok(Term { term_num, sort, args_start, unify })\n }\n\n /// Get an assertion (by number) from the mmb file\n pub fn get_assert_by_num(&self, assert_num: u32) -> Res> {\n let thm_start = (self.header.thms_start + (assert_num * 8)) as usize;\n let source = self.mmb().get(thm_start..).ok_or(VerifErr::Msg(format!(\"Bad index\")))?;\n let (num_args, source) = parse_u16(source)?;\n let (_reserved, source) = parse_u16(source)?;\n let (args_start, _) = parse_u32(source)?;\n\n let args_slice = none_err!(self.mmb().get(args_start as usize..))?;\n\n let split_point = none_err! { std::mem::size_of::().checked_mul(num_args as usize) }?;\n let (args_start, unify_start) = args_slice.split_at(split_point);\n\n let unify = UnifyIter {\n buf: self.mmb(),\n pos: self.mmb().len() - unify_start.len(),\n };\n\n Ok(Assert { assert_num, args_start, unify }) \n } \n}\n\n/// These are helper functions for rendering unsigned integers\n/// as a sequence of bits. For example, `view64(TYPE_SORT_MASK)` renders as:\n///\n/// 10000000_11111111_11111111_11111111_11111111_11111111_11111111_11111111\n/// \n/// They're not efficient, but they're for debugging and I'm too lazy to write efficient\n/// ones right now.\npub fn view64(n: u64) -> String {\n let s = format!(\"{:#066b}\", n); \n let mut acc = String::new();\n for (idx, c) in s.chars().skip(2).enumerate() {\n if idx % 8 == 0 && idx != 0 {\n acc.push('_');\n }\n acc.push(c);\n"}]}},{"Edit":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":236,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":37880},"to":{"change":3,"start":37880,"end":37888},"introduced_by":3}],"inode":{"change":3,"pos":8529}}},"contents":[{"Del":" acc\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":238,"ins":{"up_context":[{"change":3,"pos":37891}],"down_context":[{"change":3,"pos":38160}],"flag":"BLOCK","start":7405,"end":8044,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":37891},"to":{"change":3,"start":37891,"end":38160},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":"///// These are helper functions for rendering unsigned integers"},{"Add":"///// as a sequence of bits. For example, `view64(TYPE_SORT_MASK)` renders as:"},{"Add":"/////"},{"Add":"///// 10000000_11111111_11111111_11111111_11111111_11111111_11111111_11111111"},{"Add":"///// "},{"Add":"///// They're not efficient, but they're for debugging and I'm too lazy to write efficient"},{"Add":"///// ones right now."},{"Add":"//pub fn view64(n: u64) -> String {"},{"Add":"// let s = format!(\"{:#066b}\", n); "},{"Add":"// let mut acc = String::new();"},{"Add":"// for (idx, c) in s.chars().skip(2).enumerate() {"},{"Add":"// if idx % 8 == 0 && idx != 0 {"},{"Add":"// acc.push('_');"},{"Add":"// }"},{"Add":"// acc.push(c);"},{"Add":"// }"},{"Add":"// acc"},{"Add":"//}"}],"del_contents":[{"Del":"pub fn view32(n: u32) -> String {\n let s = format!(\"{:#034b}\", n); \n let mut acc = String::new();\n for (idx, c) in s.chars().skip(2).enumerate() {\n if idx % 8 == 0 && idx != 0 {\n acc.push('_');\n }\n acc.push(c);\n }\n acc\n}\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":257,"ins":{"up_context":[{"change":3,"pos":38161}],"down_context":[{"change":3,"pos":38430}],"flag":"BLOCK","start":8045,"end":8336,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":38161},"to":{"change":3,"start":38161,"end":38430},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":"//pub fn view32(n: u32) -> String {"},{"Add":"// let s = format!(\"{:#034b}\", n); "},{"Add":"// let mut acc = String::new();"},{"Add":"// for (idx, c) in s.chars().skip(2).enumerate() {"},{"Add":"// if idx % 8 == 0 && idx != 0 {"},{"Add":"// acc.push('_');"},{"Add":"// }"},{"Add":"// acc.push(c);"},{"Add":"// }"},{"Add":"// acc"},{"Add":"//}"}],"del_contents":[{"Del":"pub fn view16(n: u16) -> String {\n let s = format!(\"{:#018b}\", n); \n let mut acc = String::new();\n for (idx, c) in s.chars().skip(2).enumerate() {\n if idx % 8 == 0 && idx != 0 {\n acc.push('_');\n }\n acc.push(c);\n }\n acc\n}\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":269,"ins":{"up_context":[{"change":3,"pos":38431}],"down_context":[{"change":3,"pos":38698}],"flag":"BLOCK","start":8337,"end":8628,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":38431},"to":{"change":3,"start":38431,"end":38698},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":"//pub fn view16(n: u16) -> String {"},{"Add":"// let s = format!(\"{:#018b}\", n); "},{"Add":"// let mut acc = String::new();"},{"Add":"// for (idx, c) in s.chars().skip(2).enumerate() {"},{"Add":"// if idx % 8 == 0 && idx != 0 {"},{"Add":"// acc.push('_');"},{"Add":"// }"},{"Add":"// acc.push(c);"},{"Add":"// }"},{"Add":"// acc"},{"Add":"//}"}],"del_contents":[{"Del":"pub fn view8(n: u8) -> String {\n let s = format!(\"{:#010b}\", n); \n let mut acc = String::new();\n for (idx, c) in s.chars().skip(2).enumerate() {\n if idx % 8 == 0 && idx != 0 {\n acc.push('_');\n }\n acc.push(c);\n }\n acc\n}\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8529},"path":"src/util.rs","line":281,"ins":{"up_context":[{"change":3,"pos":38699}],"down_context":[],"flag":"BLOCK","start":8629,"end":8918,"inode":{"change":3,"pos":8529}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":38699},"to":{"change":3,"start":38699,"end":38825},"introduced_by":3}],"inode":{"change":3,"pos":8529}},"ins_contents":[{"Add":"//pub fn view8(n: u8) -> String {"},{"Add":"// let s = format!(\"{:#010b}\", n); "},{"Add":"// let mut acc = String::new();"},{"Add":"// for (idx, c) in s.chars().skip(2).enumerate() {"},{"Add":"// if idx % 8 == 0 && idx != 0 {"},{"Add":"// acc.push('_');"},{"Add":"// }"},{"Add":"// acc.push(c);"},{"Add":"// }"},{"Add":"// acc"},{"Add":"//}"}],"del_contents":[{"Del":"impl Debug for Type {\n fn fmt(&self, f: &mut Formatter) -> FmtResult {\n write!(f, \"{}\", view64(self.inner))\n }\n}\n"}]}},{"FileMove":{"meta":{"basename":"mmz","metadata":576},"old":[{"basename":"mmz","metadata":1005}],"up":[{"change":3,"pos":24}],"down":[{"change":3,"pos":38832}],"show_perms":true}},{"FileMove":{"meta":{"basename":"parse.rs","metadata":0},"old":[{"basename":"parse.rs","metadata":420}],"up":[{"change":3,"pos":38832}],"down":[{"change":3,"pos":38844}],"show_perms":true}},{"Edit":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":1,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":38844}],"down_context":[{"change":3,"pos":38845}],"flag":"BLOCK","start":8954,"end":8981,"inode":{"change":3,"pos":38844}}},"contents":[{"Add":"use std::convert::TryFrom;"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":5,"ins":{"up_context":[{"change":3,"pos":38938}],"down_context":[{"change":3,"pos":38969}],"flag":"BLOCK","start":8982,"end":9012,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":38938},"to":{"change":3,"start":38938,"end":38969},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":"use mm0b_parser::NumdStmtCmd;"}],"del_contents":[{"Del":"use crate::mmb::stmt::StmtCmd;\n"}]}},{"Edit":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":21,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":39156},"to":{"change":3,"start":39156,"end":39167},"introduced_by":3}],"inode":{"change":3,"pos":38844}}},"contents":[{"Del":" Mods, \n"}]}},{"Edit":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":24,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":39202},"to":{"change":3,"start":39202,"end":39225},"introduced_by":3}],"inode":{"change":3,"pos":38844}}},"contents":[{"Del":" SortNum,\n Type,\n"}]}},{"Edit":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":25,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":39238},"to":{"change":3,"start":39238,"end":39262},"introduced_by":3}],"inode":{"change":3,"pos":38844}}},"contents":[{"Del":" Term, \n Assert, \n"}]}},{"Edit":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":26,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":39278},"to":{"change":3,"start":39278,"end":39288},"introduced_by":3}],"inode":{"change":3,"pos":38844}}},"contents":[{"Del":" Args,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":30,"ins":{"up_context":[{"change":3,"pos":39355}],"down_context":[{"change":3,"pos":39410}],"flag":"BLOCK","start":9013,"end":9154,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":39355},"to":{"change":3,"start":39355,"end":39410},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":"use mm0b_parser::{ UnifyCmd, Arg, Type, UnifyIter, TermRef, ThmRef };"},{"Add":"use mm0_util::{ SortId, Modifiers };"},{"Add":"use crate::mmb::unify::{ UMode };"}],"del_contents":[{"Del":"use crate::mmb::unify::{ UnifyCmd, UnifyIter, UMode };\n"}]}},{"Edit":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":88,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":40577},"to":{"change":3,"start":40577,"end":40750},"introduced_by":3}],"inode":{"change":3,"pos":38844}}},"contents":[{"Del":"\n pub fn is_empty(&self) -> bool {\n self.mmz_pos == self.mmz.len()\n }\n\n pub fn cur(&self) -> Option {\n self.mmz.get(self.mmz_pos).copied()\n }\n\n"}]}},{"Edit":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":91,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":40858},"to":{"change":3,"start":40858,"end":40941},"introduced_by":3}],"inode":{"change":3,"pos":38844}}},"contents":[{"Del":"\n pub fn advance(&mut self, n: usize) {\n self.mmz_pos += n;\n } \n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":95,"ins":{"up_context":[{"change":3,"pos":41019}],"down_context":[{"change":3,"pos":41098}],"flag":"BLOCK","start":9155,"end":9241,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":41019},"to":{"change":3,"start":41019,"end":41098},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" stmt_cmd: NumdStmtCmd, "},{"Add":" item: Option, ThmRef<'a>>>"}],"del_contents":[{"Del":" stmt_cmd: StmtCmd, \n item: Option, Assert<'a>>>\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":100,"ins":{"up_context":[{"change":3,"pos":41167}],"down_context":[{"change":3,"pos":41238}],"flag":"BLOCK","start":9242,"end":9307,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":41167},"to":{"change":3,"start":41167,"end":41238},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" let mut mmz_st = MmzState::new_from(self, bump);"}],"del_contents":[{"Del":" let mut mmz_st = MmzState::new_from(&mut *self, bump);\n"}]}},{"Edit":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":110,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":41668},"to":{"change":3,"start":41668,"end":41669},"introduced_by":3}],"inode":{"change":3,"pos":38844}}},"contents":[{"Del":"\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":115,"ins":{"up_context":[{"change":3,"pos":41878}],"down_context":[{"change":3,"pos":41996}],"flag":"BLOCK","start":9308,"end":9434,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":41878},"to":{"change":3,"start":41878,"end":41996},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" make_sure!(matches!(stmt_cmd, NumdStmtCmd::Axiom {..}) || matches!(stmt_cmd, NumdStmtCmd::Thm {..}));"}],"del_contents":[{"Del":" make_sure!(matches!(stmt_cmd, StmtCmd::Axiom {..}) || matches!(stmt_cmd, StmtCmd::Thm {..}));\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":137,"ins":{"up_context":[{"change":3,"pos":43066}],"down_context":[{"change":3,"pos":43169}],"flag":"BLOCK","start":9435,"end":9597,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":43066},"to":{"change":3,"start":43066,"end":43169},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" format!(\"`parse_until` ran out of input with remaining verification obligations. Remaining: {:?}\", String::from_utf8_lossy(self.cur_slice()))"}],"del_contents":[{"Del":" format!(\"`parse_until` ran out of input with remaining verification obligations.\")\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":174,"ins":{"up_context":[{"change":3,"pos":44201}],"down_context":[{"change":3,"pos":44282}],"flag":"BLOCK","start":9598,"end":9678,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":44201},"to":{"change":3,"start":44201,"end":44282},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" pub fn coerce(&mut self, e_x: MmzExpr<'b>, z: SortId) -> Res> {"}],"del_contents":[{"Del":" pub fn coerce(&mut self, e_x: MmzExpr<'b>, z: SortNum) -> Res> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":399,"ins":{"up_context":[{"change":3,"pos":51325}],"down_context":[{"change":3,"pos":51388}],"flag":"BLOCK","start":9679,"end":9750,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":51325},"to":{"change":3,"start":51325,"end":51388},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" let _binders = self.binders(term.args_and_ret(), \"notation\")?;"}],"del_contents":[{"Del":" let _binders = self.binders(term.args(), \"notation\")?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":423,"ins":{"up_context":[{"change":3,"pos":52121}],"down_context":[{"change":3,"pos":52148}],"flag":"BLOCK","start":9751,"end":9786,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":52121},"to":{"change":3,"start":52121,"end":52148},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" term.tid.into_inner(),"}],"del_contents":[{"Del":" term.term_num,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":425,"ins":{"up_context":[{"change":3,"pos":52167}],"down_context":[{"change":3,"pos":52203}],"flag":"BLOCK","start":9787,"end":9842,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":52167},"to":{"change":3,"start":52167,"end":52203},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" u16::try_from(term.args().len()).unwrap(),"}],"del_contents":[{"Del":" term.num_args_no_ret(),\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":548,"ins":{"up_context":[{"change":3,"pos":56024}],"down_context":[{"change":3,"pos":56357}],"flag":"BLOCK","start":9843,"end":10221,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":56024},"to":{"change":3,"start":56024,"end":56357},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" for (&s1, m) in self.mem.coes.iter() {"},{"Add":" for s2 in m.keys().copied() {"},{"Add":" if self.mem.outline.file_view.mmb_sort_mods(s2)?.contains(Modifiers::PROVABLE) {"},{"Add":" if let Some(_s2) = provs.insert(s1, s2) {"},{"Add":" return Err(VerifErr::Msg(format!(\"Coercion diamond to provable detected. from: {:?}, to: {:?}\", s1, s2)))"}],"del_contents":[{"Del":" for (s1, m) in self.mem.coes.iter() {\n for s2 in m.keys() {\n if self.mem.outline.get_sort_mods(*s2 as usize)?.is_provable() {\n if let Some(_s2) = provs.insert(*s1, *s2) {\n println!(\"Coercion diamond to provable detected\");\n panic!();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":562,"ins":{"up_context":[{"change":3,"pos":56505}],"down_context":[{"change":3,"pos":56525}],"flag":"BLOCK","start":10222,"end":10245,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":56505},"to":{"change":3,"start":56505,"end":56525},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" term: TermRef,"}],"del_contents":[{"Del":" term: Term,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":564,"ins":{"up_context":[{"change":3,"pos":56555}],"down_context":[{"change":3,"pos":56589}],"flag":"BLOCK","start":10246,"end":10288,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":56555},"to":{"change":3,"start":56555,"end":56589},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" from: SortId,"},{"Add":" to: SortId,"}],"del_contents":[{"Del":" from: u8,\n to: u8,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":588,"ins":{"up_context":[{"change":3,"pos":57340}],"down_context":[{"change":3,"pos":57390}],"flag":"BLOCK","start":10289,"end":10350,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":57340},"to":{"change":3,"start":57340,"end":57390},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" term: TermRef,"},{"Add":" x: SortId,"},{"Add":" y: SortId,"}],"del_contents":[{"Del":" term: Term,\n x: u8,\n y: u8,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":595,"ins":{"up_context":[{"change":3,"pos":57596}],"down_context":[{"change":3,"pos":57687}],"flag":"BLOCK","start":10351,"end":10437,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":57596},"to":{"change":3,"start":57596,"end":57687},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" Some(&Coe::Single { term_num }) if term_num == term.tid => return Ok(()),"}],"del_contents":[{"Del":" Some(&Coe::Single { term_num }) if term_num == term.term_num => return Ok(()),\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":600,"ins":{"up_context":[{"change":3,"pos":57807}],"down_context":[{"change":3,"pos":57880}],"flag":"BLOCK","start":10438,"end":10506,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":57807},"to":{"change":3,"start":57807,"end":57880},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" let coe_x_y = Arc::new(Coe::Single { term_num: term.tid });"}],"del_contents":[{"Del":" let coe_x_y = Arc::new(Coe::Single { term_num: term.term_num });\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":662,"ins":{"up_context":[{"change":3,"pos":60160}],"down_context":[{"change":3,"pos":60180}],"flag":"BLOCK","start":10507,"end":10530,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":60160},"to":{"change":3,"start":60160,"end":60180},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" term: TermRef,"}],"del_contents":[{"Del":" term: Term,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":664,"ins":{"up_context":[{"change":3,"pos":60209}],"down_context":[{"change":3,"pos":60243}],"flag":"BLOCK","start":10531,"end":10573,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":60209},"to":{"change":3,"start":60209,"end":60243},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" from: SortId,"},{"Add":" to: SortId,"}],"del_contents":[{"Del":" from: u8,\n to: u8,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":667,"ins":{"up_context":[{"change":3,"pos":60262}],"down_context":[{"change":3,"pos":60309}],"flag":"BLOCK","start":10574,"end":10616,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":60262},"to":{"change":3,"start":60262,"end":60309},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" assert_eq!(term.args().len(), 1);"}],"del_contents":[{"Del":" assert_eq!(term.num_args_no_ret(), 1);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":681,"ins":{"up_context":[{"change":3,"pos":60724}],"down_context":[{"change":3,"pos":60826}],"flag":"BLOCK","start":10617,"end":10717,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":60724},"to":{"change":3,"start":60724,"end":60826},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" let from_num = self.mem.get_sort_id(from)?;"},{"Add":" let to_num = self.mem.get_sort_id(to)?;"}],"del_contents":[{"Del":" let from_num = self.mem.get_sort_num(from)?;\n let to_num = self.mem.get_sort_num(to)?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":717,"ins":{"up_context":[{"change":3,"pos":62006}],"down_context":[{"change":3,"pos":62030}],"flag":"BLOCK","start":10718,"end":10745,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":62006},"to":{"change":3,"start":62006,"end":62030},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" term: TermRef<'a>,"}],"del_contents":[{"Del":" term: Term<'a>,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":724,"ins":{"up_context":[{"change":3,"pos":62177}],"down_context":[{"change":3,"pos":62242}],"flag":"BLOCK","start":10746,"end":10806,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":62177},"to":{"change":3,"start":62177,"end":62242},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" if let Some(n) = term.args().len().checked_sub(1) {"}],"del_contents":[{"Del":" if let Some(n) = term.num_args_no_ret().checked_sub(1) {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":737,"ins":{"up_context":[{"change":3,"pos":62576}],"down_context":[{"change":3,"pos":62613}],"flag":"BLOCK","start":10807,"end":10852,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":62576},"to":{"change":3,"start":62576,"end":62613},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" term_num: term.tid.into_inner(),"}],"del_contents":[{"Del":" term_num: term.term_num,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":750,"ins":{"up_context":[{"change":2,"pos":1472}],"down_context":[{"change":2,"pos":1512}],"flag":"BLOCK","start":10853,"end":10888,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1472},"to":{"change":2,"start":1472,"end":1512},"introduced_by":2}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" if term.args().len() > 0 {"}],"del_contents":[{"Del":" if term.num_args_no_ret() > 0 {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":764,"ins":{"up_context":[{"change":3,"pos":63072}],"down_context":[{"change":3,"pos":63096}],"flag":"BLOCK","start":10889,"end":10916,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":63072},"to":{"change":3,"start":63072,"end":63096},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" term: TermRef<'a>,"}],"del_contents":[{"Del":" term: Term<'a>,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":773,"ins":{"up_context":[{"change":3,"pos":63409}],"down_context":[{"change":3,"pos":63458}],"flag":"BLOCK","start":10917,"end":10961,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":63409},"to":{"change":3,"start":63409,"end":63458},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" if term.args().len() != 2 {"}],"del_contents":[{"Del":" if term.num_args_no_ret() != 2 {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":775,"ins":{"up_context":[{"change":3,"pos":63514}],"down_context":[{"change":3,"pos":63649}],"flag":"BLOCK","start":10962,"end":11092,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":63514},"to":{"change":3,"start":63514,"end":63649},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" format!(\"infix notations must be for terms with 2 arguments. {:?} had {}\", term_ident, term.args().len())"}],"del_contents":[{"Del":" format!(\"infix notations must be for terms with 2 arguments. {:?} had {}\", term_ident, term.num_args_no_ret())\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":795,"ins":{"up_context":[{"change":3,"pos":64339}],"down_context":[{"change":3,"pos":64384}],"flag":"BLOCK","start":11093,"end":11146,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":64339},"to":{"change":3,"start":64339,"end":64384},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" term_num: term.tid.into_inner(),"}],"del_contents":[{"Del":" term_num: term.term_num,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":819,"ins":{"up_context":[{"change":3,"pos":64885}],"down_context":[{"change":3,"pos":64970}],"flag":"BLOCK","start":11147,"end":11244,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":64885},"to":{"change":3,"start":64885,"end":64970},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" fn sort(&mut self) -> Res<(Str<'a>, Modifiers)> {"},{"Add":" let mut mods = Modifiers::empty();"}],"del_contents":[{"Del":" fn sort(&mut self) -> Res<(Str<'a>, Mods)> {\n let mut mods = Mods::new();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":823,"ins":{"up_context":[{"change":3,"pos":65060}],"down_context":[{"change":3,"pos":65102}],"flag":"BLOCK","start":11245,"end":11295,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":65060},"to":{"change":3,"start":65060,"end":65102},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" mods.insert(Modifiers::PROVABLE);"}],"del_contents":[{"Del":" mods |= Mods::provable();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":825,"ins":{"up_context":[{"change":3,"pos":65156}],"down_context":[{"change":3,"pos":65196}],"flag":"BLOCK","start":11296,"end":11344,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":65156},"to":{"change":3,"start":65156,"end":65196},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" mods.insert(Modifiers::STRICT);"}],"del_contents":[{"Del":" mods |= Mods::strict();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":827,"ins":{"up_context":[{"change":3,"pos":65248}],"down_context":[{"change":3,"pos":65286}],"flag":"BLOCK","start":11345,"end":11391,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":65248},"to":{"change":3,"start":65248,"end":65286},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" mods.insert(Modifiers::PURE);"}],"del_contents":[{"Del":" mods |= Mods::pure();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":829,"ins":{"up_context":[{"change":3,"pos":65338}],"down_context":[{"change":3,"pos":65376}],"flag":"BLOCK","start":11392,"end":11438,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":65338},"to":{"change":3,"start":65338,"end":65376},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" mods.insert(Modifiers::FREE);"}],"del_contents":[{"Del":" mods |= Mods::free();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":844,"ins":{"up_context":[{"change":3,"pos":65760}],"down_context":[{"change":3,"pos":65852}],"flag":"BLOCK","start":11439,"end":11532,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":65760},"to":{"change":3,"start":65760,"end":65852},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" let mmb_mods = self.mem.outline.file_view.mmb_sort_mods(self.mem.num_sorts_done())?;"}],"del_contents":[{"Del":" let mmb_mods = self.mem.outline.get_sort_mods(self.mem.num_sorts_done() as usize)?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":846,"ins":{"up_context":[{"change":3,"pos":65890}],"down_context":[{"change":3,"pos":65924}],"flag":"BLOCK","start":11533,"end":11568,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":65890},"to":{"change":3,"start":65890,"end":65924},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" self.mem.add_sort(ident)?;"}],"del_contents":[{"Del":" self.mem.add_sort(ident);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":852,"ins":{"up_context":[{"change":3,"pos":65992}],"down_context":[{"change":3,"pos":66016}],"flag":"BLOCK","start":11569,"end":11596,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":65992},"to":{"change":3,"start":65992,"end":66016},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" term: TermRef<'a>,"}],"del_contents":[{"Del":" term: Term<'a>,\n"}]}},{"Edit":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":856,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":66140}],"down_context":[{"change":3,"pos":66140}],"flag":"BLOCK","start":11597,"end":11707,"inode":{"change":3,"pos":38844}}},"contents":[{"Add":" let mode = if term.def() { \"def\" } else { \"term\" };"},{"Add":" self.binders(term.args_and_ret(), mode)?;"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":859,"ins":{"up_context":[{"change":3,"pos":66141}],"down_context":[{"change":3,"pos":66302}],"flag":"BLOCK","start":11708,"end":11760,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":66141},"to":{"change":3,"start":66141,"end":66302},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" if term.def() && self.peek_word() == b\"=\" {"}],"del_contents":[{"Del":" let mode = if term.is_def() { \"def\" } else { \"term\" };\n self.binders(term.args(), mode)?;\n\n if term.is_def() && self.peek_word() == b\"=\" {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":874,"ins":{"up_context":[{"change":3,"pos":66686}],"down_context":[{"change":3,"pos":66714}],"flag":"BLOCK","start":11761,"end":11789,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":66686},"to":{"change":3,"start":66686,"end":66714},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" assert: ThmRef<'a>,"}],"del_contents":[{"Del":" assert: Assert<'a>,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":911,"ins":{"up_context":[{"change":3,"pos":67639}],"down_context":[{"change":3,"pos":67663}],"flag":"BLOCK","start":11790,"end":11812,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":67639},"to":{"change":3,"start":67639,"end":67663},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" args: &[Arg],"}],"del_contents":[{"Del":" args: Args<'a>,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":922,"ins":{"up_context":[{"change":3,"pos":68187}],"down_context":[{"change":3,"pos":68257}],"flag":"BLOCK","start":11813,"end":11899,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":68187},"to":{"change":3,"start":68187,"end":68257},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" let args_todo = args.iter().copied().skip(self.non_dummy_vars().count());"}],"del_contents":[{"Del":" let args_todo = args.skip(self.non_dummy_vars().count());\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":938,"ins":{"up_context":[{"change":3,"pos":68737}],"down_context":[{"change":3,"pos":68803}],"flag":"BLOCK","start":11900,"end":11982,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":68737},"to":{"change":3,"start":68737,"end":68803},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" let args_todo = args.iter().copied().skip(self.non_dummy_vars().count());"}],"del_contents":[{"Del":" let args_todo = args.skip(self.non_dummy_vars().count());\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":957,"ins":{"up_context":[{"change":3,"pos":69447}],"down_context":[{"change":3,"pos":69541}],"flag":"BLOCK","start":11983,"end":12111,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":69447},"to":{"change":3,"start":69447,"end":69541},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" fn binder_group(&mut self, args_todo: I, mode: &str) -> Res<()> "},{"Add":" where I: Iterator + ExactSizeIterator {"}],"del_contents":[{"Del":" fn binder_group(&mut self, args_todo: std::iter::Skip>, mode: &str) -> Res<()> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":1022,"ins":{"up_context":[{"change":3,"pos":72266}],"down_context":[{"change":3,"pos":72325}],"flag":"BLOCK","start":12112,"end":12211,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":72266},"to":{"change":3,"start":72266,"end":72325},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" let sort_id = self.mem.get_sort_id(sort_ident)?;"},{"Add":" // Needs to make a new bound type"}],"del_contents":[{"Del":" let sort_num = self.mem.get_sort_num(sort_ident)?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":1025,"ins":{"up_context":[{"change":3,"pos":72370}],"down_context":[{"change":3,"pos":72407}],"flag":"BLOCK","start":12212,"end":12248,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":72370},"to":{"change":3,"start":72370,"end":72407},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" ty_accum.add_sort(sort_id);"}],"del_contents":[{"Del":" ty_accum.add_sort(sort_num);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":1027,"ins":{"up_context":[{"change":3,"pos":72426}],"down_context":[{"change":3,"pos":72477}],"flag":"BLOCK","start":12249,"end":12306,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":72426},"to":{"change":3,"start":72426,"end":72477},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" ty_accum |= Type::from(self.take_next_bv());"}],"del_contents":[{"Del":" ty_accum.inner |= self.take_next_bv();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":1031,"ins":{"up_context":[{"change":3,"pos":72583}],"down_context":[{"change":3,"pos":72693}],"flag":"BLOCK","start":12307,"end":12413,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":72583},"to":{"change":3,"start":72583,"end":72693},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" let dep_pos = none_err!(self.potential_deps().position(|v| v.ident == Some(dep_ident)))?;"}],"del_contents":[{"Del":" let dep_pos = 1 + none_err!(self.potential_deps().position(|v| v.ident == Some(dep_ident)))?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":1048,"ins":{"up_context":[{"change":3,"pos":73112}],"down_context":[{"change":3,"pos":73208}],"flag":"BLOCK","start":12414,"end":12552,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":73112},"to":{"change":3,"start":73112,"end":73208},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" fn return_ty(&mut self, mut arrow_args: I, mode: &str) -> Res<()> "},{"Add":" where I: Iterator + ExactSizeIterator + Clone {"}],"del_contents":[{"Del":" fn return_ty(&mut self, mut arrow_args: std::iter::Skip>, mode: &str) -> Res<()> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":1060,"ins":{"up_context":[{"change":3,"pos":73741}],"down_context":[{"change":3,"pos":73874}],"flag":"BLOCK","start":12553,"end":12694,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":73741},"to":{"change":3,"start":73741,"end":73874},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" let sort_id = self.mem.get_sort_id(sort_ident)?;"},{"Add":" let mut ty_accum = Type::new_of_sort(sort_id.into_inner());"}],"del_contents":[{"Del":" let sort_num = self.mem.get_sort_num(sort_ident)?;\n let mut ty_accum = Type::new_with_sort(sort_num);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":1064,"ins":{"up_context":[{"change":3,"pos":73932}],"down_context":[{"change":3,"pos":74046}],"flag":"BLOCK","start":12695,"end":12805,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":73932},"to":{"change":3,"start":73932,"end":74046},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" let dep_pos = none_err!(self.potential_deps().position(|v| v.ident == Some(dep_ident)))?;"}],"del_contents":[{"Del":" let dep_pos = 1 + none_err!(self.potential_deps().position(|v| v.ident == Some(dep_ident)))?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":1093,"ins":{"up_context":[{"change":3,"pos":74755}],"down_context":[{"change":3,"pos":74786}],"flag":"BLOCK","start":12806,"end":12882,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":74755},"to":{"change":3,"start":74755,"end":74786},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" match maybe_cmd.map_err(|e| VerifErr::Msg(format!(\"{}\", e)))? {"}],"del_contents":[{"Del":" match maybe_cmd? {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":1101,"ins":{"up_context":[{"change":3,"pos":75137}],"down_context":[{"change":3,"pos":75192}],"flag":"BLOCK","start":12883,"end":12933,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":75137},"to":{"change":3,"start":75137,"end":75192},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" UnifyCmd::Term { tid, save } => {"}],"del_contents":[{"Del":" UnifyCmd::Term { term_num, save } => {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":1104,"ins":{"up_context":[{"change":3,"pos":75323}],"down_context":[{"change":3,"pos":75375}],"flag":"BLOCK","start":12934,"end":12981,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":75323},"to":{"change":3,"start":75323,"end":75375},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" make_sure!(tid == n2);"}],"del_contents":[{"Del":" make_sure!(term_num == n2);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":38844},"path":"src/mmz/parse.rs","line":1113,"ins":{"up_context":[{"change":3,"pos":75706}],"down_context":[{"change":3,"pos":75755}],"flag":"BLOCK","start":12982,"end":13028,"inode":{"change":3,"pos":38844}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":75706},"to":{"change":3,"start":75706,"end":75755},"introduced_by":3}],"inode":{"change":3,"pos":38844}},"ins_contents":[{"Add":" UnifyCmd::Dummy(sort_id) => {"}],"del_contents":[{"Del":" UnifyCmd::Dummy { sort_id } => {\n"}]}},{"FileMove":{"meta":{"basename":"mod.rs","metadata":0},"old":[{"basename":"mod.rs","metadata":420}],"up":[{"change":3,"pos":38832}],"down":[{"change":3,"pos":76417}],"show_perms":true}},{"Edit":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":17,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":76702},"to":{"change":3,"start":76702,"end":76743},"introduced_by":3}],"inode":{"change":3,"pos":76417}}},"contents":[{"Del":" SortNum,\n TermNum,\n AssertNum,\n"}]}},{"Edit":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":22,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":76813},"to":{"change":3,"start":76813,"end":76832},"introduced_by":3}],"inode":{"change":3,"pos":76417}}},"contents":[{"Del":" Type,\n Term\n"}]}},{"Replacement":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":23,"ins":{"up_context":[{"change":3,"pos":76835}],"down_context":[{"change":3,"pos":76866}],"flag":"BLOCK","start":13047,"end":13148,"inode":{"change":3,"pos":76417}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":76835},"to":{"change":3,"start":76835,"end":76866},"introduced_by":3}],"inode":{"change":3,"pos":76417}},"ins_contents":[{"Add":"use mm0_util::{ Modifiers, SortId, TermId, ThmId };"},{"Add":"use mm0b_parser::{ NumdStmtCmd, TermRef, Type };"}],"del_contents":[{"Del":"use crate::mmb::stmt::StmtCmd;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":33,"ins":{"up_context":[{"change":3,"pos":77036}],"down_context":[{"change":3,"pos":77059}],"flag":"BLOCK","start":13149,"end":13175,"inode":{"change":3,"pos":76417}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":77036},"to":{"change":3,"start":77036,"end":77059},"introduced_by":3}],"inode":{"change":3,"pos":76417}},"ins_contents":[{"Add":" term_num: TermId,"}],"del_contents":[{"Del":" term_num: u32,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":36,"ins":{"up_context":[{"change":3,"pos":77115}],"down_context":[{"change":3,"pos":77138}],"flag":"BLOCK","start":13176,"end":13198,"inode":{"change":3,"pos":76417}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":77115},"to":{"change":3,"start":77115,"end":77138},"introduced_by":3}],"inode":{"change":3,"pos":76417}},"ins_contents":[{"Add":" sort: SortId,"}],"del_contents":[{"Del":" sort: SortNum,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":41,"ins":{"up_context":[{"change":3,"pos":77171}],"down_context":[{"change":3,"pos":77202}],"flag":"BLOCK","start":13199,"end":13229,"inode":{"change":3,"pos":76417}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":77171},"to":{"change":3,"start":77171,"end":77202},"introduced_by":3}],"inode":{"change":3,"pos":76417}},"ins_contents":[{"Add":" fn sort(self) -> SortId {"}],"del_contents":[{"Del":" fn sort(self) -> SortNum {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":66,"ins":{"up_context":[{"change":3,"pos":77724}],"down_context":[{"change":3,"pos":77751}],"flag":"BLOCK","start":13230,"end":13254,"inode":{"change":3,"pos":76417}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":77724},"to":{"change":3,"start":77724,"end":77751},"introduced_by":3}],"inode":{"change":3,"pos":76417}},"ins_contents":[{"Add":" self.ty.bound()"}],"del_contents":[{"Del":" self.ty.is_bound()\n"}]}},{"Replacement":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":69,"ins":{"up_context":[{"change":3,"pos":77758}],"down_context":[{"change":3,"pos":77788}],"flag":"BLOCK","start":13255,"end":13289,"inode":{"change":3,"pos":76417}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":77758},"to":{"change":3,"start":77758,"end":77788},"introduced_by":3}],"inode":{"change":3,"pos":76417}},"ins_contents":[{"Add":" pub fn sort(self) -> SortId {"}],"del_contents":[{"Del":" pub fn sort(self) -> u8 {\n"}]}},{"Edit":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":73,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":77819},"to":{"change":3,"start":77819,"end":77950},"introduced_by":3}],"inode":{"change":3,"pos":76417}}},"contents":[{"Del":"\n//#[derive(Debug)]\n//pub struct DeclaredNotation<'a> {\n// pub has_coe: bool,\n// pub consts: Vec<(Str<'a>, Option)>\n//}\n"}]}},{"Edit":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":74,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":77951},"to":{"change":3,"start":77951,"end":78157},"introduced_by":3}],"inode":{"change":3,"pos":76417}}},"contents":[{"Del":"//impl<'a> std::default::Default for DeclaredNotation<'a> {\n// fn default() -> Self {\n// DeclaredNotation {\n// has_coe: false,\n// consts: Vec::new()\n// }\n// }\n//}\n\n"}]}},{"Replacement":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":161,"ins":{"up_context":[{"change":3,"pos":79346}],"down_context":[{"change":3,"pos":79373}],"flag":"BLOCK","start":13290,"end":13316,"inode":{"change":3,"pos":76417}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":79346},"to":{"change":3,"start":79346,"end":79373},"introduced_by":3}],"inode":{"change":3,"pos":76417}},"ins_contents":[{"Add":" term_num: TermId,"}],"del_contents":[{"Del":" term_num: TermNum,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":170,"ins":{"up_context":[{"change":3,"pos":79599}],"down_context":[{"change":3,"pos":79632}],"flag":"BLOCK","start":13317,"end":13349,"inode":{"change":3,"pos":76417}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":79599},"to":{"change":3,"start":79599,"end":79632},"introduced_by":3}],"inode":{"change":3,"pos":76417}},"ins_contents":[{"Add":" middleman_sort: SortId,"}],"del_contents":[{"Del":" middleman_sort: SortNum,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":258,"ins":{"up_context":[{"change":2,"pos":7443}],"down_context":[{"change":3,"pos":80428}],"flag":"BLOCK","start":13350,"end":13468,"inode":{"change":3,"pos":76417}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":7443},"to":{"change":3,"start":80216,"end":80428},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":80216},"to":{"change":3,"start":80216,"end":80428},"introduced_by":3}],"inode":{"change":3,"pos":76417}},"ins_contents":[{"Add":" pub nonlocal_termdefs: HashMap, TermId>,"},{"Add":" pub nonlocal_asserts: HashMap, ThmId>,"}],"del_contents":[{"Del":" // unneeded\n //pub declared_notations: FxIndexMap, DeclaredNotation<'a>>,\n pub nonlocal_termdefs: HashMap, TermNum>,\n pub nonlocal_asserts: HashMap, AssertNum>,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":261,"ins":{"up_context":[{"change":3,"pos":80459}],"down_context":[{"change":3,"pos":80498}],"flag":"BLOCK","start":13469,"end":13507,"inode":{"change":3,"pos":76417}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":80459},"to":{"change":3,"start":80459,"end":80498},"introduced_by":3}],"inode":{"change":3,"pos":76417}},"ins_contents":[{"Add":" pub provs: HashMap,"}],"del_contents":[{"Del":" pub provs: HashMap,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":265,"ins":{"up_context":[{"change":3,"pos":80622}],"down_context":[{"change":3,"pos":80677}],"flag":"BLOCK","start":13508,"end":13561,"inode":{"change":3,"pos":76417}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":80622},"to":{"change":3,"start":80622,"end":80677},"introduced_by":3}],"inode":{"change":3,"pos":76417}},"ins_contents":[{"Add":" pub coes: HashMap>,"}],"del_contents":[{"Del":" pub coes: HashMap>,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":268,"ins":{"up_context":[{"change":3,"pos":80800}],"down_context":[{"change":2,"pos":7444}],"flag":"BLOCK","start":13562,"end":13605,"inode":{"change":3,"pos":76417}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":80800},"to":{"change":3,"start":80800,"end":80845},"introduced_by":3}],"inode":{"change":3,"pos":76417}},"ins_contents":[{"Add":" pub coe_prov: HashMap,"}],"del_contents":[{"Del":" pub coe_prov: HashMap,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":283,"ins":{"up_context":[{"change":3,"pos":81126}],"down_context":[{"change":3,"pos":81266}],"flag":"BLOCK","start":13606,"end":13723,"inode":{"change":3,"pos":76417}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":81126},"to":{"change":3,"start":81126,"end":81266},"introduced_by":3}],"inode":{"change":3,"pos":76417}},"ins_contents":[{"Add":" mmz: none_err!(outline.file_view.mmz.first())?.as_bytes(),"},{"Add":" mmz_files: outline.file_view.mmz,"}],"del_contents":[{"Del":" mmz: none_err!(outline.file_data.mmz_files.first())?.as_bytes(),\n mmz_files: outline.file_data.mmz_files.as_slice(),\n"}]}},{"Edit":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":294,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":7490},"to":{"change":3,"start":81482,"end":81561},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":81482},"to":{"change":3,"start":81482,"end":81561},"introduced_by":3}],"inode":{"change":3,"pos":76417}}},"contents":[{"Del":" //declared_notations: FxIndexMap::with_hasher(Default::default()),\n"}]}},{"Replacement":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":306,"ins":{"up_context":[{"change":3,"pos":81901}],"down_context":[{"change":3,"pos":81976}],"flag":"BLOCK","start":13724,"end":13803,"inode":{"change":3,"pos":76417}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":81901},"to":{"change":3,"start":81901,"end":81976},"introduced_by":3}],"inode":{"change":3,"pos":76417}},"ins_contents":[{"Add":" pub fn verify1(&mut self, bump: &mut Bump, stmt: NumdStmtCmd) -> Res<()> {"}],"del_contents":[{"Del":" pub fn verify1(&mut self, bump: &mut Bump, stmt: StmtCmd) -> Res<()> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":309,"ins":{"up_context":[{"change":3,"pos":82042}],"down_context":[{"change":3,"pos":82217}],"flag":"BLOCK","start":13804,"end":14009,"inode":{"change":3,"pos":76417}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":82042},"to":{"change":3,"start":82042,"end":82217},"introduced_by":3}],"inode":{"change":3,"pos":76417}},"ins_contents":[{"Add":" NumdStmtCmd::Sort {..} => None,"},{"Add":" NumdStmtCmd::TermDef {..} => {"},{"Add":" let term = none_err!(self.outline.file_view.mmb.term(TermId(self.num_termdefs_done())))?;"}],"del_contents":[{"Del":" StmtCmd::Sort {..} => None,\n StmtCmd::TermDef {..} => {\n let term = self.outline.get_term_by_num(self.num_termdefs_done())?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":314,"ins":{"up_context":[{"change":3,"pos":82269}],"down_context":[{"change":3,"pos":82421}],"flag":"BLOCK","start":14010,"end":14188,"inode":{"change":3,"pos":76417}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":82269},"to":{"change":3,"start":82269,"end":82421},"introduced_by":3}],"inode":{"change":3,"pos":76417}},"ins_contents":[{"Add":" NumdStmtCmd::Axiom {..} | NumdStmtCmd::Thm {..} => {"},{"Add":" let assert = none_err!(self.outline.file_view.mmb.thm(ThmId(self.num_asserts_done())))?;"}],"del_contents":[{"Del":" StmtCmd::Axiom {..} | StmtCmd::Thm {..} => {\n let assert = self.outline.get_assert_by_num(self.num_asserts_done())?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":331,"ins":{"up_context":[{"change":3,"pos":82789}],"down_context":[{"change":3,"pos":82852}],"flag":"BLOCK","start":14189,"end":14250,"inode":{"change":3,"pos":76417}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":82789},"to":{"change":3,"start":82789,"end":82852},"introduced_by":3}],"inode":{"change":3,"pos":76417}},"ins_contents":[{"Add":" pub fn coe_prov_or_else(&self, from: SortId) -> SortId {"}],"del_contents":[{"Del":" pub fn coe_prov_or_else(&self, from: SortNum) -> SortNum {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":336,"ins":{"up_context":[{"change":3,"pos":82918}],"down_context":[{"change":3,"pos":83018}],"flag":"BLOCK","start":14251,"end":14358,"inode":{"change":3,"pos":76417}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":82918},"to":{"change":3,"start":82918,"end":83018},"introduced_by":3}],"inode":{"change":3,"pos":76417}},"ins_contents":[{"Add":" pub fn add_termdef(&mut self, ident: Str<'a>) -> TermId {"},{"Add":" let idx = TermId(self.num_termdefs);"}],"del_contents":[{"Del":" pub fn add_termdef(&mut self, ident: Str<'a>) -> TermNum {\n let idx = self.num_termdefs;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":342,"ins":{"up_context":[{"change":3,"pos":83107}],"down_context":[{"change":3,"pos":83207}],"flag":"BLOCK","start":14359,"end":14462,"inode":{"change":3,"pos":76417}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":83107},"to":{"change":3,"start":83107,"end":83207},"introduced_by":3}],"inode":{"change":3,"pos":76417}},"ins_contents":[{"Add":" pub fn add_assert(&mut self, ident: Str<'a>) -> ThmId {"},{"Add":" let idx = ThmId(self.num_asserts);"}],"del_contents":[{"Del":" pub fn add_assert(&mut self, ident: Str<'a>) -> AssertNum {\n let idx = self.num_asserts;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":349,"ins":{"up_context":[{"change":3,"pos":83296}],"down_context":[{"change":3,"pos":83356}],"flag":"BLOCK","start":14463,"end":14526,"inode":{"change":3,"pos":76417}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":83296},"to":{"change":3,"start":83296,"end":83356},"introduced_by":3}],"inode":{"change":3,"pos":76417}},"ins_contents":[{"Add":" pub fn get_sort_id(&self, ident: Str<'a>) -> Res {"}],"del_contents":[{"Del":" pub fn get_sort_num(&self, ident: Str<'a>) -> Res {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":351,"ins":{"up_context":[{"change":3,"pos":83431}],"down_context":[{"change":3,"pos":83468}],"flag":"BLOCK","start":14527,"end":14583,"inode":{"change":3,"pos":76417}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":83431},"to":{"change":3,"start":83431,"end":83468},"introduced_by":3}],"inode":{"change":3,"pos":76417}},"ins_contents":[{"Add":" conv_err!(u8::try_from(idx).map(|n| SortId(n)))"}],"del_contents":[{"Del":" conv_err!(u8::try_from(idx))\n"}]}},{"Replacement":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":354,"ins":{"up_context":[{"change":3,"pos":83475}],"down_context":[{"change":3,"pos":83535}],"flag":"BLOCK","start":14584,"end":14648,"inode":{"change":3,"pos":76417}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":83475},"to":{"change":3,"start":83475,"end":83535},"introduced_by":3}],"inode":{"change":3,"pos":76417}},"ins_contents":[{"Add":" pub fn add_sort(&mut self, ident: Str<'a>) -> Res {"}],"del_contents":[{"Del":" pub fn add_sort(&mut self, ident: Str<'a>) -> SortNum {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":358,"ins":{"up_context":[{"change":3,"pos":83661}],"down_context":[{"change":3,"pos":83866}],"flag":"BLOCK","start":14649,"end":14899,"inode":{"change":3,"pos":76417}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":83661},"to":{"change":3,"start":83661,"end":83866},"introduced_by":3}],"inode":{"change":3,"pos":76417}},"ins_contents":[{"Add":" let sort_id = SortId(u8::try_from(idx).unwrap());"},{"Add":" let is_provable = self.outline.file_view.mmb_sort_mods(sort_id)?.contains(Modifiers::PROVABLE);"},{"Add":" assert!(self.provs.insert(sort_id, is_provable).is_none());"},{"Add":" Ok(sort_id)"}],"del_contents":[{"Del":" let sort_num = u8::try_from(idx).unwrap();\n let mods = self.outline.get_sort_mods(idx).unwrap();\n assert!(self.provs.insert(sort_num, mods.is_provable()).is_none());\n sort_num\n"}]}},{"Replacement":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":364,"ins":{"up_context":[{"change":3,"pos":83873}],"down_context":[{"change":3,"pos":83936}],"flag":"BLOCK","start":14900,"end":14976,"inode":{"change":3,"pos":76417}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":83873},"to":{"change":3,"start":83873,"end":83936},"introduced_by":3}],"inode":{"change":3,"pos":76417}},"ins_contents":[{"Add":" pub fn num_sorts_done(&self) -> SortId {"},{"Add":" SortId(self.num_sorts)"}],"del_contents":[{"Del":" pub fn num_sorts_done(&self) -> u8{\n self.num_sorts\n"}]}},{"Replacement":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":374,"ins":{"up_context":[{"change":3,"pos":84095}],"down_context":[{"change":3,"pos":84149}],"flag":"BLOCK","start":14977,"end":15035,"inode":{"change":3,"pos":76417}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":84095},"to":{"change":3,"start":84095,"end":84149},"introduced_by":3}],"inode":{"change":3,"pos":76417}},"ins_contents":[{"Add":" pub fn add_declar(&mut self, stmt_cmd: NumdStmtCmd) {"}],"del_contents":[{"Del":" pub fn add_declar(&mut self, stmt_cmd: StmtCmd) {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":376,"ins":{"up_context":[{"change":3,"pos":84174}],"down_context":[{"change":3,"pos":84368}],"flag":"BLOCK","start":15036,"end":15246,"inode":{"change":3,"pos":76417}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":84174},"to":{"change":3,"start":84174,"end":84368},"introduced_by":3}],"inode":{"change":3,"pos":76417}},"ins_contents":[{"Add":" NumdStmtCmd::Sort {..} => self.num_sorts += 1,"},{"Add":" NumdStmtCmd::TermDef {..} => self.num_termdefs += 1,"},{"Add":" NumdStmtCmd::Axiom {..} | NumdStmtCmd::Thm {..} => self.num_asserts += 1,"}],"del_contents":[{"Del":" StmtCmd::Sort {..} => self.num_sorts += 1,\n StmtCmd::TermDef {..} => self.num_termdefs += 1,\n StmtCmd::Axiom {..} | StmtCmd::Thm {..} => self.num_asserts += 1,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":382,"ins":{"up_context":[{"change":3,"pos":84385}],"down_context":[{"change":3,"pos":84457}],"flag":"BLOCK","start":15247,"end":15322,"inode":{"change":3,"pos":76417}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":84385},"to":{"change":3,"start":84385,"end":84457},"introduced_by":3}],"inode":{"change":3,"pos":76417}},"ins_contents":[{"Add":" pub fn get_term_by_ident(&self, ident: &Str<'a>) -> Res> {"}],"del_contents":[{"Del":" pub fn get_term_by_ident(&self, ident: &Str<'a>) -> Res> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":384,"ins":{"up_context":[{"change":3,"pos":84536}],"down_context":[{"change":3,"pos":84583}],"flag":"BLOCK","start":15323,"end":15384,"inode":{"change":3,"pos":76417}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":84536},"to":{"change":3,"start":84536,"end":84583},"introduced_by":3}],"inode":{"change":3,"pos":76417}},"ins_contents":[{"Add":" none_err!(self.outline.file_view.mmb.term(term_num))"}],"del_contents":[{"Del":" self.outline.get_term_by_num(term_num)\n"}]}},{"Edit":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":407,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":84929},"to":{"change":3,"start":84929,"end":84930},"introduced_by":3}],"inode":{"change":3,"pos":76417}}},"contents":[{"Del":"\n"}]}},{"Replacement":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":431,"ins":{"up_context":[{"change":3,"pos":85643}],"down_context":[{"change":3,"pos":85681}],"flag":"BLOCK","start":15385,"end":15423,"inode":{"change":3,"pos":76417}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":85643},"to":{"change":3,"start":85643,"end":85681},"introduced_by":3}],"inode":{"change":3,"pos":76417}},"ins_contents":[{"Add":" assert!(outgoing >> 55 == 0);"}],"del_contents":[{"Del":" assert!(outgoing >> 56 == 0);\n"}]}},{"Edit":{"inode":{"change":3,"pos":76417},"path":"src/mmz/mod.rs","line":447,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":86227},"to":{"change":3,"start":86227,"end":86447},"introduced_by":3}],"inode":{"change":3,"pos":76417}}},"contents":[{"Del":" /// Produce an iterator with the same elements as what an Mmb `Args` should have ()\n pub fn args_iter(&self) -> impl Iterator {\n self.vars_done.iter().copied().filter(|v| !v.is_dummy)\n }\n\n"}]}},{"FileMove":{"meta":{"basename":"math_parser.rs","metadata":0},"old":[{"basename":"math_parser.rs","metadata":420}],"up":[{"change":3,"pos":38832}],"down":[{"change":3,"pos":86855}],"show_perms":true}},{"Edit":{"inode":{"change":3,"pos":86855},"path":"src/mmz/math_parser.rs","line":4,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":8091}],"down_context":[{"change":3,"pos":86856}],"flag":"BLOCK","start":15450,"end":15477,"inode":{"change":3,"pos":86855}}},"contents":[{"Add":"use std::convert::TryFrom;"}]}},{"Edit":{"inode":{"change":3,"pos":86855},"path":"src/mmz/math_parser.rs","line":23,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":87172},"to":{"change":3,"start":87172,"end":87182},"introduced_by":3}],"inode":{"change":3,"pos":86855}}},"contents":[{"Del":" Term,\n"}]}},{"Edit":{"inode":{"change":3,"pos":86855},"path":"src/mmz/math_parser.rs","line":24,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":87185}],"down_context":[{"change":3,"pos":87185}],"flag":"BLOCK","start":15478,"end":15526,"inode":{"change":3,"pos":86855}}},"contents":[{"Add":"use mm0_util::TermId;"},{"Add":"use mm0b_parser::TermRef;"}]}},{"Replacement":{"inode":{"change":3,"pos":86855},"path":"src/mmz/math_parser.rs","line":185,"ins":{"up_context":[{"change":2,"pos":9895}],"down_context":[{"change":3,"pos":91721}],"flag":"BLOCK","start":15527,"end":15563,"inode":{"change":3,"pos":86855}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":9895},"to":{"change":3,"start":91680,"end":91721},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":91680},"to":{"change":3,"start":91680,"end":91721},"introduced_by":3}],"inode":{"change":3,"pos":86855}},"ins_contents":[{"Add":" if term.args().len() == 0 {"}],"del_contents":[{"Del":" if term.num_args_no_ret() == 0 {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":86855},"path":"src/mmz/math_parser.rs","line":187,"ins":{"up_context":[{"change":3,"pos":91752}],"down_context":[{"change":3,"pos":91794}],"flag":"BLOCK","start":15564,"end":15601,"inode":{"change":3,"pos":86855}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":91752},"to":{"change":3,"start":91752,"end":91794},"introduced_by":3}],"inode":{"change":3,"pos":86855}},"ins_contents":[{"Add":" term_num: term.tid, "}],"del_contents":[{"Del":" term_num: term.term_num, \n"}]}},{"Replacement":{"inode":{"change":3,"pos":86855},"path":"src/mmz/math_parser.rs","line":197,"ins":{"up_context":[{"change":3,"pos":92118}],"down_context":[{"change":2,"pos":9896}],"flag":"BLOCK","start":15602,"end":15647,"inode":{"change":3,"pos":86855}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":92118},"to":{"change":3,"start":92118,"end":92155},"introduced_by":3}],"inode":{"change":3,"pos":86855}},"ins_contents":[{"Add":" for arg in term.args_and_ret() {"}],"del_contents":[{"Del":" for arg in term.args() {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":86855},"path":"src/mmz/math_parser.rs","line":208,"ins":{"up_context":[{"change":3,"pos":92485}],"down_context":[{"change":3,"pos":92576}],"flag":"BLOCK","start":15648,"end":15753,"inode":{"change":3,"pos":86855}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":92485},"to":{"change":3,"start":92485,"end":92576},"introduced_by":3}],"inode":{"change":3,"pos":86855}},"ins_contents":[{"Add":" term_num: term.tid,"},{"Add":" num_args: u16::try_from(term.args().len()).unwrap(),"}],"del_contents":[{"Del":" term_num: term.term_num,\n num_args: term.num_args_no_ret(),\n"}]}},{"Replacement":{"inode":{"change":3,"pos":86855},"path":"src/mmz/math_parser.rs","line":248,"ins":{"up_context":[{"change":3,"pos":93609}],"down_context":[{"change":2,"pos":10514}],"flag":"BLOCK","start":15754,"end":15848,"inode":{"change":3,"pos":86855}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":93609},"to":{"change":3,"start":93609,"end":93681},"introduced_by":3}],"inode":{"change":3,"pos":86855}},"ins_contents":[{"Add":" let term = none_err!(self.mem.outline.file_view.mmb.term(TermId(term_num)))?;"}],"del_contents":[{"Del":" let term = self.mem.outline.get_term_by_num(term_num)?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":86855},"path":"src/mmz/math_parser.rs","line":261,"ins":{"up_context":[{"change":2,"pos":10885}],"down_context":[{"change":2,"pos":10886}],"flag":"BLOCK","start":15849,"end":15877,"inode":{"change":3,"pos":86855}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":10885},"to":{"change":3,"start":94145,"end":94170},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":94145},"to":{"change":3,"start":94145,"end":94170},"introduced_by":3}],"inode":{"change":3,"pos":86855}},"ins_contents":[{"Add":" term: TermRef<'a>, "}],"del_contents":[{"Del":" term: Term<'a>, \n"}]}},{"Replacement":{"inode":{"change":3,"pos":86855},"path":"src/mmz/math_parser.rs","line":286,"ins":{"up_context":[{"change":3,"pos":94671}],"down_context":[{"change":2,"pos":11848}],"flag":"BLOCK","start":15878,"end":15953,"inode":{"change":3,"pos":86855}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":94671},"to":{"change":2,"start":11781,"end":11848},"introduced_by":2}],"inode":{"change":3,"pos":86855}},"ins_contents":[{"Add":" let sig_e = none_err!(term.args_and_ret().get(*pos))?;"}],"del_contents":[{"Del":" let sig_e = none_err!(term.args().nth(*pos))?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":86855},"path":"src/mmz/math_parser.rs","line":308,"ins":{"up_context":[{"change":2,"pos":12136}],"down_context":[{"change":2,"pos":12219}],"flag":"BLOCK","start":15954,"end":16051,"inode":{"change":3,"pos":86855}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":12136},"to":{"change":2,"start":12136,"end":12219},"introduced_by":2}],"inode":{"change":3,"pos":86855}},"ins_contents":[{"Add":" term_num: term.tid,"},{"Add":" num_args: u16::try_from(term.args().len()).unwrap(),"}],"del_contents":[{"Del":" term_num: term.term_num,\n num_args: term.num_args_no_ret(),\n"}]}},{"Replacement":{"inode":{"change":3,"pos":86855},"path":"src/mmz/math_parser.rs","line":338,"ins":{"up_context":[{"change":3,"pos":96505}],"down_context":[{"change":2,"pos":12489}],"flag":"BLOCK","start":16052,"end":16139,"inode":{"change":3,"pos":86855}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":96505},"to":{"change":3,"start":96505,"end":96589},"introduced_by":3}],"inode":{"change":3,"pos":86855}},"ins_contents":[{"Add":" fn take_ge_infix(&mut self, last_prec: Prec) -> Option, Prec)>> {"}],"del_contents":[{"Del":" fn take_ge_infix(&mut self, last_prec: Prec) -> Option, Prec)>> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":86855},"path":"src/mmz/math_parser.rs","line":340,"ins":{"up_context":[{"change":2,"pos":12565}],"down_context":[{"change":3,"pos":96754}],"flag":"BLOCK","start":16140,"end":16245,"inode":{"change":3,"pos":86855}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":12565},"to":{"change":3,"start":96671,"end":96754},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":96671},"to":{"change":3,"start":96671,"end":96754},"introduced_by":3}],"inode":{"change":3,"pos":86855}},"ins_contents":[{"Add":" let infix_term = none_err!(self.mem.outline.file_view.mmb.term(TermId(notation_info.term_num)));"}],"del_contents":[{"Del":" let infix_term = self.mem.outline.get_term_by_num(notation_info.term_num);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":86855},"path":"src/mmz/math_parser.rs","line":358,"ins":{"up_context":[{"change":2,"pos":12758}],"down_context":[{"change":2,"pos":12806}],"flag":"BLOCK","start":16246,"end":16297,"inode":{"change":3,"pos":86855}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":12758},"to":{"change":2,"start":12758,"end":12806},"introduced_by":2}],"inode":{"change":3,"pos":86855}},"ins_contents":[{"Add":" (op0_term, op0_prec): (TermRef<'a>, Prec),"}],"del_contents":[{"Del":" (op0_term, op0_prec): (Term<'a>, Prec),\n"}]}},{"Replacement":{"inode":{"change":3,"pos":86855},"path":"src/mmz/math_parser.rs","line":369,"ins":{"up_context":[{"change":2,"pos":13315}],"down_context":[{"change":2,"pos":13498}],"flag":"BLOCK","start":16298,"end":16359,"inode":{"change":3,"pos":86855}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":13315},"to":{"change":2,"start":13315,"end":13498},"introduced_by":2}],"inode":{"change":3,"pos":86855}},"ins_contents":[{"Add":" if let [fst, snd, _] = op0_term.args_and_ret() {"}],"del_contents":[{"Del":" let mut plus_args = op0_term.args();\n if let (Some(fst), Some(snd), Some(_), None) = (plus_args.next(), plus_args.next(), plus_args.next(), plus_args.next()) {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":86855},"path":"src/mmz/math_parser.rs","line":374,"ins":{"up_context":[{"change":3,"pos":98441}],"down_context":[{"change":2,"pos":13728}],"flag":"BLOCK","start":16360,"end":16481,"inode":{"change":3,"pos":86855}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":98441},"to":{"change":2,"start":13621,"end":13728},"introduced_by":2}],"inode":{"change":3,"pos":86855}},"ins_contents":[{"Add":" term_num: op0_term.tid,"},{"Add":" num_args: u16::try_from(op0_term.args().len()).unwrap(),"}],"del_contents":[{"Del":" term_num: op0_term.term_num,\n num_args: op0_term.num_args_no_ret(),\n"}]}},{"FileDel":{"deleted_names":[{"basename":"stmt.rs","metadata":420}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":98752},"to":{"change":3,"start":107347,"end":107356},"introduced_by":3},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":107356},"to":{"change":3,"start":107357,"end":107357},"introduced_by":3}],"inode":{"change":3,"pos":107357}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":107357},"to":{"change":3,"start":107358,"end":110188},"introduced_by":3}],"inode":{"change":3,"pos":107357}},"content":[{"Del":"\n/// `STMT_AXIOM = 0x02`, starts an `axiom` declaration\npub const STMT_AXIOM: u8 = 0x02;\n/// `STMT_SORT = 0x04`, starts a `sort` declaration\npub const STMT_SORT: u8 = 0x04;\n// `STMT_TERM = 0x05`, starts a `term` declaration\n//pub const STMT_TERM: u8 = 0x05;\n/// `STMT_DEF = 0x05`, starts a `def` declaration. (This is the same as\n/// `STMT_TERM` because the actual indication of whether this is a\n/// def is in the term header)\npub const STMT_DEF: u8 = 0x05;\n/// `STMT_THM = 0x06`, starts a `theorem` declaration\npub const STMT_THM: u8 = 0x06;\n/// `STMT_LOCAL = 0x08`, starts a `local` declaration\n/// (a bit mask to be combined with `STMT_THM` or `STMT_DEF`)\npub const STMT_LOCAL: u8 = 0x08;\n/// `STMT_LOCAL_DEF = 0x0D`\npub const STMT_LOCAL_DEF: u8 = STMT_LOCAL | STMT_DEF;\n/// `STMT_LOCAL_THM = 0x0E`\npub const STMT_LOCAL_THM: u8 = STMT_LOCAL | STMT_THM;\n\n\n/// The main part of the proof consists of a sequence of declarations,\n/// and these commands denote the different kind of declaration that can\n/// be introduced.\n#[derive(Debug, Clone, Copy, PartialEq, Eq)]\npub enum StmtCmd {\n /// A new sort. Equivalent to `sort foo;`. This is followed by no data,\n /// as the sort data is stored in the header.\n Sort { num: Option },\n /// A new axiom. Equivalent to `axiom foo ...`. This is followed by a proof\n /// sequence, that should unify with the unify sequence in the header.\n Axiom { num: Option },\n /// A new term or def. Equivalent to `term/def foo ...`.\n /// If `local` is true, then this is `local def foo`. This is followed by\n /// no data, as the header contains the unify sequence and can be checked on its own.\n TermDef { num: Option, local: bool },\n /// A new theorem. Equivalent to `(pub) theorem foo ...`, where `local` means\n /// that the theorem is not `pub`. This is followed by a proof sequence,\n /// that will construct the statement and proof, and should unify\n /// with the unify sequence in the header.\n Thm { num: Option, local: bool },\n}\n\nimpl StmtCmd {\n pub fn is_local(self) -> bool {\n match self {\n | StmtCmd::TermDef { local: true, .. } \n | StmtCmd::Thm { local: true, .. } => true,\n _ => false\n }\n }\n}\n\nimpl std::convert::TryFrom for StmtCmd {\n type Error = ();\n fn try_from(cmd: u8) -> Result {\n Ok(match cmd {\n STMT_SORT => StmtCmd::Sort { num: None },\n STMT_AXIOM => StmtCmd::Axiom { num: None },\n STMT_DEF => StmtCmd::TermDef { num: None, local: false },\n STMT_LOCAL_DEF => StmtCmd::TermDef { num: None, local: true },\n STMT_THM => StmtCmd::Thm { num: None, local: false },\n STMT_LOCAL_THM => StmtCmd::Thm { num: None, local: true },\n _ => return Err(()),\n })\n }\n}\n\n"}]}},{"FileDel":{"deleted_names":[{"basename":"index.rs","metadata":420}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":98752},"to":{"change":3,"start":141551,"end":141561},"introduced_by":3},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":141561},"to":{"change":3,"start":141562,"end":141562},"introduced_by":3}],"inode":{"change":3,"pos":141562}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":141562},"to":{"change":3,"start":141563,"end":145832},"introduced_by":3}],"inode":{"change":3,"pos":141562}},"content":[{"Del":"use std::fmt::{ Debug, Formatter, Result as FmtResult };\nuse crate::mmb::Header;\nuse crate::util::{\n parse_u8,\n parse_u32,\n parse_u64,\n Res,\n VerifErr\n};\nuse crate::none_err;\n\n/// A parsed `MMB` file index.\npub struct Index<'a> {\n /// The full file\n pub mmb: &'a [u8],\n /// A pointer to the root of the binary search tree, for searching based on name.\n pub root: u64,\n /// Pointers to the index entries for the sorts\n pub sorts: Vec,\n /// Pointers to the index entries for the terms\n // The u64 you get back is to an `indexentry`.\n pub terms: Vec,\n /// Pointers to the index entries for the theorems\n pub thms: Vec,\n}\n\nimpl<'a> Debug for Index<'a> {\n fn fmt(&self, f: &mut Formatter) -> FmtResult {\n let mut d = f.debug_struct(\"Index\");\n d.field(\"root\", &self.root);\n d.field(\"sorts\", &self.sorts);\n d.field(\"terms\", &self.terms);\n d.field(\"thms\", &self.thms);\n d.finish()\n }\n}\n\nimpl<'a> std::default::Default for Index<'a> {\n fn default() -> Index<'a> {\n Index {\n mmb: b\"\",\n root: 0,\n sorts: Vec::new(),\n terms: Vec::new(),\n thms: Vec::new(),\n }\n }\n}\n\n#[derive(Debug, Clone)]\npub struct IndexEntry<'a> {\n // pointer to left subchild (for binary searching by strings)\n pub left: u64,\n // pointer to right subchild\n pub right: u64,\n // For locating in the source file\n pub row: u32,\n // For locating in the source file\n pub col: u32,\n // pointer to the command that declares this item\n pub proof: u64,\n // Index of the object in the relevant table\n pub ix: u32,\n // sort, term, thm, var\n pub kind: u8,\n // zero-terminated char* buffer\n pub charbuff: &'a [u8],\n}\n\nuse crate::Outline;\nimpl<'a> Outline<'a> {\n #[inline]\n pub fn term_index_entry(&self, term_num: u32) -> Option> {\n let entry = *&self.index.terms[term_num as usize];\n self.index_entry(entry as usize)\n }\n\n #[inline]\n pub fn assert_index_entry(&self, assert_num: u32) -> Option> {\n let entry = *&self.index.thms[assert_num as usize];\n self.index_entry(entry as usize)\n }\n\n #[inline]\n pub fn index_entry(&self, start_at: usize) -> Option> {\n let (left, rest) = parse_u64(&self.mmb()[start_at..]).unwrap();\n let (right, rest) = parse_u64(rest).unwrap();\n let (row, rest) = parse_u32(rest).unwrap();\n let (col, rest) = parse_u32(rest).unwrap();\n let (proof, rest) = parse_u64(rest).unwrap();\n let (ix, rest) = parse_u32(rest).unwrap();\n let (kind, rest) = parse_u8(rest).unwrap();\n let charbuff = parse_cstr(rest)?;\n Some(IndexEntry {\n left,\n right,\n row,\n col,\n proof,\n ix,\n kind,\n charbuff,\n })\n }\n}\n\nfn parse_cstr<'a>(source: &'a [u8]) -> Option<&'a [u8]> {\n let null = source.iter().position(|c| *c == 0)?;\n let (s, _) = source.split_at(null);\n Some(s)\n}\n\npub fn parse_index<'a>(mmb: &'a [u8], header: Header) -> Res> {\n let (root, rest) = parse_u64(&mmb[header.index_start as usize..])\n .expect(\"Failed to get u64 for index root\");\n let (sorts, rest) = prefix_u64(rest, header.num_sorts as usize)\n .expect(\"Failed to get sorts in index\");\n let (terms, rest) = prefix_u64(rest, header.num_terms as usize)\n .expect(\"Failed to get num terms\");\n let (thms, _) = prefix_u64(rest, header.num_thms as usize)\n .expect(\"Failed to get num thms in index\");\n Ok(Index {\n mmb,\n root,\n sorts,\n terms,\n thms,\n })\n}\n\n#[inline]\npub fn prefix_u64(mut bytes: &[u8], num_elems: usize) -> Res<(Vec, &[u8])> {\n let split_point = none_err!{ std::mem::size_of::().checked_mul(num_elems) }?;\n\n if split_point <= bytes.len() {\n let mut v = Vec::with_capacity(num_elems);\n for _ in 0..num_elems {\n let (inner, rest_) = parse_u64(bytes)?;\n bytes = rest_;\n v.push(inner);\n }\n Ok((v, bytes))\n } else {\n Err(VerifErr::Msg(format!(\"Bad prefix arg\")))\n }\n}\n\n"}]}},{"FileMove":{"meta":{"basename":"mmb","metadata":576},"old":[{"basename":"mmb","metadata":1005}],"up":[{"change":3,"pos":24}],"down":[{"change":3,"pos":98752}],"show_perms":true}},{"FileMove":{"meta":{"basename":"unify.rs","metadata":0},"old":[{"basename":"unify.rs","metadata":420}],"up":[{"change":3,"pos":98752}],"down":[{"change":3,"pos":98764}],"show_perms":true}},{"Edit":{"inode":{"change":3,"pos":98764},"path":"src/mmb/unify.rs","line":1,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":98764},"to":{"change":3,"start":98765,"end":98807},"introduced_by":3}],"inode":{"change":3,"pos":98764}}},"contents":[{"Del":"use bumpalo::collections::Vec as BumpVec;\n"}]}},{"Edit":{"inode":{"change":3,"pos":98764},"path":"src/mmb/unify.rs","line":10,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":98912}],"down_context":[{"change":3,"pos":98912}],"flag":"BLOCK","start":16517,"end":16593,"inode":{"change":3,"pos":98764}}},"contents":[{"Add":"use mm0b_parser::{ UnifyIter, UnifyCmd };"},{"Add":"use mm0_util::{ SortId, TermId };"}]}},{"Edit":{"inode":{"change":3,"pos":98764},"path":"src/mmb/unify.rs","line":13,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":98913},"to":{"change":3,"start":98913,"end":98944},"introduced_by":3}],"inode":{"change":3,"pos":98764}}},"contents":[{"Del":"use crate::util::try_next_cmd;\n"}]}},{"Edit":{"inode":{"change":3,"pos":98764},"path":"src/mmb/unify.rs","line":17,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":98989},"to":{"change":3,"start":98989,"end":104055},"introduced_by":3}],"inode":{"change":3,"pos":98764}}},"contents":[{"Del":"/// `UNIFY_TERM = 0x30`: See [`UnifyCmd`](super::UnifyCmd).\npub const UNIFY_TERM: u8 = 0x30;\n/// `UNIFY_TERM_SAVE = 0x31`: See [`UnifyCmd`](super::UnifyCmd).\npub const UNIFY_TERM_SAVE: u8 = 0x31;\n/// `UNIFY_REF = 0x32`: See [`UnifyCmd`](super::UnifyCmd).\npub const UNIFY_REF: u8 = 0x32;\n/// `UNIFY_DUMMY = 0x33`: See [`UnifyCmd`](super::UnifyCmd).\npub const UNIFY_DUMMY: u8 = 0x33;\n/// `UNIFY_HYP = 0x36`: See [`UnifyCmd`](super::UnifyCmd).\npub const UNIFY_HYP: u8 = 0x36;\n\n/// Unify commands appear in the header data for a `def` or `axiom`/`theorem`.\n/// They are executed by the [`ProofCmd::Thm`] command in order to perform\n/// substitutions. The state of the unify stack machine is:\n///\n/// * `MS: Stack`: The main stack, called `S` in the [`ProofCmd`]\n/// documentation.\n/// Since a unification is called as a subroutine during a proof command,\n/// the main stack is available, but most operations don't use it.\n/// * `S: Stack`: The unify stack, which contains expressions\n/// from the target context that are being destructured.\n/// * `H: Vec: The unify heap, also known as the substitution. This is\n/// initialized with the expressions that the target context would like to\n/// substitute for the variable names in the theorem being applied, but\n/// it can be extended in order to support substitutions with sharing\n/// as well as dummy variables.\n#[derive(Debug, Clone, Copy)]\npub enum UnifyCmd {\n /// ```text\n /// UTerm t: S, (t e1 ... en) --> S, en, ..., e1\n /// USave: H; S, e --> H, e; S, e\n /// UTermSave t = USave; UTerm t:\n /// H; S, (t e1 ... en) --> H, (t e1 ... en); S, en, ..., e1\n /// ```\n /// Pop an element from the stack, ensure that the head is `t`, then\n /// push the `n` arguments to the term (in reverse order, so that they\n /// are dealt with in the correct order in the command stream).\n /// `UTermSave` does the same thing but saves the term to the unify heap\n /// before the destructuring.\n Term {\n /** The term that should be at the head */\n term_num: u32,\n /** True if we want to recall this substitution for later */\n save: bool,\n },\n /// ```text\n /// URef i: H; S, Hi --> H; S\n /// ```\n /// Get the `i`-th element from the unify heap (the substitution),\n /// and match it against the head of the unify stack.\n Ref(u32),\n /// ```text\n /// UDummy s: H; S, x --> H, x; S (where x:s)\n /// ```\n /// Pop a variable from the unify stack (ensure that it is a name of\n /// the appropriate sort) and push it to the heap (ensure that it is\n /// distinct from everything else in the substitution).\n Dummy { sort_id: u8 },\n /// ```text\n /// UHyp (UThm mode): MS, |- e; S --> MS; S, e\n /// UHyp (UThmEnd mode): HS, e; S --> HS; S, e\n /// ```\n /// `UHyp` is a command that is used in theorem declarations to indicate that\n /// we are about to read a hypothesis. There are two contexts where we read\n /// this, when we are first declaring the theorem and check the statement (`UThmEnd` mode),\n /// and later when we are applying the theorem and have to apply a substitution (`UThm` mode).\n /// When we are applying the theorem, we have `|- e` on the main stack, and we\n /// pop that and load the expression onto the unify stack.\n /// When we are checking a theorem, we have been pushing hypotheses onto the\n /// hypothesis stack, so we pop it from there instead.\n Hyp,\n}\n\nimpl std::convert::TryFrom<(u8, u32)> for UnifyCmd {\n type Error = VerifErr;\n fn try_from((cmd, data): (u8, u32)) -> Result {\n Ok(match cmd {\n UNIFY_TERM => UnifyCmd::Term {\n term_num: data,\n save: false,\n },\n UNIFY_TERM_SAVE => UnifyCmd::Term {\n term_num: data,\n save: true,\n },\n UNIFY_REF => UnifyCmd::Ref(data),\n UNIFY_DUMMY => {\n let sort_id = u8::try_from(data).map_err(|_| {\n VerifErr::Msg(\"Failure to shrink u32 to u8 in proof_cmd try from\".to_string())\n })?;\n UnifyCmd::Dummy { sort_id }\n }\n UNIFY_HYP => UnifyCmd::Hyp,\n _ => return Err(VerifErr::Msg(\"Unrecognized try_form in try from unifycmd\".to_string())),\n })\n }\n}\n\n/// An iterator over a unify command stream.\n#[derive(Debug, Clone, Copy)]\npub struct UnifyIter<'a> {\n /// The full source file.\n pub buf: &'a [u8],\n /// The index of the current declaration in the file.\n pub pos: usize,\n}\n\n\nimpl<'a> Iterator for UnifyIter<'a> {\n type Item = Result;\n fn next(&mut self) -> Option {\n match try_next_cmd(self.buf, self.pos) {\n // err\n Err(e) => Some(Err(e)),\n // Exhausted\n Ok(None) => None,\n // next\n Ok(Some((stmt, rest))) => {\n self.pos = rest;\n Some(Ok(stmt))\n } \n }\n }\n}\n\n"}]}},{"Replacement":{"inode":{"change":3,"pos":98764},"path":"src/mmb/unify.rs","line":34,"ins":{"up_context":[{"change":3,"pos":104395}],"down_context":[{"change":3,"pos":104426}],"flag":"BLOCK","start":16594,"end":16672,"inode":{"change":3,"pos":98764}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":104395},"to":{"change":3,"start":104395,"end":104426},"introduced_by":3}],"inode":{"change":3,"pos":98764}},"ins_contents":[{"Add":" match maybe_cmd.map_err(|e| VerifErr::Msg(format!(\"{:?}\", e)))? {"}],"del_contents":[{"Del":" match maybe_cmd? {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":98764},"path":"src/mmb/unify.rs","line":36,"ins":{"up_context":[{"change":3,"pos":104482}],"down_context":[{"change":3,"pos":104650}],"flag":"BLOCK","start":16673,"end":16828,"inode":{"change":3,"pos":98764}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":104482},"to":{"change":3,"start":104482,"end":104650},"introduced_by":3}],"inode":{"change":3,"pos":98764}},"ins_contents":[{"Add":" UnifyCmd::Term { tid, save } => self.unify_term(tid, save)?,"},{"Add":" UnifyCmd::Dummy(sort_id) => self.unify_dummy(mode, sort_id)?,"}],"del_contents":[{"Del":" UnifyCmd::Term { term_num, save } => self.unify_term(term_num, save)?,\n UnifyCmd::Dummy { sort_id } => self.unify_dummy(mode, sort_id)?,\n"}]}},{"Edit":{"inode":{"change":3,"pos":98764},"path":"src/mmb/unify.rs","line":56,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":105217},"to":{"change":3,"start":105217,"end":105395},"introduced_by":3}],"inode":{"change":3,"pos":98764}}},"contents":[{"Del":" }\n }\n\n pub fn push_ustack_rev_mmb(&mut self, items: &'b BumpVec<'b, &'b MmbItem<'b>>) {\n for elem in items.iter().rev() {\n self.ustack.push(elem)\n"}]}},{"Replacement":{"inode":{"change":3,"pos":98764},"path":"src/mmb/unify.rs","line":61,"ins":{"up_context":[{"change":3,"pos":105450}],"down_context":[{"change":3,"pos":105473}],"flag":"BLOCK","start":16829,"end":16855,"inode":{"change":3,"pos":98764}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":105450},"to":{"change":3,"start":105450,"end":105473},"introduced_by":3}],"inode":{"change":3,"pos":98764}},"ins_contents":[{"Add":" term_num: TermId,"}],"del_contents":[{"Del":" term_num: u32,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":98764},"path":"src/mmb/unify.rs","line":82,"ins":{"up_context":[{"change":3,"pos":106028}],"down_context":[{"change":3,"pos":106049}],"flag":"BLOCK","start":16856,"end":16881,"inode":{"change":3,"pos":98764}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":106028},"to":{"change":3,"start":106028,"end":106049},"introduced_by":3}],"inode":{"change":3,"pos":98764}},"ins_contents":[{"Add":" sort_id: SortId,"}],"del_contents":[{"Del":" sort_id: u8,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":98764},"path":"src/mmb/unify.rs","line":89,"ins":{"up_context":[{"change":3,"pos":106326}],"down_context":[{"change":3,"pos":106373}],"flag":"BLOCK","start":16882,"end":16940,"inode":{"change":3,"pos":98764}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":106326},"to":{"change":3,"start":106326,"end":106373},"introduced_by":3}],"inode":{"change":3,"pos":98764}},"ins_contents":[{"Add":" let bound_idx = none_err!(ty.bound_digit())?;"}],"del_contents":[{"Del":" let bound_idx = ty.bound_digit()?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":98764},"path":"src/mmb/unify.rs","line":93,"ins":{"up_context":[{"change":3,"pos":106514}],"down_context":[{"change":3,"pos":106569}],"flag":"BLOCK","start":16941,"end":17003,"inode":{"change":3,"pos":98764}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":106514},"to":{"change":3,"start":106514,"end":106569},"introduced_by":3}],"inode":{"change":3,"pos":98764}},"ins_contents":[{"Add":" make_sure!(ty.into_inner() & bound_idx == 0);"}],"del_contents":[{"Del":" make_sure!(ty.inner & bound_idx == 0);\n"}]}},{"FileMove":{"meta":{"basename":"proof.rs","metadata":0},"old":[{"basename":"proof.rs","metadata":420}],"up":[{"change":3,"pos":98752}],"down":[{"change":3,"pos":110200}],"show_perms":true}},{"Replacement":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":2,"ins":{"up_context":[{"change":3,"pos":110243}],"down_context":[{"change":3,"pos":110244}],"flag":"BLOCK","start":17024,"end":17141,"inode":{"change":3,"pos":110200}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":110243},"to":{"change":3,"start":110243,"end":110244},"introduced_by":3}],"inode":{"change":3,"pos":110200}},"ins_contents":[{"Add":"use mm0b_parser::{ ProofIter, Type, ProofCmd, TYPE_BOUND_MASK };"},{"Add":"use mm0_util::{ Modifiers, SortId, TermId, ThmId };"}],"del_contents":[{"Del":"\n"}]}},{"Edit":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":8,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":110342},"to":{"change":3,"start":110342,"end":110360},"introduced_by":3}],"inode":{"change":3,"pos":110200}}},"contents":[{"Del":" try_next_cmd,\n"}]}},{"Edit":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":9,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":110369},"to":{"change":3,"start":110369,"end":110379},"introduced_by":3}],"inode":{"change":3,"pos":110200}}},"contents":[{"Del":" Type,\n"}]}},{"Edit":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":15,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":110442},"to":{"change":3,"start":110442,"end":110567},"introduced_by":3}],"inode":{"change":3,"pos":110200}}},"contents":[{"Del":"\npub const TYPE_BOUND_MASK: u64 = 1 << 63;\n\n#[derive(Debug, Clone, Copy, PartialEq, Eq)]\npub enum Mode {\n Def,\n Thm,\n}\n"}]}},{"Edit":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":18,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":110631},"to":{"change":3,"start":110631,"end":112166},"introduced_by":3}],"inode":{"change":3,"pos":110200}}},"contents":[{"Del":"\n\n/// `PROOF_TERM = 0x10`: See [`ProofCmd`](super::ProofCmd).\npub const PROOF_TERM: u8 = 0x10;\n/// `PROOF_TERM_SAVE = 0x11`: See [`ProofCmd`](super::ProofCmd).\npub const PROOF_TERM_SAVE: u8 = 0x11;\n/// `PROOF_REF = 0x12`: See [`ProofCmd`](super::ProofCmd).\npub const PROOF_REF: u8 = 0x12;\n/// `PROOF_DUMMY = 0x13`: See [`ProofCmd`](super::ProofCmd).\npub const PROOF_DUMMY: u8 = 0x13;\n/// `PROOF_THM = 0x14`: See [`ProofCmd`](super::ProofCmd).\npub const PROOF_THM: u8 = 0x14;\n/// `PROOF_THM_SAVE = 0x15`: See [`ProofCmd`](super::ProofCmd).\npub const PROOF_THM_SAVE: u8 = 0x15;\n/// `PROOF_HYP = 0x16`: See [`ProofCmd`](super::ProofCmd).\npub const PROOF_HYP: u8 = 0x16;\n/// `PROOF_CONV = 0x17`: See [`ProofCmd`](super::ProofCmd).\npub const PROOF_CONV: u8 = 0x17;\n/// `PROOF_REFL = 0x18`: See [`ProofCmd`](super::ProofCmd).\npub const PROOF_REFL: u8 = 0x18;\n/// `PROOF_SYMM = 0x19`: See [`ProofCmd`](super::ProofCmd).\npub const PROOF_SYMM: u8 = 0x19;\n/// `PROOF_CONG = 0x1A`: See [`ProofCmd`](super::ProofCmd).\npub const PROOF_CONG: u8 = 0x1A;\n/// `PROOF_UNFOLD = 0x1B`: See [`ProofCmd`](super::ProofCmd).\npub const PROOF_UNFOLD: u8 = 0x1B;\n/// `PROOF_CONV_CUT = 0x1C`: See [`ProofCmd`](super::ProofCmd).\npub const PROOF_CONV_CUT: u8 = 0x1C;\n/// `PROOF_CONV_REF = 0x1D`: See [`ProofCmd`](super::ProofCmd).\npub const PROOF_CONV_REF: u8 = 0x1D;\n/// `PROOF_CONV_SAVE = 0x1E`: See [`ProofCmd`](super::ProofCmd).\npub const PROOF_CONV_SAVE: u8 = 0x1E;\n/// `PROOF_SAVE = 0x1F`: See [`ProofCmd`](super::ProofCmd).\npub const PROOF_SAVE: u8 = 0x1F;\n\n"}]}},{"Edit":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":19,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":112167},"to":{"change":3,"start":112167,"end":112622},"introduced_by":3}],"inode":{"change":3,"pos":110200}}},"contents":[{"Del":"\n/// A proof command, which acts on a stack machine with the following components:\n///\n/// * `H: Vec`: a \"heap\" consisting of indexable elements that can be copied\n/// onto the stack using [`Ref`](ProofCmd::Ref)\n/// * `S: Stack`: The main stack, which most operations push and pop from.\n/// * `HS: Vec`: The hypothesis list, which grows only on [`Hyp`](ProofCmd::Hyp)\n/// operations and collects the hypotheses of the theorem.\n"}]}},{"Replacement":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":20,"ins":{"up_context":[{"change":3,"pos":112667}],"down_context":[{"change":3,"pos":120011}],"flag":"BLOCK","start":17142,"end":17176,"inode":{"change":3,"pos":110200}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":112667},"to":{"change":3,"start":112667,"end":120011},"introduced_by":3}],"inode":{"change":3,"pos":110200}},"ins_contents":[{"Add":"pub enum Mode {"},{"Add":" Def,"},{"Add":" Thm,"}],"del_contents":[{"Del":"pub enum ProofCmd {\n /// ```text\n /// Term t: H; S, e1, ..., en --> H; S, (t e1 .. en)\n /// Save: H; S, e --> H, e; S, e\n /// TermSave t = Term t; Save:\n /// H; S, e1, ..., en --> H, (t e1 .. en); S, (t e1 .. en)\n /// ```\n ///\n /// Pop `n` elements from the stack and allocate a new term `t` applied to those\n /// expressions. When `save` is used, the new term is also saved to the heap\n /// (this is used if the term will ever be needed more than once).\n Term {\n /** The term to construct */\n term_num: u32,\n /** True if we should save to the heap */\n save: bool,\n },\n /// ```text\n /// Ref i: H; S --> H; S, Hi\n /// ```\n /// Get the `i`-th heap element and push it on the stack.\n Ref(u32),\n /// ```text\n /// Dummy s: H; S --> H, x; S, x alloc(x:s)\n /// ```\n /// Allocate a new variable `x` of sort `s`, and push it to the stack and the heap.\n Dummy { sort_num: u8 },\n /// ```text\n /// Thm T: H; S, e1, ..., en, e --> H; S', |- e\n /// (where Unify(T): S; e1, ... en; e --> S'; H'; .)\n /// Save: H; S, |- e --> H, |- e; S, |- e\n /// ```\n /// Pop `n` elements from the stack and put them on the unify heap, then call the\n /// unifier for `T` with `e` as the target. The unifier will pop additional\n /// proofs from the stack if the UHyp command is used, and when it is done,\n /// the conclusion is pushed as a proven statement.\n ///\n /// When Save is used, the proven statement is also saved to the heap.\n Thm {\n /** The theorem to apply */\n thm_num: u32,\n /** True if we should save to the heap */\n save: bool,\n },\n /// ```text\n /// Hyp: HS; H; S, e --> HS, e; H, |- e; S\n /// ```\n /// This command means that we are finished constructing the expression `e`\n /// which denotes a statement, and wish to assume it as a hypothesis.\n /// Push `e` to the hypothesis stack, and push `|- e` to the heap.\n Hyp,\n /// ```text\n /// Conv: S, e1, |- e2 --> S, |- e1, e1 =?= e2\n /// ```\n /// Pop `e1` and `|- e2`, and push `|- e1`, guarded by a convertibility obligation\n /// `e1 =?= e2`.\n Conv,\n /// ```text\n /// Refl: S, e =?= e --> S\n /// ```\n /// Pop a convertibility obligation where the two sides are equal.\n Refl,\n /// ```text\n /// Symm: S, e1 =?= e2 --> S, e2 =?= e1\n /// ```\n /// Swap the direction of a convertibility obligation.\n Sym,\n /// ```text\n /// Cong: S, (t e1 ... en) =?= (t e1' ... en') --> S, en =?= en', ..., e1 =?= e1'\n /// ```\n /// Pop a convertibility obligation for two term expressions, and\n /// push convertibility obligations for all the parts.\n /// The parts are pushed in reverse order so that they are dealt with\n /// in declaration order in the proof stream.\n Cong,\n /// ```text\n /// Unfold: S, (t e1 ... en) =?= e', (t e1 ... en), e --> S, e =?= e'\n /// (where Unify(t): e1, ..., en; e --> H'; .)\n /// ```\n /// Pop terms `(t e1 ... en)`, `e` from the stack and run the unifier for `t`\n /// (which should be a definition) to make sure that `(t e1 ... en)` unfolds to `e`.\n /// Then pop `(t e1 ... en) =?= e'` and push `e =?= e'`.\n Unfold,\n /// ```text\n /// ConvCut: S, e1 =?= e2 --> S, e1 = e2, e1 =?= e2\n /// ```\n /// Pop a convertibility obligation `e1 =?= e2`, and\n /// push a convertability assertion `e1 = e2` guarded by `e1 =?= e2`.\n ConvCut,\n /// ```text\n /// ConvRef i: H; S, e1 =?= e2 --> H; S (where Hi is e1 = e2)\n /// ```\n /// Pop a convertibility obligation `e1 =?= e2`, where `e1 = e2` is\n /// `i`-th on the heap.\n ConvRef(u32),\n /// ```text\n /// ConvSave: H; S, e1 = e2 --> H, e1 = e2; S\n /// ```\n /// Pop a convertibility proof `e1 = e2` and save it to the heap.\n ConvSave,\n /// ```text\n /// Save: H; S, s --> H, s; S, s\n /// ```\n /// Save the outline of the stack to the heap, without popping it.\n Save,\n}\n\nimpl std::convert::TryFrom<(u8, u32)> for ProofCmd {\n type Error = VerifErr;\n fn try_from((cmd, data): (u8, u32)) -> Result {\n Ok(match cmd {\n PROOF_TERM => ProofCmd::Term {\n term_num: data,\n save: false,\n },\n PROOF_TERM_SAVE => ProofCmd::Term {\n term_num: data,\n save: true,\n },\n PROOF_REF => ProofCmd::Ref(data),\n PROOF_DUMMY => {\n let sort_num = u8::try_from(data).map_err(|_| {\n VerifErr::Msg(\"Failure to shrink u32 to u8 in proof_cmd try from\".to_string())\n })?;\n ProofCmd::Dummy { sort_num }\n }\n PROOF_THM => ProofCmd::Thm {\n thm_num: data,\n save: false,\n },\n PROOF_THM_SAVE => ProofCmd::Thm {\n thm_num: data,\n save: true,\n },\n PROOF_HYP => ProofCmd::Hyp,\n PROOF_CONV => ProofCmd::Conv,\n PROOF_REFL => ProofCmd::Refl,\n PROOF_SYMM => ProofCmd::Sym,\n PROOF_CONG => ProofCmd::Cong,\n PROOF_UNFOLD => ProofCmd::Unfold,\n PROOF_CONV_CUT => ProofCmd::ConvCut,\n PROOF_CONV_REF => ProofCmd::ConvRef(data),\n PROOF_CONV_SAVE => ProofCmd::ConvSave,\n PROOF_SAVE => ProofCmd::Save,\n owise => {\n println!(\"Failed to convert {:?}\\n\", owise);\n return Err(VerifErr::Msg(\"try_from for ProofCmd failed match\".to_string()));\n }\n })\n }\n}\n\n/// An iterator over a proof command stream.\n#[derive(Debug, Clone, Copy)]\npub struct ProofIter<'a> {\n /// The full source file, but trimmed such that the end\n /// is the expected end of the proof stream. The final call to `next`\n /// will fail if it does not hit the expected end when the\n /// proof stream runs out.\n pub buf: &'a [u8],\n /// The index of the current proof command in the file.\n pub pos: usize,\n /// Mark `ends_at` instead of giving ProofIter a truncated slice just so\n /// the behvaior wrt `try_next_cmd` is identical.\n pub ends_at: usize,\n}\n\nimpl<'a> ProofIter<'a> {\n /// True if this iterator is \"null\", meaning that it has zero commands.\n /// This is not the same as being empty, which happens when there is one command\n /// which is the terminating `CMD_END` command.\n pub fn is_null(&self) -> bool {\n //self.buf.len() == self.pos\n self.pos == self.ends_at\n }\n}\n\nimpl<'a> Iterator for ProofIter<'a> {\n type Item = Result;\n fn next(&mut self) -> Option {\n match try_next_cmd(self.buf, self.pos) {\n // An actual error.\n Err(e) => Some(Err(e)),\n // `try_next_cmd` got `Ok(None)` by receiving a 0 command at the correct position\n Ok(None) if self.ends_at == self.pos + 1 => None,\n // `try_next_cmd` got `Ok(None)` by receiving a 0 command at the WRONG position\n Ok(None) => Some(Err(VerifErr::Msg(format!(\"Proof iter err @ {}\", self.pos)))),\n // `try_next_cmd` parsed a new command.\n Ok(Some((stmt, rest))) => {\n self.pos = rest;\n Some(Ok(stmt))\n }\n }\n }\n"}]}},{"Replacement":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":32,"ins":{"up_context":[{"change":3,"pos":120193}],"down_context":[{"change":3,"pos":120224}],"flag":"BLOCK","start":17177,"end":17255,"inode":{"change":3,"pos":110200}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":120193},"to":{"change":3,"start":120193,"end":120224},"introduced_by":3}],"inode":{"change":3,"pos":110200}},"ins_contents":[{"Add":" match maybe_cmd.map_err(|e| VerifErr::Msg(format!(\"{:?}\", e)))? {"}],"del_contents":[{"Del":" match maybe_cmd? {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":34,"ins":{"up_context":[{"change":3,"pos":120280}],"down_context":[{"change":3,"pos":120533}],"flag":"BLOCK","start":17256,"end":17488,"inode":{"change":3,"pos":110200}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":120280},"to":{"change":3,"start":120280,"end":120533},"introduced_by":3}],"inode":{"change":3,"pos":110200}},"ins_contents":[{"Add":" ProofCmd::Dummy(sort_num) => self.proof_dummy(sort_num)?,"},{"Add":" ProofCmd::Term { tid, save } => self.proof_term(mode, tid, save)?,"},{"Add":" ProofCmd::Thm { tid, save } => self.proof_thm(tid, save)?,"}],"del_contents":[{"Del":" ProofCmd::Dummy { sort_num } => self.proof_dummy(sort_num)?,\n ProofCmd::Term { term_num, save } => self.proof_term(mode, term_num, save)?,\n ProofCmd::Thm { thm_num, save } => self.proof_thm(thm_num, save)?,\n"}]}},{"Edit":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":44,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":120921},"to":{"change":3,"start":120921,"end":120986},"introduced_by":3}],"inode":{"change":3,"pos":110200}}},"contents":[{"Del":" ProofCmd::ConvRef(i) => self.proof_conv_ref(i)?,\n"}]}},{"Edit":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":46,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":121103}],"down_context":[{"change":3,"pos":121103}],"flag":"BLOCK","start":17489,"end":17545,"inode":{"change":3,"pos":110200}}},"contents":[{"Add":" ProofCmd::Sorry => self.proof_sorry()?,"}]}},{"Replacement":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":53,"ins":{"up_context":[{"change":3,"pos":121202}],"down_context":[{"change":3,"pos":121290}],"flag":"BLOCK","start":17546,"end":18064,"inode":{"change":3,"pos":110200}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":121202},"to":{"change":3,"start":121202,"end":121290},"introduced_by":3}],"inode":{"change":3,"pos":110200}},"ins_contents":[{"Add":" match none_err!(self.heap.get(i as usize).copied())? {"},{"Add":" MmbItem::Conv(c1, c2) => {"},{"Add":" let stack_coconv = none_err!(self.stack.pop())?;"},{"Add":" if let MmbItem::CoConv(cc1, cc2) = stack_coconv {"},{"Add":" make_sure!(c1 == cc1);"},{"Add":" Ok(make_sure!(c2 == cc2))"},{"Add":" } else {"},{"Add":" return Err(VerifErr::Unreachable(file!(), line!()));"},{"Add":" }"},{"Add":" }"},{"Add":" heap_elem => Ok(self.stack.push(heap_elem))"},{"Add":" }"}],"del_contents":[{"Del":" let heap_elem = *&self.heap[i as usize];\n Ok(self.stack.push(heap_elem))\n"}]}},{"Replacement":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":67,"ins":{"up_context":[{"change":3,"pos":121297}],"down_context":[{"change":3,"pos":121529}],"flag":"BLOCK","start":18065,"end":18315,"inode":{"change":3,"pos":110200}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":121297},"to":{"change":3,"start":121297,"end":121529},"introduced_by":3}],"inode":{"change":3,"pos":110200}},"ins_contents":[{"Add":" fn proof_dummy(&mut self, sort_num: SortId) -> Res<()> {"},{"Add":" make_sure!(sort_num.into_inner() < self.outline.file_view.mmb.header.num_sorts);"},{"Add":" make_sure!(!(self.outline.file_view.mmb_sort_mods(sort_num)?.contains(Modifiers::STRICT)));"}],"del_contents":[{"Del":" fn proof_dummy(&mut self, sort_num: u8) -> Res<()> {\n make_sure!(sort_num < self.outline.header.num_sorts);\n make_sure!(self.outline.get_sort_mods(sort_num as usize).unwrap().inner & crate::mmb::SORT_STRICT == 0);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":73,"ins":{"up_context":[{"change":3,"pos":121618}],"down_context":[{"change":3,"pos":121718}],"flag":"BLOCK","start":18316,"end":18425,"inode":{"change":3,"pos":110200}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":121618},"to":{"change":3,"start":121618,"end":121718},"introduced_by":3}],"inode":{"change":3,"pos":110200}},"ins_contents":[{"Add":" let ty = Type::from(TYPE_BOUND_MASK | ((sort_num.into_inner() as u64) << 56) | self.take_next_bv());"}],"del_contents":[{"Del":" let ty = Type { inner: TYPE_BOUND_MASK | ((sort_num as u64) << 56) | self.take_next_bv() };\n"}]}},{"Replacement":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":84,"ins":{"up_context":[{"change":3,"pos":121950}],"down_context":[{"change":3,"pos":121973}],"flag":"BLOCK","start":18426,"end":18452,"inode":{"change":3,"pos":110200}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":121950},"to":{"change":3,"start":121950,"end":121973},"introduced_by":3}],"inode":{"change":3,"pos":110200}},"ins_contents":[{"Add":" term_num: TermId,"}],"del_contents":[{"Del":" term_num: u32,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":87,"ins":{"up_context":[{"change":3,"pos":122011}],"down_context":[{"change":3,"pos":122136}],"flag":"BLOCK","start":18453,"end":18625,"inode":{"change":3,"pos":110200}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":122011},"to":{"change":3,"start":122011,"end":122136},"introduced_by":3}],"inode":{"change":3,"pos":110200}},"ins_contents":[{"Add":" make_sure!(term_num.into_inner() < self.outline.file_view.mmb.header.num_terms.get());"},{"Add":" let termref = none_err!(self.outline.file_view.mmb.term(term_num))?;"}],"del_contents":[{"Del":" make_sure!(term_num < self.outline.header.num_terms);\n let termref = self.outline.get_term_by_num(term_num)?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":93,"ins":{"up_context":[{"change":3,"pos":122339}],"down_context":[{"change":3,"pos":122421}],"flag":"BLOCK","start":18626,"end":18694,"inode":{"change":3,"pos":110200}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":122339},"to":{"change":3,"start":122339,"end":122421},"introduced_by":3}],"inode":{"change":3,"pos":110200}},"ins_contents":[{"Add":" let drain_from = self.stack.len() - (termref.args().len());"}],"del_contents":[{"Del":" let drain_from = self.stack.len() - (termref.num_args_no_ret() as usize);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":97,"ins":{"up_context":[{"change":3,"pos":122508}],"down_context":[{"change":3,"pos":122584}],"flag":"BLOCK","start":18695,"end":18771,"inode":{"change":3,"pos":110200}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":122508},"to":{"change":3,"start":122508,"end":122584},"introduced_by":3}],"inode":{"change":3,"pos":110200}},"ins_contents":[{"Add":" let all_args = || { termref.args().iter().zip(stack_args.iter()) };"}],"del_contents":[{"Del":" let all_args = || { termref.args_no_ret().zip(stack_args.iter()) };\n"}]}},{"Replacement":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":101,"ins":{"up_context":[{"change":3,"pos":122765}],"down_context":[{"change":3,"pos":122797}],"flag":"BLOCK","start":18772,"end":18801,"inode":{"change":3,"pos":110200}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":122765},"to":{"change":3,"start":122765,"end":122797},"introduced_by":3}],"inode":{"change":3,"pos":110200}},"ins_contents":[{"Add":" if sig.bound() {"}],"del_contents":[{"Del":" if sig.is_bound() {\n"}]}},{"Edit":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":108,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":122912},"to":{"change":3,"start":122912,"end":122913},"introduced_by":3}],"inode":{"change":3,"pos":110200}}},"contents":[{"Del":"\n"}]}},{"Replacement":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":110,"ins":{"up_context":[{"change":3,"pos":123051}],"down_context":[{"change":3,"pos":123123}],"flag":"BLOCK","start":18802,"end":18875,"inode":{"change":3,"pos":110200}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":123051},"to":{"change":3,"start":123051,"end":123123},"introduced_by":3}],"inode":{"change":3,"pos":110200}},"ins_contents":[{"Add":" make_sure!(sorts_compatible(stack_arg.get_ty()?, *sig_arg)) "}],"del_contents":[{"Del":" make_sure!(sorts_compatible(stack_arg.get_ty()?, sig_arg)) \n"}]}},{"Replacement":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":114,"ins":{"up_context":[{"change":3,"pos":123221}],"down_context":[{"change":3,"pos":123291}],"flag":"BLOCK","start":18876,"end":18957,"inode":{"change":3,"pos":110200}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":123221},"to":{"change":3,"start":123221,"end":123291},"introduced_by":3}],"inode":{"change":3,"pos":110200}},"ins_contents":[{"Add":" let mut new_type_accum = Type::new_of_sort(termref.sort().into_inner());"}],"del_contents":[{"Del":" let mut new_type_accum = Type::new_with_sort(termref.sort());\n"}]}},{"Replacement":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":117,"ins":{"up_context":[{"change":3,"pos":123346}],"down_context":[{"change":3,"pos":123434}],"flag":"BLOCK","start":18958,"end":19043,"inode":{"change":3,"pos":110200}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":123346},"to":{"change":3,"start":123346,"end":123434},"introduced_by":3}],"inode":{"change":3,"pos":110200}},"ins_contents":[{"Add":" for (sig_unbound, stack_arg) in all_args().filter(|(sig, _)| !sig.bound()) {"}],"del_contents":[{"Del":" for (sig_unbound, stack_arg) in all_args().filter(|(sig, _)| !sig.is_bound()) {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":121,"ins":{"up_context":[{"change":3,"pos":123635}],"down_context":[{"change":3,"pos":123702}],"flag":"BLOCK","start":19044,"end":19106,"inode":{"change":3,"pos":110200}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":123635},"to":{"change":3,"start":123635,"end":123702},"introduced_by":3}],"inode":{"change":3,"pos":110200}},"ins_contents":[{"Add":" if sig_unbound.depends_on((idx) as u64) {"}],"del_contents":[{"Del":" if sig_unbound.depends_on_((idx + 1) as u64) {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":133,"ins":{"up_context":[{"change":3,"pos":124109}],"down_context":[{"change":3,"pos":124174}],"flag":"BLOCK","start":19107,"end":19167,"inode":{"change":3,"pos":110200}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":124109},"to":{"change":3,"start":124109,"end":124174},"introduced_by":3}],"inode":{"change":3,"pos":110200}},"ins_contents":[{"Add":" if termref.ret().depends_on((idx) as u64) {"}],"del_contents":[{"Del":" if termref.ret().depends_on_((idx + 1) as u64) {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":140,"ins":{"up_context":[{"change":3,"pos":124314}],"down_context":[{"change":3,"pos":124413}],"flag":"BLOCK","start":19168,"end":19253,"inode":{"change":3,"pos":110200}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":124314},"to":{"change":3,"start":124314,"end":124413},"introduced_by":3}],"inode":{"change":3,"pos":110200}},"ins_contents":[{"Add":" let drain = self.stack.drain((self.stack.len() - (termref.args().len()))..);"}],"del_contents":[{"Del":" let drain = self.stack.drain((self.stack.len() - (termref.num_args_no_ret() as usize))..);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":160,"ins":{"up_context":[{"change":3,"pos":124884}],"down_context":[{"change":3,"pos":124906}],"flag":"BLOCK","start":19254,"end":19278,"inode":{"change":3,"pos":110200}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":124884},"to":{"change":3,"start":124884,"end":124906},"introduced_by":3}],"inode":{"change":3,"pos":110200}},"ins_contents":[{"Add":" thm_num: ThmId,"}],"del_contents":[{"Del":" thm_num: u32,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":163,"ins":{"up_context":[{"change":3,"pos":124944}],"down_context":[{"change":3,"pos":125067}],"flag":"BLOCK","start":19279,"end":19446,"inode":{"change":3,"pos":110200}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":124944},"to":{"change":3,"start":124944,"end":125067},"introduced_by":3}],"inode":{"change":3,"pos":110200}},"ins_contents":[{"Add":" make_sure!(thm_num.into_inner() < self.outline.file_view.mmb.header.num_thms.get());"},{"Add":" let thmref = none_err!(self.outline.file_view.mmb.thm(thm_num))?;"}],"del_contents":[{"Del":" make_sure!(thm_num < self.outline.header.num_thms);\n let thmref = self.outline.get_assert_by_num(thm_num)?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":173,"ins":{"up_context":[{"change":3,"pos":125330}],"down_context":[{"change":3,"pos":125434}],"flag":"BLOCK","start":19447,"end":19555,"inode":{"change":3,"pos":110200}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":125330},"to":{"change":3,"start":125330,"end":125434},"introduced_by":3}],"inode":{"change":3,"pos":110200}},"ins_contents":[{"Add":" let bound_by_sig = sig_args.iter().zip(stack_args).enumerate().filter(|(_, (sig, _))| sig.bound());"}],"del_contents":[{"Del":" let bound_by_sig = sig_args.zip(stack_args).enumerate().filter(|(_, (sig, _))| sig.is_bound());\n"}]}},{"Replacement":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":187,"ins":{"up_context":[{"change":3,"pos":125861}],"down_context":[{"change":3,"pos":125956}],"flag":"BLOCK","start":19556,"end":19655,"inode":{"change":3,"pos":110200}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":125861},"to":{"change":3,"start":125861,"end":125956},"introduced_by":3}],"inode":{"change":3,"pos":110200}},"ins_contents":[{"Add":" for (sig_a, stack_a) in sig_args.iter().zip(stack_args).filter(|(sig, _)| !sig.bound()) {"}],"del_contents":[{"Del":" for (sig_a, stack_a) in sig_args.zip(stack_args).filter(|(sig, _)| !sig.is_bound()) {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":190,"ins":{"up_context":[{"change":3,"pos":126020}],"down_context":[{"change":3,"pos":126082}],"flag":"BLOCK","start":19656,"end":19714,"inode":{"change":3,"pos":110200}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":126020},"to":{"change":3,"start":126020,"end":126082},"introduced_by":3}],"inode":{"change":3,"pos":110200}},"ins_contents":[{"Add":" !(sig_a.disjoint(Type::from(1 << j)))"}],"del_contents":[{"Del":" !(sig_a.disjoint(Type { inner: 1 << j }))\n"}]}},{"Replacement":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":215,"ins":{"up_context":[{"change":3,"pos":126796}],"down_context":[{"change":3,"pos":126999}],"flag":"BLOCK","start":19715,"end":19824,"inode":{"change":3,"pos":110200}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":126796},"to":{"change":3,"start":126796,"end":126999},"introduced_by":3}],"inode":{"change":3,"pos":110200}},"ins_contents":[{"Add":" make_sure!(self.outline.file_view.mmb_sort_mods(e.get_ty()?.sort())?.contains(Modifiers::PROVABLE));"}],"del_contents":[{"Del":" let e_sort_numx = e.get_ty()?.sort();\n let e_sort_mods = self.outline.get_sort_mods(e_sort_numx as usize).unwrap().inner;\n make_sure!(e_sort_mods & crate::mmb::SORT_PROVABLE != 0);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":256,"ins":{"up_context":[{"change":3,"pos":128369}],"down_context":[{"change":3,"pos":128463}],"flag":"BLOCK","start":19825,"end":19894,"inode":{"change":3,"pos":110200}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":128369},"to":{"change":3,"start":128369,"end":128463},"introduced_by":3}],"inode":{"change":3,"pos":110200}},"ins_contents":[{"Add":" if let Some(MmbItem::CoConv(cc1, cc2)) = self.stack.pop() {"}],"del_contents":[{"Del":" let e = none_err!(self.stack.pop())?;\n if let MmbItem::CoConv(cc1, cc2) = e {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":276,"ins":{"up_context":[{"change":3,"pos":129282}],"down_context":[{"change":3,"pos":129470}],"flag":"BLOCK","start":19895,"end":20169,"inode":{"change":3,"pos":110200}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":129282},"to":{"change":3,"start":129282,"end":129470},"introduced_by":3}],"inode":{"change":3,"pos":110200}},"ins_contents":[{"Add":" let cc = none_err!(self.stack.pop())?;"},{"Add":""},{"Add":" let (term_num, ebar, e_doubleprime) = match cc {"},{"Add":" MmbItem::CoConv(MmbItem::Expr(MmbExpr::App{ term_num, args, .. }), e_doubleprime) => {"},{"Add":" (term_num, args.clone(), e_doubleprime)"},{"Add":" }"}],"del_contents":[{"Del":" let f_ebar = none_err!(self.stack.pop())?;\n let (term_num, ebar) = match f_ebar {\n MmbItem::Expr(MmbExpr::App{ term_num, args, .. }) => (term_num, args.clone()),\n"}]}},{"Replacement":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":290,"ins":{"up_context":[{"change":3,"pos":129696}],"down_context":[{"change":3,"pos":129758}],"flag":"BLOCK","start":20170,"end":20246,"inode":{"change":3,"pos":110200}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":129696},"to":{"change":3,"start":129696,"end":129758},"introduced_by":3}],"inode":{"change":3,"pos":110200}},"ins_contents":[{"Add":" none_err!(self.outline.file_view.mmb.term(*term_num))?.unify(),"}],"del_contents":[{"Del":" self.outline.get_term_by_num(*term_num)?.unify(),\n"}]}},{"Replacement":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":294,"ins":{"up_context":[{"change":3,"pos":129792}],"down_context":[{"change":3,"pos":130167}],"flag":"BLOCK","start":20247,"end":20357,"inode":{"change":3,"pos":110200}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":129792},"to":{"change":3,"start":129792,"end":130167},"introduced_by":3}],"inode":{"change":3,"pos":110200}},"ins_contents":[{"Add":" let coconv = self.alloc(MmbItem::CoConv(e_prime, e_doubleprime));"},{"Add":" Ok(self.stack.push(coconv))"}],"del_contents":[{"Del":" let cc = none_err!(self.stack.pop())?;\n if let MmbItem::CoConv(f_ebar2, e_doubleprime) = cc {\n make_sure!(f_ebar == *f_ebar2);\n let coconv = self.alloc(MmbItem::CoConv(e_prime, e_doubleprime));\n Ok(self.stack.push(coconv))\n } else {\n return Err(VerifErr::Unreachable(file!(), line!()));\n }\n"}]}},{"Edit":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":308,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":130549},"to":{"change":3,"start":130549,"end":131004},"introduced_by":3}],"inode":{"change":3,"pos":110200}}},"contents":[{"Del":"\n fn proof_conv_ref(&mut self, i: u32) -> Res<()> {\n let heap_conv = none_err!(self.heap.get(i as usize).copied())?;\n let stack_coconv = none_err!(self.stack.pop())?;\n if let (MmbItem::Conv(c1, c2), MmbItem::CoConv(cc1, cc2)) = (heap_conv, stack_coconv) {\n make_sure!(c1 == cc1);\n Ok(make_sure!(c2 == cc2))\n } else {\n return Err(VerifErr::Unreachable(file!(), line!()));\n }\n } \n"}]}},{"Edit":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":322,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":131482}],"down_context":[{"change":3,"pos":131482}],"flag":"BLOCK","start":20358,"end":20818,"inode":{"change":3,"pos":110200}}},"contents":[{"Add":" "},{"Add":" fn proof_sorry(&mut self) -> Res<()> {"},{"Add":" match none_err!(self.stack.pop())? {"},{"Add":" e @ MmbItem::Expr(_) => {"},{"Add":" let proof = self.alloc(MmbItem::Proof(e));"},{"Add":" Ok(self.stack.push(proof))"},{"Add":" },"},{"Add":" MmbItem::Conv(..) => Ok(()),"},{"Add":" owise => Err(VerifErr::Msg(format!(\"ProofCmd::Sorry is only valid when the stack has an Expr or Conv on top. Top element was {:?}\", owise)))"},{"Add":" }"},{"Add":" } "}]}},{"Edit":{"inode":{"change":3,"pos":110200},"path":"src/mmb/proof.rs","line":334,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":131484},"to":{"change":3,"start":131484,"end":131486},"introduced_by":3}],"inode":{"change":3,"pos":110200}}},"contents":[{"Del":"\n\n"}]}},{"FileMove":{"meta":{"basename":"mod.rs","metadata":0},"old":[{"basename":"mod.rs","metadata":420}],"up":[{"change":3,"pos":98752}],"down":[{"change":3,"pos":131496}],"show_perms":true}},{"Edit":{"inode":{"change":3,"pos":131496},"path":"src/mmb/mod.rs","line":1,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":131496},"to":{"change":3,"start":131497,"end":131524},"introduced_by":3}],"inode":{"change":3,"pos":131496}}},"contents":[{"Del":"use std::convert::TryFrom;\n"}]}},{"Edit":{"inode":{"change":3,"pos":131496},"path":"src/mmb/mod.rs","line":3,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":131585},"to":{"change":3,"start":131585,"end":131607},"introduced_by":3}],"inode":{"change":3,"pos":131496}}},"contents":[{"Del":"use crate::make_sure;\n"}]}},{"Edit":{"inode":{"change":3,"pos":131496},"path":"src/mmb/mod.rs","line":5,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":131663},"to":{"change":3,"start":131663,"end":131877},"introduced_by":3}],"inode":{"change":3,"pos":131496}}},"contents":[{"Del":"use crate::mmb::proof::{ ProofIter };\nuse crate::util::{ \n Type,\n Term,\n Assert,\n Args,\n parse_u8,\n parse_u16,\n parse_u32,\n parse_u64,\n};\nuse crate::mmb::stmt::StmtCmd;\nuse crate::conv_err;\n"}]}},{"Edit":{"inode":{"change":3,"pos":131496},"path":"src/mmb/mod.rs","line":6,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":131898}],"down_context":[{"change":3,"pos":131898}],"flag":"BLOCK","start":20837,"end":21002,"inode":{"change":3,"pos":131496}}},"contents":[{"Add":"use crate::make_sure;"},{"Add":"use mm0_util::{ Modifiers, TermId };"},{"Add":"use mm0b_parser::{ TYPE_BOUND_MASK, TYPE_DEPS_MASK, NumdStmtCmd, Type, Arg, ProofIter, TermRef, ThmRef };"}]}},{"Edit":{"inode":{"change":3,"pos":131496},"path":"src/mmb/mod.rs","line":12,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":131929},"to":{"change":3,"start":131929,"end":131958},"introduced_by":3}],"inode":{"change":3,"pos":131496}}},"contents":[{"Del":"pub mod index;\npub mod stmt;\n"}]}},{"Edit":{"inode":{"change":3,"pos":131496},"path":"src/mmb/mod.rs","line":13,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":131959},"to":{"change":3,"start":131959,"end":132527},"introduced_by":3}],"inode":{"change":3,"pos":131496}}},"contents":[{"Del":"const MM0B_MAGIC: u32 = 0x42304D4D;\n\n// Each sort has one byte associated to it, which\n// contains flags for the sort modifiers.\n// The high four bits are unused.\npub const SORT_PURE : u8 = 1;\npub const SORT_STRICT : u8 = 2;\npub const SORT_PROVABLE : u8 = 4;\npub const SORT_FREE : u8 = 8;\n\n/// bound mask: 10000000_00000000_00000000_00000000_00000000_00000000_00000000_00000000\npub const TYPE_BOUND_MASK: u64 = 1 << 63;\n\n\n/// deps mask: 00000000_11111111_11111111_11111111_11111111_11111111_11111111_11111111\npub const TYPE_DEPS_MASK: u64 = (1 << 56) - 1;\n\n\n"}]}},{"Replacement":{"inode":{"change":3,"pos":131496},"path":"src/mmb/mod.rs","line":17,"ins":{"up_context":[{"change":3,"pos":132766}],"down_context":[{"change":3,"pos":132809}],"flag":"BLOCK","start":21003,"end":21060,"inode":{"change":3,"pos":131496}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":132766},"to":{"change":3,"start":132766,"end":132809},"introduced_by":3}],"inode":{"change":3,"pos":131496}},"ins_contents":[{"Add":" let (from, to) = (from.into_inner(), to.into_inner());"}],"del_contents":[{"Del":" let (from, to) = (from.inner, to.inner);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":131496},"path":"src/mmb/mod.rs","line":32,"ins":{"up_context":[{"change":3,"pos":133155}],"down_context":[{"change":3,"pos":133178}],"flag":"BLOCK","start":21061,"end":21087,"inode":{"change":3,"pos":131496}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":133155},"to":{"change":3,"start":133155,"end":133178},"introduced_by":3}],"inode":{"change":3,"pos":131496}},"ins_contents":[{"Add":" term_num: TermId,"}],"del_contents":[{"Del":" term_num: u32,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":131496},"path":"src/mmb/mod.rs","line":58,"ins":{"up_context":[{"change":3,"pos":133847}],"down_context":[{"change":3,"pos":133923}],"flag":"BLOCK","start":21088,"end":21171,"inode":{"change":3,"pos":131496}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":133847},"to":{"change":3,"start":133847,"end":133923},"introduced_by":3}],"inode":{"change":3,"pos":131496}},"ins_contents":[{"Add":" .and_then(|ty| none_err!(ty.deps()))"},{"Add":" .map(|deps| Type::from(deps))"}],"del_contents":[{"Del":" .and_then(|ty| ty.deps())\n .map(|deps| Type { inner: deps })\n"}]}},{"Replacement":{"inode":{"change":3,"pos":131496},"path":"src/mmb/mod.rs","line":64,"ins":{"up_context":[{"change":3,"pos":134001}],"down_context":[{"change":3,"pos":134094}],"flag":"BLOCK","start":21172,"end":21272,"inode":{"change":3,"pos":131496}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":134001},"to":{"change":3,"start":134001,"end":134094},"introduced_by":3}],"inode":{"change":3,"pos":131496}},"ins_contents":[{"Add":" .and_then(|ty| none_err!(ty.bound_digit()))"},{"Add":" .map(|bound_idx| Type::from(bound_idx))"}],"del_contents":[{"Del":" .and_then(|ty| ty.bound_digit())\n .map(|bound_idx| Type { inner: bound_idx })\n"}]}},{"Edit":{"inode":{"change":3,"pos":131496},"path":"src/mmb/mod.rs","line":73,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":134211},"to":{"change":3,"start":134211,"end":136423},"introduced_by":3}],"inode":{"change":3,"pos":131496}}},"contents":[{"Del":"#[derive(Debug, Clone, Copy)]\npub struct Header {\n /// \"= MM0B_VERSION\"\n pub magic: u32,\n pub version: u8,\n /// Number of declared sorts\n pub num_sorts: u8,\n pub reserved: u16,\n /// Number of terms and defs\n pub num_terms: u32,\n /// Number of axioms and theorems\n pub num_thms: u32,\n\n /// Pointer to start of term table\n pub terms_start: u32,\n /// Pointer to start of theorem table\n pub thms_start: u32,\n /// Pointer to start of proof section\n pub proof_stream_start: u32,\n pub reserved2: u32,\n /// Pointer to start of index, or 0\n pub index_start: u64,\n // The list of all sorts. The number of sorts is\n // limited to 128 because of the data layout.\n // So don't monomorphize too much.\n pub sort_data_start: u32,\n}\n\nimpl std::default::Default for Header {\n fn default() -> Header {\n Header {\n magic: 0,\n version: 0,\n num_sorts: 0,\n reserved: 0,\n num_terms: 0,\n num_thms: 0,\n terms_start: 0,\n thms_start: 0,\n proof_stream_start: 0,\n reserved2: 0,\n index_start: 0,\n sort_data_start: 0\n }\n }\n}\n\npub fn parse_header(mmb: &[u8]) -> Res
{\n let (magic, source) = parse_u32(mmb)?;\n assert_eq!(magic, MM0B_MAGIC);\n let (version, source) = parse_u8(source)?;\n let (num_sorts, source) = parse_u8(source)?;\n let (reserved, source) = parse_u16(source)?;\n let (num_terms, source) = parse_u32(source)?;\n let (num_thms, source) = parse_u32(source)?;\n let (terms_start, source) = parse_u32(source)?;\n let (thms_start, source) = parse_u32(source)?;\n let (proof_stream_start, source) = parse_u32(source)?;\n let (reserved2, source) = parse_u32(source)?;\n let (index_start, source) = parse_u64(source)?;\n let sort_data_start = conv_err!(u32::try_from(mmb.len() - source.len()))?;\n Ok(Header {\n magic,\n version,\n num_sorts,\n reserved,\n num_terms,\n num_thms,\n terms_start,\n thms_start,\n proof_stream_start,\n reserved2,\n index_start,\n sort_data_start\n })\n}\n\n//#[derive(Debug)]\n"}]}},{"Edit":{"inode":{"change":3,"pos":131496},"path":"src/mmb/mod.rs","line":81,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":136746},"to":{"change":3,"start":136746,"end":136747},"introduced_by":3}],"inode":{"change":3,"pos":131496}}},"contents":[{"Del":"\n"}]}},{"Replacement":{"inode":{"change":3,"pos":131496},"path":"src/mmb/mod.rs","line":99,"ins":{"up_context":[{"change":3,"pos":137263}],"down_context":[{"change":3,"pos":137375}],"flag":"BLOCK","start":21273,"end":21389,"inode":{"change":3,"pos":131496}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":137263},"to":{"change":3,"start":137263,"end":137375},"introduced_by":3}],"inode":{"change":3,"pos":131496}},"ins_contents":[{"Add":" pub fn verify1(outline: &'a Outline<'a>, bump: &mut Bump, stmt: NumdStmtCmd, proof: ProofIter<'a>) -> Res<()> {"}],"del_contents":[{"Del":" pub fn verify1(outline: &'a Outline<'a>, bump: &mut Bump, stmt: StmtCmd, proof: ProofIter<'a>) -> Res<()> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":131496},"path":"src/mmb/mod.rs","line":101,"ins":{"up_context":[{"change":3,"pos":137396}],"down_context":[{"change":3,"pos":137433}],"flag":"BLOCK","start":21390,"end":21431,"inode":{"change":3,"pos":131496}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":137396},"to":{"change":3,"start":137396,"end":137433},"introduced_by":3}],"inode":{"change":3,"pos":131496}},"ins_contents":[{"Add":" NumdStmtCmd::Sort {..} => { "}],"del_contents":[{"Del":" StmtCmd::Sort {..} => { \n"}]}},{"Replacement":{"inode":{"change":3,"pos":131496},"path":"src/mmb/mod.rs","line":106,"ins":{"up_context":[{"change":3,"pos":137604}],"down_context":[{"change":3,"pos":137773}],"flag":"BLOCK","start":21432,"end":21615,"inode":{"change":3,"pos":131496}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":137604},"to":{"change":3,"start":137604,"end":137773},"introduced_by":3}],"inode":{"change":3,"pos":131496}},"ins_contents":[{"Add":" NumdStmtCmd::TermDef { term_id, .. } => {"},{"Add":" let term = none_err!(outline.file_view.mmb.term(term_id))?;"},{"Add":" if !term.def() && !proof.is_null() {"}],"del_contents":[{"Del":" StmtCmd::TermDef { num, .. } => {\n let term = outline.get_term_by_num(num.unwrap())?;\n if !term.is_def() && !proof.is_null() {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":131496},"path":"src/mmb/mod.rs","line":113,"ins":{"up_context":[{"change":3,"pos":137991}],"down_context":[{"change":3,"pos":138129}],"flag":"BLOCK","start":21616,"end":21777,"inode":{"change":3,"pos":131496}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":137991},"to":{"change":3,"start":137991,"end":138129},"introduced_by":3}],"inode":{"change":3,"pos":131496}},"ins_contents":[{"Add":" NumdStmtCmd::Axiom { thm_id, .. } | NumdStmtCmd::Thm { thm_id, .. } => {"},{"Add":" let assert = none_err!(outline.file_view.mmb.thm(thm_id))?;"}],"del_contents":[{"Del":" StmtCmd::Axiom { num } | StmtCmd::Thm { num, .. } => {\n let assert = outline.get_assert_by_num(num.unwrap())?;\n"}]}},{"Edit":{"inode":{"change":3,"pos":131496},"path":"src/mmb/mod.rs","line":121,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":138300},"to":{"change":3,"start":138300,"end":138302},"introduced_by":3}],"inode":{"change":3,"pos":131496}}},"contents":[{"Del":" \n"}]}},{"Replacement":{"inode":{"change":3,"pos":131496},"path":"src/mmb/mod.rs","line":130,"ins":{"up_context":[{"change":3,"pos":138570}],"down_context":[{"change":3,"pos":138608}],"flag":"BLOCK","start":21778,"end":21816,"inode":{"change":3,"pos":131496}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":138570},"to":{"change":3,"start":138570,"end":138608},"introduced_by":3}],"inode":{"change":3,"pos":131496}},"ins_contents":[{"Add":" assert!(outgoing >> 55 == 0);"}],"del_contents":[{"Del":" assert!(outgoing >> 56 == 0);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":131496},"path":"src/mmb/mod.rs","line":135,"ins":{"up_context":[{"change":3,"pos":138663}],"down_context":[{"change":3,"pos":138735}],"flag":"BLOCK","start":21817,"end":21891,"inode":{"change":3,"pos":131496}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":138663},"to":{"change":3,"start":138663,"end":138735},"introduced_by":3}],"inode":{"change":3,"pos":131496}},"ins_contents":[{"Add":" fn load_args(&mut self, args: &[Arg], stmt: NumdStmtCmd) -> Res<()> {"}],"del_contents":[{"Del":" fn load_args(&mut self, args: Args<'a>, stmt: StmtCmd) -> Res<()> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":131496},"path":"src/mmb/mod.rs","line":139,"ins":{"up_context":[{"change":3,"pos":138817}],"down_context":[{"change":3,"pos":138894}],"flag":"BLOCK","start":21892,"end":21973,"inode":{"change":3,"pos":131496}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":138817},"to":{"change":3,"start":138817,"end":138894},"introduced_by":3}],"inode":{"change":3,"pos":131496}},"ins_contents":[{"Add":" for (idx, arg) in args.iter().enumerate() {"},{"Add":" if arg.bound() {"}],"del_contents":[{"Del":" for (idx, arg) in args.enumerate() {\n if arg.is_bound() {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":131496},"path":"src/mmb/mod.rs","line":142,"ins":{"up_context":[{"change":3,"pos":138974}],"down_context":[{"change":3,"pos":139085}],"flag":"BLOCK","start":21974,"end":22085,"inode":{"change":3,"pos":131496}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":138974},"to":{"change":3,"start":138974,"end":139085},"introduced_by":3}],"inode":{"change":3,"pos":131496}},"ins_contents":[{"Add":" make_sure!(!(self.outline.file_view.mmb_sort_mods(arg.sort())?.contains(Modifiers::STRICT)));"},{"Add":""}],"del_contents":[{"Del":" make_sure!(self.outline.get_sort_mods(arg.sort() as usize).unwrap().inner & SORT_STRICT == 0);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":131496},"path":"src/mmb/mod.rs","line":147,"ins":{"up_context":[{"change":3,"pos":139283}],"down_context":[{"change":3,"pos":139342}],"flag":"BLOCK","start":22086,"end":22156,"inode":{"change":3,"pos":131496}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":139283},"to":{"change":3,"start":139283,"end":139342},"introduced_by":3}],"inode":{"change":3,"pos":131496}},"ins_contents":[{"Add":" make_sure!(none_err!(arg.bound_digit())? == this_bv);"}],"del_contents":[{"Del":" make_sure!(arg.bound_digit()? == this_bv);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":131496},"path":"src/mmb/mod.rs","line":154,"ins":{"up_context":[{"change":3,"pos":139621}],"down_context":[{"change":3,"pos":139719}],"flag":"BLOCK","start":22157,"end":22256,"inode":{"change":3,"pos":131496}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":139621},"to":{"change":3,"start":139621,"end":139719},"introduced_by":3}],"inode":{"change":3,"pos":131496}},"ins_contents":[{"Add":" self.heap.push(self.alloc(MmbItem::Expr(self.alloc(MmbExpr::Var { idx, ty: *arg }))));"}],"del_contents":[{"Del":" self.heap.push(self.alloc(MmbItem::Expr(self.alloc(MmbExpr::Var { idx, ty: arg }))));\n"}]}},{"Replacement":{"inode":{"change":3,"pos":131496},"path":"src/mmb/mod.rs","line":157,"ins":{"up_context":[{"change":3,"pos":139809}],"down_context":[{"change":3,"pos":139855}],"flag":"BLOCK","start":22257,"end":22307,"inode":{"change":3,"pos":131496}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":139809},"to":{"change":3,"start":139809,"end":139855},"introduced_by":3}],"inode":{"change":3,"pos":131496}},"ins_contents":[{"Add":" if let NumdStmtCmd::TermDef {..} = stmt {"}],"del_contents":[{"Del":" if let StmtCmd::TermDef {..} = stmt {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":131496},"path":"src/mmb/mod.rs","line":165,"ins":{"up_context":[{"change":3,"pos":139970}],"down_context":[{"change":3,"pos":140017}],"flag":"BLOCK","start":22308,"end":22362,"inode":{"change":3,"pos":131496}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":139970},"to":{"change":3,"start":139970,"end":140017},"introduced_by":3}],"inode":{"change":3,"pos":131496}},"ins_contents":[{"Add":" stmt: NumdStmtCmd,"},{"Add":" term: TermRef<'a>,"}],"del_contents":[{"Del":" stmt: StmtCmd,\n term: Term<'a>,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":131496},"path":"src/mmb/mod.rs","line":169,"ins":{"up_context":[{"change":3,"pos":140062}],"down_context":[{"change":3,"pos":140133}],"flag":"BLOCK","start":22363,"end":22439,"inode":{"change":3,"pos":131496}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":140062},"to":{"change":3,"start":140062,"end":140133},"introduced_by":3}],"inode":{"change":3,"pos":131496}},"ins_contents":[{"Add":" self.load_args(term.args_and_ret(), stmt)?;"},{"Add":" if term.def() {"}],"del_contents":[{"Del":" self.load_args(term.args(), stmt)?;\n if term.is_def() {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":131496},"path":"src/mmb/mod.rs","line":177,"ins":{"up_context":[{"change":3,"pos":140451}],"down_context":[{"change":3,"pos":140531}],"flag":"BLOCK","start":22440,"end":22506,"inode":{"change":3,"pos":131496}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":140451},"to":{"change":3,"start":140451,"end":140531},"introduced_by":3}],"inode":{"change":3,"pos":131496}},"ins_contents":[{"Add":" for arg in self.heap.iter().take(term.args().len()) {"}],"del_contents":[{"Del":" for arg in self.heap.iter().take(term.num_args_no_ret() as usize) {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":131496},"path":"src/mmb/mod.rs","line":188,"ins":{"up_context":[{"change":3,"pos":140749}],"down_context":[{"change":3,"pos":140800}],"flag":"BLOCK","start":22507,"end":22562,"inode":{"change":3,"pos":131496}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":140749},"to":{"change":3,"start":140749,"end":140800},"introduced_by":3}],"inode":{"change":3,"pos":131496}},"ins_contents":[{"Add":" stmt: NumdStmtCmd,"},{"Add":" assert: ThmRef<'a>,"}],"del_contents":[{"Del":" stmt: StmtCmd,\n assert: Assert<'a>,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":131496},"path":"src/mmb/mod.rs","line":196,"ins":{"up_context":[{"change":3,"pos":141015}],"down_context":[{"change":3,"pos":141155}],"flag":"BLOCK","start":22563,"end":22711,"inode":{"change":3,"pos":131496}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":141015},"to":{"change":3,"start":141015,"end":141155},"introduced_by":3}],"inode":{"change":3,"pos":131496}},"ins_contents":[{"Add":" MmbItem::Proof(p) if matches!(stmt, NumdStmtCmd::Thm {..}) => p,"},{"Add":" owise if matches!(stmt, NumdStmtCmd::Axiom {..}) => owise,"}],"del_contents":[{"Del":" MmbItem::Proof(p) if matches!(stmt, StmtCmd::Thm {..}) => p,\n owise if matches!(stmt, StmtCmd::Axiom {..}) => owise,\n"}]}},{"FileMove":{"meta":{"basename":"main.rs","metadata":0},"old":[{"basename":"main.rs","metadata":420}],"up":[{"change":3,"pos":24}],"down":[{"change":3,"pos":145843}],"show_perms":true}},{"Edit":{"inode":{"change":3,"pos":145843},"path":"src/main.rs","line":7,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":146008},"to":{"change":3,"start":146008,"end":146009},"introduced_by":3}],"inode":{"change":3,"pos":145843}}},"contents":[{"Del":"\n"}]}},{"Edit":{"inode":{"change":3,"pos":145843},"path":"src/main.rs","line":8,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":146034},"to":{"change":3,"start":146034,"end":146069},"introduced_by":3}],"inode":{"change":3,"pos":145843}}},"contents":[{"Del":"// Temporary.\n#![allow(dead_code)]\n"}]}},{"Replacement":{"inode":{"change":3,"pos":145843},"path":"src/main.rs","line":20,"ins":{"up_context":[{"change":3,"pos":146286}],"down_context":[{"change":3,"pos":146364}],"flag":"BLOCK","start":22731,"end":22808,"inode":{"change":3,"pos":145843}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":146286},"to":{"change":3,"start":146286,"end":146364},"introduced_by":3}],"inode":{"change":3,"pos":145843}},"ins_contents":[{"Add":"use crate::fs::{ RawFileData };"},{"Add":"use crate::util::{ Res, Outline, VerifErr };"}],"del_contents":[{"Del":"use crate::util::VerifErr;\nuse crate::fs::FileData;\nuse crate::util::Outline;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":145843},"path":"src/main.rs","line":26,"ins":{"up_context":[{"change":3,"pos":146459}],"down_context":[{"change":3,"pos":146483}],"flag":"BLOCK","start":22809,"end":22833,"inode":{"change":3,"pos":145843}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":146459},"to":{"change":3,"start":146459,"end":146483},"introduced_by":3}],"inode":{"change":3,"pos":145843}},"ins_contents":[{"Add":" .version(\"0.2\")"}],"del_contents":[{"Del":" .version(\"0.1\")\n"}]}},{"Edit":{"inode":{"change":3,"pos":145843},"path":"src/main.rs","line":64,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":147644}],"down_context":[{"change":3,"pos":147644}],"flag":"BLOCK","start":22834,"end":23254,"inode":{"change":3,"pos":145843}}},"contents":[{"Add":" let raw_file = match RawFileData::new_from(mmb_path, mmz_path) {"},{"Add":" Ok(data) => data,"},{"Add":" Err(e) => {"},{"Add":" eprintln!(\"Failed to obtain file data: {:?}\\n\", e);"},{"Add":" panic!()"},{"Add":" }"},{"Add":" };"},{"Add":" let file_view = match raw_file.view() {"},{"Add":" Ok(v) => v,"},{"Add":" Err(e) => {"},{"Add":" eprintln!(\"mm0-rs mm0b_parser failed to parse mmb file: {:?}\\n\", e);"},{"Add":" panic!()"},{"Add":" }"},{"Add":" };"}]}},{"Replacement":{"inode":{"change":3,"pos":145843},"path":"src/main.rs","line":79,"ins":{"up_context":[{"change":3,"pos":147645}],"down_context":[{"change":3,"pos":147772}],"flag":"BLOCK","start":23255,"end":23466,"inode":{"change":3,"pos":145843}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":147645},"to":{"change":3,"start":147645,"end":147772},"introduced_by":3}],"inode":{"change":3,"pos":145843}},"ins_contents":[{"Add":" let outline = match Outline::new_from(&file_view) {"},{"Add":" Ok(ol) => ol,"},{"Add":" Err(e) => {"},{"Add":" eprintln!(\"failed to create verification outline: {:?}\\n\", e);"},{"Add":" panic!()"},{"Add":" }"},{"Add":" };"}],"del_contents":[{"Del":" let file_data = FileData::new_from(mmb_path, mmz_path).unwrap();\n let outline = Outline::new_from(&file_data).unwrap();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":145843},"path":"src/main.rs","line":88,"ins":{"up_context":[{"change":3,"pos":147853}],"down_context":[{"change":3,"pos":147890}],"flag":"BLOCK","start":23467,"end":23512,"inode":{"change":3,"pos":145843}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":147853},"to":{"change":3,"start":147853,"end":147890},"introduced_by":3}],"inode":{"change":3,"pos":145843}},"ins_contents":[{"Add":" let verif_result = if num_threads == 1 {"}],"del_contents":[{"Del":" let errs = if num_threads == 1 {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":145843},"path":"src/main.rs","line":94,"ins":{"up_context":[{"change":3,"pos":147985}],"down_context":[{"change":3,"pos":148144}],"flag":"BLOCK","start":23513,"end":23632,"inode":{"change":3,"pos":145843}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":147985},"to":{"change":3,"start":147985,"end":148144},"introduced_by":3}],"inode":{"change":3,"pos":145843}},"ins_contents":[{"Add":" if let Err(e) = verif_result {"},{"Add":" eprintln!(\"verification was unsuccessful. Terminated with error {:?}\\n\", e)"}],"del_contents":[{"Del":" if let Some((e, es)) = errs.split_last() {\n println!(\"verification was unsuccessful. Terminated with error {:?}\\n + {} other errors\", e, es.len());\n"}]}},{"Replacement":{"inode":{"change":3,"pos":145843},"path":"src/main.rs","line":99,"ins":{"up_context":[{"change":3,"pos":148250}],"down_context":[{"change":3,"pos":148366}],"flag":"BLOCK","start":23633,"end":23791,"inode":{"change":3,"pos":145843}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":148250},"to":{"change":3,"start":148250,"end":148366},"introduced_by":3}],"inode":{"change":3,"pos":145843}},"ins_contents":[{"Add":" outline.file_view.mmb.header.num_sorts, "},{"Add":" outline.file_view.mmb.header.num_terms, "},{"Add":" outline.file_view.mmb.header.num_thms, "}],"del_contents":[{"Del":" outline.header.num_sorts, \n outline.header.num_terms, \n outline.header.num_thms, \n"}]}},{"Replacement":{"inode":{"change":3,"pos":145843},"path":"src/main.rs","line":107,"ins":{"up_context":[{"change":3,"pos":148426}],"down_context":[{"change":3,"pos":148492}],"flag":"BLOCK","start":23792,"end":23852,"inode":{"change":3,"pos":145843}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":148426},"to":{"change":3,"start":148426,"end":148492},"introduced_by":3}],"inode":{"change":3,"pos":145843}},"ins_contents":[{"Add":"fn verify_serial<'a>(outline: &'a Outline<'a>) -> Res<()> {"}],"del_contents":[{"Del":"fn verify_serial<'a>(outline: &'a Outline<'a>) -> Vec {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":145843},"path":"src/main.rs","line":109,"ins":{"up_context":[{"change":3,"pos":148536}],"down_context":[{"change":3,"pos":148719}],"flag":"BLOCK","start":23853,"end":23950,"inode":{"change":3,"pos":145843}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":148536},"to":{"change":3,"start":148536,"end":148719},"introduced_by":3}],"inode":{"change":3,"pos":145843}},"ins_contents":[{"Add":" verify_mmz(outline)?;"},{"Add":" verify_mmb(outline, &task_counter)?;"},{"Add":" outline.assert_mmb_done()"}],"del_contents":[{"Del":" let (mut errs) = verify_mmz(outline);\n let mut mmb_errs = verify_mmb(outline, &task_counter);\n errs.append(&mut mmb_errs);\n outline.assert_mmb_done(&mut errs);\n\n errs\n"}]}},{"Replacement":{"inode":{"change":3,"pos":145843},"path":"src/main.rs","line":114,"ins":{"up_context":[{"change":3,"pos":148722}],"down_context":[{"change":3,"pos":148805}],"flag":"BLOCK","start":23951,"end":24176,"inode":{"change":3,"pos":145843}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":148722},"to":{"change":3,"start":148722,"end":148805},"introduced_by":3}],"inode":{"change":3,"pos":145843}},"ins_contents":[{"Add":"// If any of the threads panic, just panic the whole thing since "},{"Add":"// the error is something to do with this tool rather than a user-provided input."},{"Add":"fn verify_par<'a>(outline: &'a Outline<'a>, num_threads: usize) -> Res<()> {"}],"del_contents":[{"Del":"fn verify_par<'a>(outline: &'a Outline<'a>, num_threads: usize) -> Vec {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":145843},"path":"src/main.rs","line":126,"ins":{"up_context":[{"change":3,"pos":149041}],"down_context":[{"change":3,"pos":149231}],"flag":"BLOCK","start":24177,"end":24334,"inode":{"change":3,"pos":145843}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":149041},"to":{"change":3,"start":149041,"end":149231},"introduced_by":3}],"inode":{"change":3,"pos":145843}},"ins_contents":[{"Add":" sco"},{"Add":" .spawn(|_| verify_mmz(outline))"},{"Add":" .join()"},{"Add":" .unwrap()"},{"Add":" .map_err(|_| VerifErr::Msg(format!(\"mmz thread panicked!\")))?;"}],"del_contents":[{"Del":" let mut errs = match sco.spawn(|_| verify_mmz(outline)).join() {\n Err(_) => vec![VerifErr::Msg(format!(\"mmz thread panicked!\"))],\n Ok(errs) => errs,\n };\n"}]}},{"Replacement":{"inode":{"change":3,"pos":145843},"path":"src/main.rs","line":133,"ins":{"up_context":[{"change":3,"pos":149299}],"down_context":[{"change":3,"pos":149510}],"flag":"BLOCK","start":24335,"end":24482,"inode":{"change":3,"pos":145843}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":149299},"to":{"change":3,"start":149299,"end":149510},"introduced_by":3}],"inode":{"change":3,"pos":145843}},"ins_contents":[{"Add":" mmb_task"},{"Add":" .join()"},{"Add":" .unwrap()"},{"Add":" .map_err(|_| VerifErr::Msg(format!(\"mmb thread # {} panicked\", idx)))?;"}],"del_contents":[{"Del":" match mmb_task.join() {\n Err(_) => { errs.push(VerifErr::Msg(format!(\"mmb thread {} panicked\", idx))); },\n Ok(mut mmb_errs) => errs.append(&mut mmb_errs),\n }\n"}]}},{"Replacement":{"inode":{"change":3,"pos":145843},"path":"src/main.rs","line":138,"ins":{"up_context":[{"change":3,"pos":149520}],"down_context":[{"change":3,"pos":149534}],"flag":"BLOCK","start":24483,"end":24498,"inode":{"change":3,"pos":145843}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":149520},"to":{"change":3,"start":149520,"end":149534},"introduced_by":3}],"inode":{"change":3,"pos":145843}},"ins_contents":[{"Add":" Ok(())"}],"del_contents":[{"Del":"\n errs\n"}]}},{"Replacement":{"inode":{"change":3,"pos":145843},"path":"src/main.rs","line":144,"ins":{"up_context":[{"change":3,"pos":149622}],"down_context":[{"change":3,"pos":149685}],"flag":"BLOCK","start":24499,"end":24556,"inode":{"change":3,"pos":145843}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":149622},"to":{"change":3,"start":149622,"end":149685},"introduced_by":3}],"inode":{"change":3,"pos":145843}},"ins_contents":[{"Add":"fn verify_mmz<'a>(outline: &'a Outline<'a>) -> Res<()> {"}],"del_contents":[{"Del":"fn verify_mmz<'a>(outline: &'a Outline<'a>) -> Vec {\n"}]}},{"Edit":{"inode":{"change":3,"pos":145843},"path":"src/main.rs","line":147,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":149771},"to":{"change":3,"start":149771,"end":149802},"introduced_by":3}],"inode":{"change":3,"pos":145843}}},"contents":[{"Del":" let mut errs = Vec::new();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":145843},"path":"src/main.rs","line":148,"ins":{"up_context":[{"change":3,"pos":149858}],"down_context":[{"change":3,"pos":149950}],"flag":"BLOCK","start":24557,"end":24608,"inode":{"change":3,"pos":145843}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":149858},"to":{"change":3,"start":149858,"end":149950},"introduced_by":3}],"inode":{"change":3,"pos":145843}},"ins_contents":[{"Add":" localize!(mem.verify1(&mut bump, *stmt))?;"}],"del_contents":[{"Del":" if let Err(e) = mem.verify1(&mut bump, *stmt) {\n errs.push(e);\n }\n"}]}},{"Replacement":{"inode":{"change":3,"pos":145843},"path":"src/main.rs","line":151,"ins":{"up_context":[{"change":3,"pos":149957}],"down_context":[{"change":3,"pos":150012}],"flag":"BLOCK","start":24609,"end":24643,"inode":{"change":3,"pos":145843}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":149957},"to":{"change":3,"start":149957,"end":150012},"introduced_by":3}],"inode":{"change":3,"pos":145843}},"ins_contents":[{"Add":" outline.assert_mmz_done(&mem)"}],"del_contents":[{"Del":" outline.assert_mmz_done(&mem, &mut errs);\n errs\n"}]}},{"Replacement":{"inode":{"change":3,"pos":145843},"path":"src/main.rs","line":154,"ins":{"up_context":[{"change":3,"pos":150015}],"down_context":[{"change":3,"pos":150106}],"flag":"BLOCK","start":24644,"end":24729,"inode":{"change":3,"pos":145843}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":150015},"to":{"change":3,"start":150015,"end":150106},"introduced_by":3}],"inode":{"change":3,"pos":145843}},"ins_contents":[{"Add":"fn verify_mmb<'a>(outline: &'a Outline<'a>, task_counter: &AtomicUsize) -> Res<()> {"}],"del_contents":[{"Del":"fn verify_mmb<'a>(outline: &'a Outline<'a>, task_counter: &AtomicUsize) -> Vec {\n"}]}},{"Edit":{"inode":{"change":3,"pos":145843},"path":"src/main.rs","line":156,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":150138},"to":{"change":3,"start":150138,"end":150169},"introduced_by":3}],"inode":{"change":3,"pos":145843}}},"contents":[{"Del":" let mut errs = Vec::new();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":145843},"path":"src/main.rs","line":157,"ins":{"up_context":[{"change":3,"pos":150268}],"down_context":[{"change":3,"pos":150395}],"flag":"BLOCK","start":24730,"end":24822,"inode":{"change":3,"pos":145843}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":150268},"to":{"change":3,"start":150268,"end":150395},"introduced_by":3}],"inode":{"change":3,"pos":145843}},"ins_contents":[{"Add":" localize!(crate::mmb::MmbState::verify1(outline, &mut bump, *stmt, proof.clone()))?"}],"del_contents":[{"Del":" if let Err(e) = crate::mmb::MmbState::verify1(outline, &mut bump, *stmt, *proof) {\n errs.push(e);\n }\n"}]}},{"Replacement":{"inode":{"change":3,"pos":145843},"path":"src/main.rs","line":159,"ins":{"up_context":[{"change":3,"pos":150401}],"down_context":[{"change":3,"pos":150411}],"flag":"BLOCK","start":24823,"end":24834,"inode":{"change":3,"pos":145843}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":150401},"to":{"change":3,"start":150401,"end":150411},"introduced_by":3}],"inode":{"change":3,"pos":145843}},"ins_contents":[{"Add":" Ok(())"}],"del_contents":[{"Del":"\n errs\n"}]}},{"FileMove":{"meta":{"basename":"fs.rs","metadata":0},"old":[{"basename":"fs.rs","metadata":420}],"up":[{"change":3,"pos":24}],"down":[{"change":3,"pos":150422}],"show_perms":true}},{"Edit":{"inode":{"change":3,"pos":150422},"path":"src/fs.rs","line":1,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":150422}],"down_context":[{"change":3,"pos":150423}],"flag":"BLOCK","start":24852,"end":24873,"inode":{"change":3,"pos":150422}}},"contents":[{"Add":"use std::fmt::Debug;"}]}},{"Edit":{"inode":{"change":3,"pos":150422},"path":"src/fs.rs","line":3,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":150447}],"down_context":[{"change":3,"pos":150447}],"flag":"BLOCK","start":24874,"end":24987,"inode":{"change":3,"pos":150422}}},"contents":[{"Add":"use std::fs::OpenOptions;"},{"Add":"use std::io::Read;"},{"Add":"use mm0b_parser::BasicMmbFile;"},{"Add":"use mm0_util::{ SortId, Modifiers };"}]}},{"Replacement":{"inode":{"change":3,"pos":150422},"path":"src/fs.rs","line":9,"ins":{"up_context":[{"change":3,"pos":150496}],"down_context":[{"change":3,"pos":150554}],"flag":"BLOCK","start":24988,"end":25049,"inode":{"change":3,"pos":150422}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":150496},"to":{"change":3,"start":150496,"end":150554},"introduced_by":3}],"inode":{"change":3,"pos":150422}},"ins_contents":[{"Add":"use crate::conv_err;"},{"Add":"use crate::none_err;"},{"Add":"use crate::io_err;"}],"del_contents":[{"Del":"\nuse std::fmt::{ Debug, Formatter, Result as FmtResult };\n"}]}},{"Replacement":{"inode":{"change":3,"pos":150422},"path":"src/fs.rs","line":20,"ins":{"up_context":[{"change":3,"pos":150681}],"down_context":[{"change":3,"pos":150730}],"flag":"BLOCK","start":25050,"end":25099,"inode":{"change":3,"pos":150422}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":150681},"to":{"change":3,"start":150681,"end":150730},"introduced_by":3}],"inode":{"change":3,"pos":150422}},"ins_contents":[{"Add":"pub struct RawFileData {"},{"Add":" mmb_bytes: Vec,"}],"del_contents":[{"Del":"pub struct FileData {\n pub mmb_file: Vec,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":150422},"path":"src/fs.rs","line":32,"ins":{"up_context":[{"change":3,"pos":151012}],"down_context":[{"change":3,"pos":151044}],"flag":"BLOCK","start":25100,"end":25130,"inode":{"change":3,"pos":150422}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":151012},"to":{"change":3,"start":151012,"end":151044},"introduced_by":3}],"inode":{"change":3,"pos":150422}},"ins_contents":[{"Add":" mmz_strings: Vec,"}],"del_contents":[{"Del":" pub mmz_files: Vec,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":150422},"path":"src/fs.rs","line":35,"ins":{"up_context":[{"change":3,"pos":151167}],"down_context":[{"change":3,"pos":151203}],"flag":"BLOCK","start":25131,"end":25564,"inode":{"change":3,"pos":150422}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":151167},"to":{"change":3,"start":151167,"end":151203},"introduced_by":3}],"inode":{"change":3,"pos":150422}},"ins_contents":[{"Add":" #[allow(dead_code)]"},{"Add":" pub(crate) mmz_hierarchy: ImportGraph,"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug)]"},{"Add":"pub struct FileView<'a> {"},{"Add":" pub mmb: BasicMmbFile<'a>,"},{"Add":" pub mmz: &'a [String]"},{"Add":"}"},{"Add":""},{"Add":"impl<'a> FileView<'a> {"},{"Add":" pub(crate) fn mmb_sort_mods(&self, id: SortId) -> Res {"},{"Add":" use std::convert::TryFrom;"},{"Add":" none_err!(self.mmb.sort(id))"},{"Add":" .and_then(|id| conv_err!(Modifiers::try_from(id)))"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub struct MmzImporter {"}],"del_contents":[{"Del":" pub mmz_hierarchy: ImportGraph,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":150422},"path":"src/fs.rs","line":55,"ins":{"up_context":[{"change":3,"pos":151231}],"down_context":[{"change":3,"pos":151259}],"flag":"BLOCK","start":25565,"end":25624,"inode":{"change":3,"pos":150422}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":151231},"to":{"change":3,"start":151231,"end":151259},"introduced_by":3}],"inode":{"change":3,"pos":150422}},"ins_contents":[{"Add":" mmz_strings: Vec,"},{"Add":" /// For detecting cycles"}],"del_contents":[{"Del":" // For detecting cycles\n"}]}},{"Replacement":{"inode":{"change":3,"pos":150422},"path":"src/fs.rs","line":58,"ins":{"up_context":[{"change":3,"pos":151284}],"down_context":[{"change":3,"pos":151314}],"flag":"BLOCK","start":25625,"end":25656,"inode":{"change":3,"pos":150422}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":151284},"to":{"change":3,"start":151284,"end":151314},"introduced_by":3}],"inode":{"change":3,"pos":150422}},"ins_contents":[{"Add":" /// For detecting diamonds"}],"del_contents":[{"Del":" // For detecting diamonds\n"}]}},{"Replacement":{"inode":{"change":3,"pos":150422},"path":"src/fs.rs","line":62,"ins":{"up_context":[{"change":3,"pos":151341}],"down_context":[{"change":3,"pos":151614}],"flag":"BLOCK","start":25657,"end":25816,"inode":{"change":3,"pos":150422}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":151341},"to":{"change":3,"start":151341,"end":151614},"introduced_by":3}],"inode":{"change":3,"pos":150422}},"ins_contents":[{"Add":"impl MmzImporter {"},{"Add":" pub fn new_from(root_mmz_path: PathBuf) -> Self {"},{"Add":" MmzImporter {"},{"Add":" root_mmz_path,"},{"Add":" mmz_strings: Vec::new(),"}],"del_contents":[{"Del":"impl std::default::Default for FileData {\n fn default() -> Self {\n FileData {\n mmb_file: Vec::new(),\n mmz_files: Vec::new(),\n root_mmz_path: PathBuf::from(\"\"),\n mmz_hierarchy: ImportGraph::NoImports(PathBuf::from(\"\")),\n"}]}},{"Replacement":{"inode":{"change":3,"pos":150422},"path":"src/fs.rs","line":68,"ins":{"up_context":[{"change":3,"pos":151645}],"down_context":[{"change":3,"pos":151675}],"flag":"BLOCK","start":25817,"end":25846,"inode":{"change":3,"pos":150422}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":151645},"to":{"change":3,"start":151645,"end":151675},"introduced_by":3}],"inode":{"change":3,"pos":150422}},"ins_contents":[{"Add":" done: Vec::new()"}],"del_contents":[{"Del":" done: Vec::new(),\n"}]}},{"Edit":{"inode":{"change":3,"pos":150422},"path":"src/fs.rs","line":71,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":151691},"to":{"change":3,"start":151691,"end":151693},"introduced_by":3}],"inode":{"change":3,"pos":150422}}},"contents":[{"Del":"}\n"}]}},{"Edit":{"inode":{"change":3,"pos":150422},"path":"src/fs.rs","line":72,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":151694},"to":{"change":3,"start":151694,"end":151755},"introduced_by":3}],"inode":{"change":3,"pos":150422}}},"contents":[{"Del":"use std::fs::OpenOptions;\nuse std::io::Read;\nimpl FileData {\n"}]}},{"Edit":{"inode":{"change":3,"pos":150422},"path":"src/fs.rs","line":76,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":151950},"to":{"change":3,"start":151950,"end":153022},"introduced_by":3}],"inode":{"change":3,"pos":150422}}},"contents":[{"Del":" }\n\n pub fn new_from(mmb_path: impl Into, root_mmz_path: Option>) -> Res {\n let mmb_path = mmb_path.into().canonicalize().unwrap();\n let root_mmz_path = match root_mmz_path {\n None => {\n let mut base = mmb_path.clone();\n base.set_extension(\"mm0\");\n base\n },\n Some(p) => p.into().canonicalize().unwrap()\n };\n \n let mut mmb_handle = OpenOptions::new()\n .read(true)\n .truncate(false)\n .open(&mmb_path)\n .map_err(|_| VerifErr::Msg(format!(\"IO err in add_file mmb\")))\n .unwrap(); \n\n let mut mmb_file = Vec::::with_capacity(mmb_handle.metadata().unwrap().len() as usize);\n mmb_handle.read_to_end(&mut mmb_file).unwrap(); \n\n let mut data = FileData::default();\n data.mmb_file = mmb_file;\n data.root_mmz_path = root_mmz_path.clone();\n data.mmz_hierarchy = data.add_mmz_aux(root_mmz_path)?;\n Ok(data) \n"}]}},{"Replacement":{"inode":{"change":3,"pos":150422},"path":"src/fs.rs","line":78,"ins":{"up_context":[{"change":3,"pos":153029}],"down_context":[{"change":3,"pos":153100}],"flag":"BLOCK","start":25847,"end":25917,"inode":{"change":3,"pos":150422}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":153029},"to":{"change":3,"start":153029,"end":153100},"introduced_by":3}],"inode":{"change":3,"pos":150422}},"ins_contents":[{"Add":" /// Form the import graph by mutual recursion with `add_mmz_aux`."}],"del_contents":[{"Del":" /// Form the import graph by mutual recursion with `find_imports`.\n"}]}},{"Replacement":{"inode":{"change":3,"pos":150422},"path":"src/fs.rs","line":81,"ins":{"up_context":[{"change":3,"pos":153229}],"down_context":[{"change":3,"pos":153311}],"flag":"BLOCK","start":25918,"end":26019,"inode":{"change":3,"pos":150422}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":153229},"to":{"change":3,"start":153229,"end":153311},"introduced_by":3}],"inode":{"change":3,"pos":150422}},"ins_contents":[{"Add":" fn add_mmz("},{"Add":" &mut self,"},{"Add":" mmz_path: impl Into,"},{"Add":" ) -> Res {"}],"del_contents":[{"Del":" fn add_mmz_aux(&mut self, mmz_path: impl Into) -> Res {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":150422},"path":"src/fs.rs","line":87,"ins":{"up_context":[{"change":3,"pos":153394}],"down_context":[{"change":3,"pos":153455}],"flag":"BLOCK","start":26020,"end":26304,"inode":{"change":3,"pos":150422}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":153394},"to":{"change":3,"start":153394,"end":153455},"introduced_by":3}],"inode":{"change":3,"pos":150422}},"ins_contents":[{"Add":" // Read the current file so we can find the import statements, but don't"},{"Add":" // push it to the list of mmz files yet so that we maintain the"},{"Add":" // primtive >> uses imports"},{"Add":" // directional ordering."},{"Add":" let s = io_err!(std::fs::read_to_string(&mmz_path))?;"}],"del_contents":[{"Del":" let s = std::fs::read_to_string(&mmz_path).unwrap();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":150422},"path":"src/fs.rs","line":93,"ins":{"up_context":[{"change":3,"pos":153456}],"down_context":[{"change":3,"pos":153600}],"flag":"BLOCK","start":26305,"end":26659,"inode":{"change":3,"pos":150422}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":153456},"to":{"change":3,"start":153456,"end":153600},"introduced_by":3}],"inode":{"change":3,"pos":150422}},"ins_contents":[{"Add":" // Find any imports in `s` and add them (and their imports) to the accumulator"},{"Add":" let imports = self.add_mmz_aux(s.split_whitespace())?;"},{"Add":" // NOW we can push it."},{"Add":" self.mmz_strings.push(s);"},{"Add":" // Take this file off the stack of `todos` now that we've collected its imports"},{"Add":" let popped = none_err!(self.todos.pop())?;"}],"del_contents":[{"Del":" let imports = self.find_imports(s.split_whitespace())?;\n self.mmz_files.push(s);\n let popped = self.todos.pop().unwrap();\n"}]}},{"Edit":{"inode":{"change":3,"pos":150422},"path":"src/fs.rs","line":100,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":153644}],"down_context":[{"change":3,"pos":153644}],"flag":"BLOCK","start":26660,"end":26722,"inode":{"change":3,"pos":150422}}},"contents":[{"Add":" // push the path onto `done` so we can detect cycles."}]}},{"Replacement":{"inode":{"change":3,"pos":150422},"path":"src/fs.rs","line":109,"ins":{"up_context":[{"change":3,"pos":153850}],"down_context":[{"change":3,"pos":154013}],"flag":"BLOCK","start":26723,"end":26905,"inode":{"change":3,"pos":150422}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":153850},"to":{"change":3,"start":153850,"end":154013},"introduced_by":3}],"inode":{"change":3,"pos":150422}},"ins_contents":[{"Add":" /// Form the import graph by mutual recursion with `add_mmz`."},{"Add":" fn add_mmz_aux("},{"Add":" &mut self, "},{"Add":" mut ws: std::str::SplitWhitespace,"},{"Add":" ) -> Res> {"}],"del_contents":[{"Del":" /// Form the import graph by mutual recursion with `add_mmz_aux`.\n fn find_imports(&mut self, mut ws: std::str::SplitWhitespace) -> Res> {\n"}]}},{"Edit":{"inode":{"change":3,"pos":150422},"path":"src/fs.rs","line":116,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":154104}],"down_context":[{"change":3,"pos":154104}],"flag":"BLOCK","start":26906,"end":26975,"inode":{"change":3,"pos":150422}}},"contents":[{"Add":" // If there's a chunk starting with the `import` keyword"}]}},{"Replacement":{"inode":{"change":3,"pos":150422},"path":"src/fs.rs","line":119,"ins":{"up_context":[{"change":3,"pos":154171}],"down_context":[{"change":3,"pos":154401}],"flag":"BLOCK","start":26976,"end":27215,"inode":{"change":3,"pos":150422}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":154171},"to":{"change":3,"start":154171,"end":154401},"introduced_by":3}],"inode":{"change":3,"pos":150422}},"ins_contents":[{"Add":" Some(path) if path.starts_with(\"\\\"\") && path.ends_with(\"\\\";\") => {"},{"Add":" // Get the path without the quotes and semicolon"},{"Add":" let pathbuf = PathBuf::from(&path[1..path.len() - 2]);"}],"del_contents":[{"Del":" Some(path) if path.starts_with(\"\\\"\") => {\n let end_pos = path.chars().skip(1).position(|c| c == '\"').unwrap();\n let pathbuf = PathBuf::from(&path[1..end_pos + 1]);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":150422},"path":"src/fs.rs","line":128,"ins":{"up_context":[{"change":3,"pos":154860}],"down_context":[{"change":3,"pos":154945}],"flag":"BLOCK","start":27216,"end":27297,"inode":{"change":3,"pos":150422}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":154860},"to":{"change":3,"start":154860,"end":154945},"introduced_by":3}],"inode":{"change":3,"pos":150422}},"ins_contents":[{"Add":" let hierarchy = self.add_mmz(self.w_filename(pathbuf))?;"}],"del_contents":[{"Del":" let hierarchy = self.add_mmz_aux(self.w_filename(pathbuf))?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":150422},"path":"src/fs.rs","line":136,"ins":{"up_context":[{"change":3,"pos":155105}],"down_context":[{"change":3,"pos":155111}],"flag":"BLOCK","start":27298,"end":27308,"inode":{"change":3,"pos":150422}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":155105},"to":{"change":3,"start":155105,"end":155111},"introduced_by":3}],"inode":{"change":3,"pos":150422}},"ins_contents":[{"Add":" } "}],"del_contents":[{"Del":" }\n"}]}},{"Edit":{"inode":{"change":3,"pos":150422},"path":"src/fs.rs","line":139,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":155114}],"down_context":[{"change":3,"pos":155114}],"flag":"BLOCK","start":27309,"end":27675,"inode":{"change":3,"pos":150422}}},"contents":[{"Add":"impl RawFileData {"},{"Add":" pub fn view<'a>(&'a self) -> Res> {"},{"Add":" mm0b_parser::BasicMmbFile::parse(self.mmb_bytes.as_slice())"},{"Add":" .map_err(|e| VerifErr::Msg(format!(\"{:?}\", e)))"},{"Add":" .map(|mmb|"},{"Add":" FileView {"},{"Add":" mmb,"},{"Add":" mmz: self.mmz_strings.as_slice()"},{"Add":" }"},{"Add":" )"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":3,"pos":150422},"path":"src/fs.rs","line":151,"ins":{"up_context":[{"change":3,"pos":155115}],"down_context":[{"change":3,"pos":155490}],"flag":"BLOCK","start":27676,"end":28905,"inode":{"change":3,"pos":150422}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":155115},"to":{"change":3,"start":155115,"end":155490},"introduced_by":3}],"inode":{"change":3,"pos":150422}},"ins_contents":[{"Add":" pub fn new_from(mmb_path: impl Into, root_mmz_path: Option>) -> Res {"},{"Add":" "},{"Add":" let mmb_path = io_err!(mmb_path.into().canonicalize())?;"},{"Add":" // If there was no mmz_path specified, look for an mm0 file"},{"Add":" // in the same location as the mmb file."},{"Add":" let root_mmz_path = match root_mmz_path {"},{"Add":" None => {"},{"Add":" let mut base = mmb_path.clone();"},{"Add":" base.set_extension(\"mm0\");"},{"Add":" base"},{"Add":" },"},{"Add":" Some(p) => io_err!(p.into().canonicalize())?"},{"Add":" };"},{"Add":" "},{"Add":" let mut mmb_handle = io_err! {"},{"Add":" OpenOptions::new()"},{"Add":" .read(true)"},{"Add":" .truncate(false)"},{"Add":" .open(&mmb_path)"},{"Add":" }?;"},{"Add":""},{"Add":" let mut mmb_bytes = Vec::::with_capacity(io_err!(mmb_handle.metadata())?.len() as usize);"},{"Add":" io_err!(mmb_handle.read_to_end(&mut mmb_bytes))?;"},{"Add":""},{"Add":" let mut mmz_import_garbage = MmzImporter::new_from(root_mmz_path.clone());"},{"Add":" let mmz_hierarchy = mmz_import_garbage.add_mmz(root_mmz_path)?;"},{"Add":" let data = RawFileData {"},{"Add":" mmb_bytes,"},{"Add":" mmz_strings: mmz_import_garbage.mmz_strings,"},{"Add":" mmz_hierarchy,"},{"Add":" };"},{"Add":" Ok(data) "}],"del_contents":[{"Del":"impl Debug for FileData {\n fn fmt(&self, f: &mut Formatter) -> FmtResult {\n let mut d = f.debug_struct(\"FileData\");\n d.field(\"mmz_files\", &\"\");\n d.field(\"mmz_hierarchy\", &self.mmz_hierarchy);\n d.field(\"todos\", &self.todos);\n d.field(\"done\", &self.done);\n d.field(\"root_mmz_file\", &self.root_mmz_path);\n d.finish()\n"}]}},{"Replacement":{"inode":{"change":3,"pos":150422},"path":"src/fs.rs","line":190,"ins":{"up_context":[{"change":3,"pos":155529}],"down_context":[{"change":3,"pos":155795}],"flag":"BLOCK","start":28906,"end":29181,"inode":{"change":3,"pos":150422}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":155529},"to":{"change":3,"start":155529,"end":155795},"introduced_by":3}],"inode":{"change":3,"pos":150422}},"ins_contents":[{"Add":" let file_data1 = RawFileData::new_from(\"./test_resources/a.mmb\", Some(\"./test_resources/a.mm0\")).unwrap();"},{"Add":" let file_data2 = RawFileData::new_from(\"./test_resources/a.mmb\", None::).unwrap();"},{"Add":" assert_eq!(file_data1.mmz_hierarchy, file_data2.mmz_hierarchy);"}],"del_contents":[{"Del":" let file_data = FileData::new_from(\"./test_resources/a.mmb\", Some(\"./test_resources/a.mm0\")).unwrap();\n let file_data2 = FileData::new_from(\"./test_resources/a.mmb\", None::).unwrap();\n assert_eq!(file_data.mmz_hierarchy, file_data2.mmz_hierarchy);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":150422},"path":"src/fs.rs","line":200,"ins":{"up_context":[{"change":3,"pos":156541}],"down_context":[{"change":3,"pos":156585}],"flag":"BLOCK","start":29182,"end":29227,"inode":{"change":3,"pos":150422}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":156541},"to":{"change":3,"start":156541,"end":156585},"introduced_by":3}],"inode":{"change":3,"pos":150422}},"ins_contents":[{"Add":" assert_eq!(file_data1.mmz_hierarchy, a);"}],"del_contents":[{"Del":" assert_eq!(file_data.mmz_hierarchy, a);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":150422},"path":"src/fs.rs","line":205,"ins":{"up_context":[{"change":3,"pos":156624}],"down_context":[{"change":3,"pos":156746}],"flag":"BLOCK","start":29228,"end":29353,"inode":{"change":3,"pos":150422}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":156624},"to":{"change":3,"start":156624,"end":156746},"introduced_by":3}],"inode":{"change":3,"pos":150422}},"ins_contents":[{"Add":" let file_data= RawFileData::new_from(\"./test_resources/diamond/a.mmb\", Some(\"./test_resources/diamond/a.mm0\")).unwrap();"}],"del_contents":[{"Del":" let file_data= FileData::new_from(\"./test_resources/diamond/a.mmb\", Some(\"./test_resources/diamond/a.mm0\")).unwrap();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":150422},"path":"src/fs.rs","line":219,"ins":{"up_context":[{"change":3,"pos":157631}],"down_context":[{"change":3,"pos":157751}],"flag":"BLOCK","start":29354,"end":29477,"inode":{"change":3,"pos":150422}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":157631},"to":{"change":3,"start":157631,"end":157751},"introduced_by":3}],"inode":{"change":3,"pos":150422}},"ins_contents":[{"Add":" let _ = RawFileData::new_from(\"./test_resources/cycle/cycle.mmb\", Some(\"./test_resources/cycle/cycleA.mm0\")).unwrap();"}],"del_contents":[{"Del":" let _ = FileData::new_from(\"./test_resources/cycle/cycle.mmb\", Some(\"./test_resources/cycle/cycleA.mm0\")).unwrap();\n"}]}},{"FileMove":{"meta":{"basename":"changelog.md","metadata":0},"old":[{"basename":"changelog.md","metadata":420}],"up":[{"change":0,"pos":2}],"down":[{"change":3,"pos":40}],"show_perms":true}},{"Edit":{"inode":{"change":3,"pos":40},"path":"changelog.md","line":24,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":14133}],"down_context":[],"flag":"BLOCK","start":29502,"end":30582,"inode":{"change":3,"pos":40}}},"contents":[{"Add":""},{"Add":"## 0.1.3 -> 2.0"},{"Add":""},{"Add":"+ Remove native mmb parsing facilities in favor of the ones in mm0-rs/components/mmb_parser; the version of `second_opinion` that relies on native implementations will remain available in the `native` fork."},{"Add":"+ Remove ConvRef, change conv implementation"},{"Add":"+ The main verificaiton only returns one (the first) error instead of accumulating any and all errors. Since there's a backtrace provided, I didn't find the multiple error reporting to be helpful."},{"Add":"+ The FileData struct is now a RawFileData struct that owns the underlying data, and FileView is passed around since we need to show that the data backing the parsed MmbFile lives as long as the verification is going on."},{"Add":"+ Break out MmzImporter so we can discard the garbage collected while traversing the mmz import graph."},{"Add":"+ Most methods and structs now use the native SortId, TermId, ThmId instead of u8/u32s."},{"Add":"+ The native Mods was replaced with the upstream Modifiers."},{"Add":"+ Removed most of the outstanding unwraps which were in the `fs` module. They now return a proper error."},{"Add":"+ Fix bug in bound variable counter"}]}},{"FileMove":{"meta":{"basename":"README.md","metadata":0},"old":[{"basename":"README.md","metadata":420}],"up":[{"change":0,"pos":2}],"down":[{"change":3,"pos":843}],"show_perms":true}},{"Edit":{"inode":{"change":3,"pos":843},"path":"README.md","line":9,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":14167},"to":{"change":2,"start":14167,"end":14227},"introduced_by":2}],"inode":{"change":3,"pos":843}}},"contents":[{"Del":"- The mmz parser needs a smart way to skip past any errors.\n"}]}},{"Edit":{"inode":{"change":3,"pos":843},"path":"README.md","line":10,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1162},"to":{"change":3,"start":1162,"end":1350},"introduced_by":3}],"inode":{"change":3,"pos":843}}},"contents":[{"Del":"- I think the parser should deal with an &str source instead of &[u8] for mmz files since you already know it has to be ascii. This would make some stuff nicer and let us get rid of `Str`\n"}]}},{"FileMove":{"meta":{"basename":"Cargo.toml","metadata":0},"old":[{"basename":"Cargo.toml","metadata":420}],"up":[{"change":0,"pos":2}],"down":[{"change":3,"pos":7887}],"show_perms":true}},{"Replacement":{"inode":{"change":3,"pos":7887},"path":"Cargo.toml","line":3,"ins":{"up_context":[{"change":3,"pos":7922}],"down_context":[{"change":3,"pos":7962}],"flag":"BLOCK","start":30626,"end":30665,"inode":{"change":3,"pos":7887}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":7922},"to":{"change":2,"start":14228,"end":14246},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":14246},"to":{"change":3,"start":7940,"end":7962},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":7940},"to":{"change":3,"start":7940,"end":7962},"introduced_by":3}],"inode":{"change":3,"pos":7887}},"ins_contents":[{"Add":"version = \"0.2.1\""},{"Add":"authors = [\"ammkrn\"]"}],"del_contents":[{"Del":"version = \"0.1.3\"\n"},{"Del":"authors = [\"ammkrn_\"]\n"}]}},{"Replacement":{"inode":{"change":3,"pos":7887},"path":"Cargo.toml","line":11,"ins":{"up_context":[{"change":3,"pos":8108}],"down_context":[{"change":3,"pos":8131}],"flag":"BLOCK","start":30666,"end":30687,"inode":{"change":3,"pos":7887}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8108},"to":{"change":3,"start":8108,"end":8131},"introduced_by":3}],"inode":{"change":3,"pos":7887}},"ins_contents":[{"Add":"overflow-checks=true"}],"del_contents":[{"Del":"overflow-checks = true\n"}]}},{"Edit":{"inode":{"change":3,"pos":7887},"path":"Cargo.toml","line":14,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":8142}],"down_context":[{"change":3,"pos":8142}],"flag":"BLOCK","start":30688,"end":30714,"inode":{"change":3,"pos":7887}}},"contents":[{"Add":"[profile.dev]"},{"Add":"debug=true"},{"Add":""}]}},{"Edit":{"inode":{"change":3,"pos":7887},"path":"Cargo.toml","line":18,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":8157}],"down_context":[{"change":3,"pos":8157}],"flag":"BLOCK","start":30715,"end":30775,"inode":{"change":3,"pos":7887}}},"contents":[{"Add":"bumpalo = { version = \"3.5.0\", features = [\"collections\"] }"}]}},{"Replacement":{"inode":{"change":3,"pos":7887},"path":"Cargo.toml","line":21,"ins":{"up_context":[{"change":3,"pos":8199}],"down_context":[],"flag":"BLOCK","start":30776,"end":30817,"inode":{"change":3,"pos":7887}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8199},"to":{"change":3,"start":8199,"end":8259},"introduced_by":3}],"inode":{"change":3,"pos":7887}},"ins_contents":[{"Add":"mm0_util = \"0.1.4\""},{"Add":"mm0b_parser = \"0.1.4\""}],"del_contents":[{"Del":"bumpalo = { version = \"3.5.0\", features = [\"collections\"] }\n"}]}},{"FileMove":{"meta":{"basename":"Cargo.lock","metadata":0},"old":[{"basename":"Cargo.lock","metadata":420}],"up":[{"change":0,"pos":2}],"down":[{"change":3,"pos":8273}],"show_perms":true}},{"Edit":{"inode":{"change":3,"pos":8273},"path":"Cargo.lock","line":3,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":8365}],"down_context":[{"change":3,"pos":8365}],"flag":"BLOCK","start":30840,"end":30853,"inode":{"change":3,"pos":8273}}},"contents":[{"Add":"version = 3"},{"Add":""}]}},{"Replacement":{"inode":{"change":3,"pos":8273},"path":"Cargo.lock","line":7,"ins":{"up_context":[{"change":3,"pos":8396}],"down_context":[{"change":3,"pos":8415}],"flag":"BLOCK","start":30854,"end":30873,"inode":{"change":3,"pos":8273}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8396},"to":{"change":3,"start":8396,"end":8415},"introduced_by":3}],"inode":{"change":3,"pos":8273}},"ins_contents":[{"Add":"version = \"0.12.1\""}],"del_contents":[{"Del":"version = \"0.11.0\"\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8273},"path":"Cargo.lock","line":9,"ins":{"up_context":[{"change":3,"pos":8480}],"down_context":[{"change":3,"pos":8558}],"flag":"BLOCK","start":30874,"end":30952,"inode":{"change":3,"pos":8273}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8480},"to":{"change":3,"start":8480,"end":8558},"introduced_by":3}],"inode":{"change":3,"pos":8273}},"ins_contents":[{"Add":"checksum = \"d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2\""}],"del_contents":[{"Del":"checksum = \"ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b\"\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8273},"path":"Cargo.lock","line":26,"ins":{"up_context":[{"change":3,"pos":8844}],"down_context":[{"change":3,"pos":8879}],"flag":"BLOCK","start":30953,"end":30989,"inode":{"change":3,"pos":8273}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8844},"to":{"change":3,"start":8844,"end":8879},"introduced_by":3}],"inode":{"change":3,"pos":8273}},"ins_contents":[{"Add":"name = \"bitflags\""},{"Add":"version = \"1.3.2\""}],"del_contents":[{"Del":"name = \"autocfg\"\nversion = \"1.0.1\"\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8273},"path":"Cargo.lock","line":29,"ins":{"up_context":[{"change":3,"pos":8944}],"down_context":[{"change":3,"pos":9022}],"flag":"BLOCK","start":30990,"end":31068,"inode":{"change":3,"pos":8273}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8944},"to":{"change":3,"start":8944,"end":9022},"introduced_by":3}],"inode":{"change":3,"pos":8273}},"ins_contents":[{"Add":"checksum = \"bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a\""}],"del_contents":[{"Del":"checksum = \"cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a\"\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8273},"path":"Cargo.lock","line":32,"ins":{"up_context":[{"change":3,"pos":9035}],"down_context":[{"change":3,"pos":9071}],"flag":"BLOCK","start":31069,"end":31104,"inode":{"change":3,"pos":8273}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":9035},"to":{"change":3,"start":9035,"end":9071},"introduced_by":3}],"inode":{"change":3,"pos":8273}},"ins_contents":[{"Add":"name = \"bumpalo\""},{"Add":"version = \"3.9.1\""}],"del_contents":[{"Del":"name = \"bitflags\"\nversion = \"1.2.1\"\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8273},"path":"Cargo.lock","line":35,"ins":{"up_context":[{"change":3,"pos":9136}],"down_context":[{"change":3,"pos":9214}],"flag":"BLOCK","start":31105,"end":31183,"inode":{"change":3,"pos":8273}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":9136},"to":{"change":3,"start":9136,"end":9214},"introduced_by":3}],"inode":{"change":3,"pos":8273}},"ins_contents":[{"Add":"checksum = \"a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899\""}],"del_contents":[{"Del":"checksum = \"cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693\"\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8273},"path":"Cargo.lock","line":38,"ins":{"up_context":[{"change":3,"pos":9227}],"down_context":[{"change":3,"pos":9262}],"flag":"BLOCK","start":31184,"end":31221,"inode":{"change":3,"pos":8273}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":9227},"to":{"change":3,"start":9227,"end":9262},"introduced_by":3}],"inode":{"change":3,"pos":8273}},"ins_contents":[{"Add":"name = \"byteorder\""},{"Add":"version = \"1.4.3\""}],"del_contents":[{"Del":"name = \"bumpalo\"\nversion = \"3.5.0\"\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8273},"path":"Cargo.lock","line":41,"ins":{"up_context":[{"change":3,"pos":9327}],"down_context":[{"change":3,"pos":9405}],"flag":"BLOCK","start":31222,"end":31300,"inode":{"change":3,"pos":8273}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":9327},"to":{"change":3,"start":9327,"end":9405},"introduced_by":3}],"inode":{"change":3,"pos":8273}},"ins_contents":[{"Add":"checksum = \"14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610\""}],"del_contents":[{"Del":"checksum = \"f07aa6688c702439a1be0307b6a94dffe1168569e45b9500c1372bc580740d59\"\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8273},"path":"Cargo.lock","line":51,"ins":{"up_context":[{"change":3,"pos":9622}],"down_context":[{"change":3,"pos":9641}],"flag":"BLOCK","start":31301,"end":31320,"inode":{"change":3,"pos":8273}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":9622},"to":{"change":3,"start":9622,"end":9641},"introduced_by":3}],"inode":{"change":3,"pos":8273}},"ins_contents":[{"Add":"version = \"2.34.0\""}],"del_contents":[{"Del":"version = \"2.33.3\"\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8273},"path":"Cargo.lock","line":53,"ins":{"up_context":[{"change":3,"pos":9706}],"down_context":[{"change":3,"pos":9784}],"flag":"BLOCK","start":31321,"end":31399,"inode":{"change":3,"pos":8273}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":9706},"to":{"change":3,"start":9706,"end":9784},"introduced_by":3}],"inode":{"change":3,"pos":8273}},"ins_contents":[{"Add":"checksum = \"a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c\""}],"del_contents":[{"Del":"checksum = \"37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002\"\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8273},"path":"Cargo.lock","line":66,"ins":{"up_context":[{"change":3,"pos":9931}],"down_context":[{"change":3,"pos":9949}],"flag":"BLOCK","start":31400,"end":31418,"inode":{"change":3,"pos":8273}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":9931},"to":{"change":3,"start":9931,"end":9949},"introduced_by":3}],"inode":{"change":3,"pos":8273}},"ins_contents":[{"Add":"version = \"0.8.6\""}],"del_contents":[{"Del":"version = \"0.8.1\"\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8273},"path":"Cargo.lock","line":68,"ins":{"up_context":[{"change":3,"pos":10014}],"down_context":[{"change":3,"pos":10092}],"flag":"BLOCK","start":31419,"end":31497,"inode":{"change":3,"pos":8273}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":10014},"to":{"change":3,"start":10014,"end":10092},"introduced_by":3}],"inode":{"change":3,"pos":8273}},"ins_contents":[{"Add":"checksum = \"cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120\""}],"del_contents":[{"Del":"checksum = \"02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d\"\n"}]}},{"Edit":{"inode":{"change":3,"pos":8273},"path":"Cargo.lock","line":70,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":10109},"to":{"change":3,"start":10109,"end":10121},"introduced_by":3}],"inode":{"change":3,"pos":8273}}},"contents":[{"Del":" \"autocfg\",\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8273},"path":"Cargo.lock","line":76,"ins":{"up_context":[{"change":3,"pos":10183}],"down_context":[{"change":3,"pos":10202}],"flag":"BLOCK","start":31498,"end":31517,"inode":{"change":3,"pos":8273}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":10183},"to":{"change":3,"start":10183,"end":10202},"introduced_by":3}],"inode":{"change":3,"pos":8273}},"ins_contents":[{"Add":"version = \"0.1.19\""}],"del_contents":[{"Del":"version = \"0.1.18\"\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8273},"path":"Cargo.lock","line":78,"ins":{"up_context":[{"change":3,"pos":10267}],"down_context":[{"change":3,"pos":10345}],"flag":"BLOCK","start":31518,"end":31596,"inode":{"change":3,"pos":8273}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":10267},"to":{"change":3,"start":10267,"end":10345},"introduced_by":3}],"inode":{"change":3,"pos":8273}},"ins_contents":[{"Add":"checksum = \"62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33\""}],"del_contents":[{"Del":"checksum = \"322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c\"\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8273},"path":"Cargo.lock","line":91,"ins":{"up_context":[{"change":3,"pos":10595}],"down_context":[{"change":3,"pos":10614}],"flag":"BLOCK","start":31597,"end":31807,"inode":{"change":3,"pos":8273}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":10595},"to":{"change":3,"start":10595,"end":10614},"introduced_by":3}],"inode":{"change":3,"pos":8273}},"ins_contents":[{"Add":"version = \"0.2.112\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125\""},{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"memchr\""},{"Add":"version = \"2.4.1\""}],"del_contents":[{"Del":"version = \"0.2.82\"\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8273},"path":"Cargo.lock","line":99,"ins":{"up_context":[{"change":3,"pos":10679}],"down_context":[{"change":3,"pos":10757}],"flag":"BLOCK","start":31808,"end":31886,"inode":{"change":3,"pos":8273}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":10679},"to":{"change":3,"start":10679,"end":10757},"introduced_by":3}],"inode":{"change":3,"pos":8273}},"ins_contents":[{"Add":"checksum = \"308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a\""}],"del_contents":[{"Del":"checksum = \"89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929\"\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8273},"path":"Cargo.lock","line":102,"ins":{"up_context":[{"change":3,"pos":10770}],"down_context":[{"change":2,"pos":14247}],"flag":"BLOCK","start":31887,"end":31909,"inode":{"change":3,"pos":8273}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":10770},"to":{"change":3,"start":10770,"end":10794},"introduced_by":3}],"inode":{"change":3,"pos":8273}},"ins_contents":[{"Add":"name = \"mm0_deepsize\""}],"del_contents":[{"Del":"name = \"second_opinion\"\n"}]}},{"Edit":{"inode":{"change":3,"pos":8273},"path":"Cargo.lock","line":104,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":14265}],"down_context":[{"change":3,"pos":10812}],"flag":"BLOCK","start":31910,"end":33993,"inode":{"change":3,"pos":8273}}},"contents":[{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"9e84f8531413398f7110dbcc126428ed097b51efaa59cafb626130a736daee6f\""},{"Add":"dependencies = ["},{"Add":" \"mm0_deepsize_derive\","},{"Add":"]"},{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"mm0_deepsize_derive\""},{"Add":"version = \"0.1.2\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"8d347f3395472eb8f5de502facb8c0bcccb73269d257c32c69e6bafad5246cb1\""},{"Add":"dependencies = ["},{"Add":" \"proc-macro2\","},{"Add":" \"quote\","},{"Add":" \"syn\","},{"Add":"]"},{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"mm0_util\""},{"Add":"version = \"0.1.4\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"22cee3d13265fcdecc6fb1dd05d6a0e516e7f3bdc223b57d21109686aca19190\""},{"Add":"dependencies = ["},{"Add":" \"bitflags\","},{"Add":" \"lazy_static\","},{"Add":" \"libc\","},{"Add":" \"mm0_deepsize\","},{"Add":" \"mm0_deepsize_derive\","},{"Add":" \"pathdiff\","},{"Add":" \"procinfo\","},{"Add":"]"},{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"mm0b_parser\""},{"Add":"version = \"0.1.4\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"908327387657a2adc5231e72c7873ae4aa6e35281185ef146a750e173fda65b5\""},{"Add":"dependencies = ["},{"Add":" \"byteorder\","},{"Add":" \"memchr\","},{"Add":" \"mm0_util\","},{"Add":" \"zerocopy\","},{"Add":"]"},{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"nom\""},{"Add":"version = \"2.2.1\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"cf51a729ecf40266a2368ad335a5fdde43471f545a967109cd62146ecf8b66ff\""},{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"pathdiff\""},{"Add":"version = \"0.2.1\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd\""},{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"proc-macro2\""},{"Add":"version = \"1.0.36\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029\""},{"Add":"dependencies = ["},{"Add":" \"unicode-xid\","},{"Add":"]"},{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"procinfo\""},{"Add":"version = \"0.4.2\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"6ab1427f3d2635891f842892dda177883dca0639e05fe66796a62c9d2f23b49c\""},{"Add":"dependencies = ["},{"Add":" \"byteorder\","},{"Add":" \"libc\","},{"Add":" \"nom\","},{"Add":" \"rustc_version\","},{"Add":"]"},{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"quote\""},{"Add":"version = \"1.0.14\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d\""}]}},{"Edit":{"inode":{"change":3,"pos":8273},"path":"Cargo.lock","line":187,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":10829}],"down_context":[{"change":3,"pos":10829}],"flag":"BLOCK","start":33994,"end":34311,"inode":{"change":3,"pos":8273}}},"contents":[{"Add":" \"proc-macro2\","},{"Add":"]"},{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"rustc_version\""},{"Add":"version = \"0.2.3\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a\""},{"Add":"dependencies = ["},{"Add":" \"semver\","},{"Add":"]"},{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"second_opinion\""},{"Add":"version = \"0.2.1\""},{"Add":"dependencies = ["}]}},{"Edit":{"inode":{"change":3,"pos":8273},"path":"Cargo.lock","line":206,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":10870}],"down_context":[{"change":3,"pos":10870}],"flag":"BLOCK","start":34312,"end":34341,"inode":{"change":3,"pos":8273}}},"contents":[{"Add":" \"mm0_util\","},{"Add":" \"mm0b_parser\","}]}},{"Edit":{"inode":{"change":3,"pos":8273},"path":"Cargo.lock","line":211,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":10885}],"down_context":[{"change":3,"pos":10885}],"flag":"BLOCK","start":34342,"end":34766,"inode":{"change":3,"pos":8273}}},"contents":[{"Add":"name = \"semver\""},{"Add":"version = \"0.9.0\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403\""},{"Add":"dependencies = ["},{"Add":" \"semver-parser\","},{"Add":"]"},{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"semver-parser\""},{"Add":"version = \"0.7.0\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3\""},{"Add":""},{"Add":"[[package]]"}]}},{"Edit":{"inode":{"change":3,"pos":8273},"path":"Cargo.lock","line":232,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":11075}],"down_context":[{"change":3,"pos":11075}],"flag":"BLOCK","start":34767,"end":35282,"inode":{"change":3,"pos":8273}}},"contents":[{"Add":"name = \"syn\""},{"Add":"version = \"1.0.85\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7\""},{"Add":"dependencies = ["},{"Add":" \"proc-macro2\","},{"Add":" \"quote\","},{"Add":" \"unicode-xid\","},{"Add":"]"},{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"synstructure\""},{"Add":"version = \"0.12.6\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f\""},{"Add":"dependencies = ["},{"Add":" \"proc-macro2\","},{"Add":" \"quote\","},{"Add":" \"syn\","},{"Add":" \"unicode-xid\","},{"Add":"]"},{"Add":""},{"Add":"[[package]]"}]}},{"Replacement":{"inode":{"change":3,"pos":8273},"path":"Cargo.lock","line":265,"ins":{"up_context":[{"change":3,"pos":11328}],"down_context":[{"change":3,"pos":11346}],"flag":"BLOCK","start":35283,"end":35301,"inode":{"change":3,"pos":8273}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":11328},"to":{"change":3,"start":11328,"end":11346},"introduced_by":3}],"inode":{"change":3,"pos":8273}},"ins_contents":[{"Add":"version = \"0.1.9\""}],"del_contents":[{"Del":"version = \"0.1.8\"\n"}]}},{"Replacement":{"inode":{"change":3,"pos":8273},"path":"Cargo.lock","line":267,"ins":{"up_context":[{"change":3,"pos":11411}],"down_context":[{"change":3,"pos":11489}],"flag":"BLOCK","start":35302,"end":35380,"inode":{"change":3,"pos":8273}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":11411},"to":{"change":3,"start":11411,"end":11489},"introduced_by":3}],"inode":{"change":3,"pos":8273}},"ins_contents":[{"Add":"checksum = \"3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973\""}],"del_contents":[{"Del":"checksum = \"9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3\"\n"}]}},{"Edit":{"inode":{"change":3,"pos":8273},"path":"Cargo.lock","line":270,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":11502}],"down_context":[{"change":3,"pos":11502}],"flag":"BLOCK","start":35381,"end":35576,"inode":{"change":3,"pos":8273}}},"contents":[{"Add":"name = \"unicode-xid\""},{"Add":"version = \"0.2.2\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3\""},{"Add":""},{"Add":"[[package]]"}]}},{"Edit":{"inode":{"change":3,"pos":8273},"path":"Cargo.lock","line":302,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":12375}],"down_context":[],"flag":"BLOCK","start":35577,"end":36081,"inode":{"change":3,"pos":8273}}},"contents":[{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"zerocopy\""},{"Add":"version = \"0.5.0\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"5e59ec1d2457bd6c0dd89b50e7d9d6b0b647809bf3f0a59ac85557046950b7b2\""},{"Add":"dependencies = ["},{"Add":" \"byteorder\","},{"Add":" \"zerocopy-derive\","},{"Add":"]"},{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"zerocopy-derive\""},{"Add":"version = \"0.3.1\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"a0fbc82b82efe24da867ee52e015e58178684bd9dd64c34e66bdf21da2582a9f\""},{"Add":"dependencies = ["},{"Add":" \"proc-macro2\","},{"Add":" \"syn\","},{"Add":" \"synstructure\","},{"Add":"]"}]}}],"owner":"ammkrn","repo":"second_opinion","token":"NhYjaD2rwLY/4nF0nj++4jI2Q68xi3ONRYzqs3U7QS8=","login":null}

…

Dependencies

Change contents