From a7dd4d2fe9cf06f1a410a6a3972b8a1e04ca6a81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20L=C3=BChne?= <patrick@luehne.de>
Date: Fri, 27 Mar 2020 04:37:37 +0100
Subject: [PATCH] Disallow reserved keywords as names

---
 src/parse/names.rs | 50 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 40 insertions(+), 10 deletions(-)

diff --git a/src/parse/names.rs b/src/parse/names.rs
index 3660c12..591b4f5 100644
--- a/src/parse/names.rs
+++ b/src/parse/names.rs
@@ -30,18 +30,32 @@ fn is_variable_name_character_body(c: char) -> bool
 
 pub fn function_or_predicate_name(i: &str) -> IResult<&str, &str>
 {
-	recognize
-	(
-		terminated
+	let (i, name) =
+		recognize
 		(
-			pair
+			terminated
 			(
-				take_while_m_n(1, 1, is_function_name_character_first),
-				take_while(is_function_name_character_body),
-			),
-			word_boundary,
-		)
-	)(i)
+				pair
+				(
+					take_while_m_n(1, 1, is_function_name_character_first),
+					take_while(is_function_name_character_body),
+				),
+				word_boundary,
+			)
+		)(i)?;
+
+	match name
+	{
+		"and"
+		| "exists"
+		| "false"
+		| "forall"
+		| "not"
+		| "or"
+		| "true"
+			=> Err(nom::Err::Error((i, nom::error::ErrorKind::Verify))),
+		name => Ok((i, name)),
+	}
 }
 
 pub fn variable_name(i: &str) -> IResult<&str, &str>
@@ -80,6 +94,22 @@ mod tests
 		assert!(function_or_predicate_name("_ rest").is_err());
 		assert!(function_or_predicate_name("_predicate_123 rest").is_err());
 		assert!(function_or_predicate_name(" ").is_err());
+		// Keywords aren’t valid names
+		assert!(function_or_predicate_name("and rest").is_err());
+		assert!(function_or_predicate_name("exists rest").is_err());
+		assert!(function_or_predicate_name("false rest").is_err());
+		assert!(function_or_predicate_name("forall rest").is_err());
+		assert!(function_or_predicate_name("or rest").is_err());
+		assert!(function_or_predicate_name("not rest").is_err());
+		assert!(function_or_predicate_name("true rest").is_err());
+		// Names that start with keywords are fine though
+		assert!(function_or_predicate_name("anda rest").is_ok());
+		assert!(function_or_predicate_name("existsa rest").is_ok());
+		assert!(function_or_predicate_name("falsea rest").is_ok());
+		assert!(function_or_predicate_name("foralla rest").is_ok());
+		assert!(function_or_predicate_name("ora rest").is_ok());
+		assert!(function_or_predicate_name("nota rest").is_ok());
+		assert!(function_or_predicate_name("truea rest").is_ok());
 	}
 
 	#[test]