Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make verify_one public #88

Merged
merged 1 commit into from
May 12, 2022
Merged

make verify_one public #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/comment_parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,9 +294,8 @@ impl<'a> CommentParser<'a> {
let label_start = self.pos;
while let Some(&c) = self.buf.get(self.pos) {
match c {
b' ' | b'\n' => break,
b'[' | b'`' if self.buf.get(self.pos + 1) == Some(&c) => self.pos += 2,
b'`' => break,
b' ' | b'\n' | b'`' => break,
b'[' if self.parse_bib().is_some() => break,
b'<' if self.buf[self.pos..].starts_with(b"<HTML>")
|| self.buf[self.pos..].starts_with(b"</HTML>") =>
Expand Down
3 changes: 1 addition & 2 deletions src/line_cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ fn line_to_offset(buf: &[u8], index: &[u32], line: u32) -> usize {
Ordering::Greater
}
})
.err()
.expect("cannot match");
.expect_err("cannot match");
// page*PAGE is the first page-aligned which is >= to the goal line, OR it
// points at an incomplete end page
if page == 0 {
Expand Down
4 changes: 2 additions & 2 deletions src/nameck.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ fn autoviv<K: Hash + Eq, V: Default>(map: &mut HashMap<K, V>, key: K) -> &mut V
map.entry(key).or_insert_with(Default::default)
}

fn deviv<K, Q: ?Sized, V, F>(map: &mut HashMap<K, V>, key: &Q, fun: F)
fn deviv<K, Q, V, F>(map: &mut HashMap<K, V>, key: &Q, fun: F)
where
F: FnOnce(&mut V),
K: Borrow<Q> + Hash + Eq,
Q: Hash + Eq,
Q: ?Sized + Hash + Eq,
V: Default + Eq,
{
let kill = match map.get_mut(key) {
Expand Down
4 changes: 2 additions & 2 deletions src/proof.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use crate::scopeck::{Hyp, ScopeResult};
use crate::segment_set::SegmentSet;
use crate::statement::{StatementAddress, TokenPtr};
use crate::util::HashMap;
use crate::verify::{verify_one, ProofBuilder};
use crate::verify::ProofBuilder;
use crate::{Database, StatementRef, StatementType};
use std::cmp::{max, Ord, Ordering, PartialOrd};
use std::collections::hash_map::{DefaultHasher, Entry};
Expand Down Expand Up @@ -119,7 +119,7 @@ impl ProofTreeArray {
/// proof is faulty
pub(crate) fn new(db: &Database, stmt: StatementRef<'_>) -> Result<ProofTreeArray, Diagnostic> {
let mut arr = ProofTreeArray::default();
arr.qed = verify_one(db, &mut arr, stmt)?;
arr.qed = db.verify_one(&mut arr, stmt)?;
arr.calc_indent();
Ok(arr)
}
Expand Down
56 changes: 29 additions & 27 deletions src/verify.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,32 +881,34 @@ pub(crate) fn verify(
}
}

/// Parse a single $p statement, returning the result of the given
/// proof builder, or an error if the proof is faulty
pub(crate) fn verify_one<P: ProofBuilder>(
db: &Database,
builder: &mut P,
stmt: StatementRef<'_>,
) -> Result<P::Item> {
let dummy_frame = Frame::default();
let mut state = VerifyState {
this_seg: stmt.segment(),
scoper: ScopeReader::new(db.scope_result()),
nameset: db.name_result(),
builder,
order: &db.parse_result().order,
cur_frame: &dummy_frame,
stack: Vec::new(),
stack_buffer: Vec::new(),
prepared: Vec::new(),
temp_buffer: Vec::new(),
subst_info: Vec::new(),
var2bit: HashMap::default(),
dv_map: &dummy_frame.optional_dv,
};
impl Database {
/// Parse a single $p statement, returning the result of the given
/// proof builder, or an error if the proof is faulty
pub fn verify_one<P: ProofBuilder>(
&self,
builder: &mut P,
stmt: StatementRef<'_>,
) -> Result<P::Item> {
let dummy_frame = Frame::default();
let mut state = VerifyState {
this_seg: stmt.segment(),
scoper: ScopeReader::new(self.scope_result()),
nameset: self.name_result(),
builder,
order: &self.parse_result().order,
cur_frame: &dummy_frame,
stack: Vec::new(),
stack_buffer: Vec::new(),
prepared: Vec::new(),
temp_buffer: Vec::new(),
subst_info: Vec::new(),
var2bit: HashMap::default(),
dv_map: &dummy_frame.optional_dv,
};

assert!(stmt.statement_type() == StatementType::Provable);
let frame = state.scoper.get(stmt.label()).unwrap();
state.cur_frame = frame;
verify_proof(&mut state, stmt)
assert!(stmt.statement_type() == StatementType::Provable);
let frame = state.scoper.get(stmt.label()).unwrap();
state.cur_frame = frame;
verify_proof(&mut state, stmt)
}
}