Add completion, assumption, and assertion directives

src/format.rs

@@ -5,8 +5,9 @@ impl std::fmt::Debug for crate::project::StatementKind
 		match &self
 		{
 			crate::project::StatementKind::Axiom => write!(format, "axiom"),
-			crate::project::StatementKind::Lemma => write!(format, "lemma"),
+			crate::project::StatementKind::Completion => write!(format, "completion"),
-			crate::project::StatementKind::Conjecture => write!(format, "conjecture"),
+			crate::project::StatementKind::Assumption => write!(format, "assumption"),
+			crate::project::StatementKind::Assertion => write!(format, "assertion"),
 		}
 	}
 }

src/format_tptp.rs

@@ -78,12 +78,7 @@ fn collect_predicate_declarations_in_project<'a>(project: &'a crate::Project)
 				match block
 				{
 					crate::project::Block::Whitespace(_) => None,
-					crate::project::Block::Statement(ref statement) =>
+					crate::project::Block::Statement(ref statement) => Some(&statement.formula),
-						match statement.kind
-						{
-							crate::project::StatementKind::Axiom => Some(&statement.formula),
-							_ => None,
-						}
 				});
 
 	for formula in formulas
@@ -211,12 +206,7 @@ fn collect_symbolic_constants_in_project<'a>(project: &'a crate::Project)
 				match block
 				{
 					crate::project::Block::Whitespace(_) => None,
-					crate::project::Block::Statement(ref statement) =>
+					crate::project::Block::Statement(ref statement) => Some(&statement.formula),
-						match statement.kind
-						{
-							crate::project::StatementKind::Axiom => Some(&statement.formula),
-							_ => None,
-						}
 				});
 
 	for formula in formulas
@@ -565,8 +555,9 @@ impl<'a> std::fmt::Debug for StatementKindDisplay<'a>
 		match &self.0
 		{
 			crate::project::StatementKind::Axiom => write!(format, "axiom, axiom"),
-			crate::project::StatementKind::Lemma => write!(format, "lemma, conjecture"),
+			crate::project::StatementKind::Completion => write!(format, "completion, axiom"),
-			crate::project::StatementKind::Conjecture => write!(format, "conjecture, conjecture"),
+			crate::project::StatementKind::Assumption => write!(format, "assumption, axiom"),
+			crate::project::StatementKind::Assertion => write!(format, "assertion, conjecture"),
 		}
 	}
 }
@@ -627,35 +618,31 @@ impl<'a, 'input> std::fmt::Debug for ProjectDisplay<'a, 'input>
 					crate::project::Block::Statement(ref statement) =>
 						match statement.kind
 						{
-							crate::project::StatementKind::Axiom => Some(statement),
+							crate::project::StatementKind::Axiom
-							_ => None,
+								| crate::project::StatementKind::Completion
+								| crate::project::StatementKind::Assumption => Some(statement),
+							crate::project::StatementKind::Assertion => None,
 						}
 				});
 
 		for axiom in axioms
 		{
-			write!(format, "\ntff({:?}, {:?}).", crate::project::StatementKind::Axiom.display_tptp(), axiom.formula.display_tptp())?;
+			write!(format, "\ntff({:?}, {:?}).", axiom.kind.display_tptp(), axiom.formula.display_tptp())?;
 		}
 
 		match self.conjecture.kind
 		{
-			crate::project::StatementKind::Lemma =>
+			crate::project::StatementKind::Assertion =>
 			{
-				write_title(format, "\n\n", "lemma")?;
+				write_title(format, "\n\n", "assertion")?;
 
-				write!(format, "\ntff({:?}, {:?}).", crate::project::StatementKind::Lemma.display_tptp(), self.conjecture.formula.display_tptp())?;
+				write!(format, "\ntff({:?}, {:?}).", crate::project::StatementKind::Assertion.display_tptp(), self.conjecture.formula.display_tptp())?;
 
 				Ok(())
 			},
-			crate::project::StatementKind::Conjecture =>
+			crate::project::StatementKind::Axiom => panic!("unexpected axiom statement"),
-			{
+			crate::project::StatementKind::Completion => panic!("unexpected completion statement"),
-				write_title(format, "\n\n", "conjecture")?;
+			crate::project::StatementKind::Assumption => panic!("unexpected assumption statement"),
-
-				write!(format, "\ntff({:?}, {:?}).", crate::project::StatementKind::Conjecture.display_tptp(), self.conjecture.formula.display_tptp())?;
-
-				Ok(())
-			},
-			crate::project::StatementKind::Axiom => panic!("unexpected axiom"),
 		}
 	}
 }

src/main.rs

@@ -25,8 +25,7 @@ fn find_conjecture<'a, 'input>(project: &'a ask_dracula::Project<'input>) -> Opt
 	{
 		if let ask_dracula::project::Block::Statement(ref statement) = block
 		{
-			if statement.kind == ask_dracula::project::StatementKind::Lemma
+			if statement.kind == ask_dracula::project::StatementKind::Assertion
-				|| statement.kind == ask_dracula::project::StatementKind::Conjecture
 			{
 				return Some(statement)
 			}
@@ -42,8 +41,7 @@ fn find_conjecture_mut<'a, 'input>(project: &'a mut ask_dracula::Project<'input>
 	{
 		if let ask_dracula::project::Block::Statement(ref mut statement) = block
 		{
-			if statement.kind == ask_dracula::project::StatementKind::Lemma
+			if statement.kind == ask_dracula::project::StatementKind::Assertion
-				|| statement.kind == ask_dracula::project::StatementKind::Conjecture
 			{
 				return Some(statement)
 			}
@@ -142,7 +140,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>>
 	{
 		None =>
 		{
-			eprintln!("no lemma or conjecture found, nothing to do");
+			eprintln!("nothing to prove, exiting");
 			return Ok(());
 		},
 		Some(ref conjecture) =>
@@ -166,10 +164,10 @@ fn main() -> Result<(), Box<dyn std::error::Error>>
 		},
 		ProofResult::Refutation =>
 		{
-			println!("conjecture proven");
+			println!("assertion proven");
 
 			conjecture.kind = ask_dracula::project::StatementKind::Axiom;
-			let replace_statement_kind_regex = regex::Regex::new(r"(conjecture|lemma)").unwrap();
+			let replace_statement_kind_regex = regex::Regex::new(r"(assertion)").unwrap();
 			let new_text = replace_statement_kind_regex.replace(conjecture.original_text, "axiom");
 			conjecture.original_text = &new_text;
 

src/parse.rs

@@ -42,13 +42,18 @@ fn statement_kind(i: &str) -> IResult<&str, crate::project::StatementKind>
 			),
 			map
 			(
-				tag("lemma:"),
+				tag("completion:"),
-				|_| crate::project::StatementKind::Lemma,
+				|_| crate::project::StatementKind::Completion,
 			),
 			map
 			(
-				tag("conjecture:"),
+				tag("assumption:"),
-				|_| crate::project::StatementKind::Conjecture,
+				|_| crate::project::StatementKind::Assumption,
+			),
+			map
+			(
+				tag("assertion:"),
+				|_| crate::project::StatementKind::Assertion,
 			),
 		)),
 		whitespace0,

src/project.rs

@@ -2,8 +2,9 @@
 pub enum StatementKind
 {
 	Axiom,
-	Lemma,
+	Completion,
-	Conjecture,
+	Assumption,
+	Assertion,
 }
 
 pub struct Statement<'input>