Fix typo in Conjunction rule

fastobo · Feb 26, 2024 · 61c27c8 · 61c27c8
1 parent ff54c85
commit 61c27c8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/src/frames.rs b/src/frames.rs
@@ -126,4 +126,4 @@ impl<A: ForIRI> From<ObjectPropertyExpression<A>> for InverseObjectPropertyFrame
     fn from(ope: ObjectPropertyExpression<A>) -> Self {
         Self::new(ope)
     }
-}
+}
diff --git a/src/from_pair.rs b/src/from_pair.rs
@@ -15,9 +15,9 @@ use crate::frames::AnnotationPropertyFrame;
 use crate::frames::ClassFrame;
 use crate::frames::DataPropertyFrame;
 use crate::frames::DatatypeFrame;
-use crate::frames::MiscClause;
-use crate::frames::InverseObjectPropertyFrame;
 use crate::frames::IndividualFrame;
+use crate::frames::InverseObjectPropertyFrame;
+use crate::frames::MiscClause;
 use crate::frames::ObjectPropertyFrame;
 use crate::parser::Rule;
 use crate::Context;
@@ -355,11 +355,11 @@ fn from_primary_pair<A: ForIRI>(
     }
 }
 
-fn from_conjuction_pair<A: ForIRI>(
+fn from_conjunction_pair<A: ForIRI>(
     pair: Pair<Rule>,
     ctx: &Context<'_, A>,
 ) -> Result<ClassExpression<A>> {
-    debug_assert!(pair.as_rule() == Rule::Conjuction);
+    debug_assert!(pair.as_rule() == Rule::Conjunction);
 
     let mut inner = pair.into_inner().peekable();
     match inner.peek().unwrap().as_rule() {
@@ -398,11 +398,11 @@ impl<A: ForIRI> FromPair<A> for ClassExpression<A> {
     fn from_pair_unchecked(pair: Pair<Rule>, ctx: &Context<'_, A>) -> Result<Self> {
         let mut inner = pair.into_inner();
         if inner.len() == 1 {
-            from_conjuction_pair(inner.next().unwrap(), ctx)
+            from_conjunction_pair(inner.next().unwrap(), ctx)
         } else {
             Ok(ClassExpression::ObjectUnionOf(
                 inner
-                    .map(|pair| from_conjuction_pair(pair, ctx))
+                    .map(|pair| from_conjunction_pair(pair, ctx))
                     .collect::<Result<_>>()?,
             ))
         }

diff --git a/src/omn.pest b/src/omn.pest
@@ -226,8 +226,8 @@ RestrictionValue = { Literal }
 
 // 2.4 Descriptions
 
-Description = { Conjuction ~ (KEYWORD_OR ~ Conjuction)* }
-Conjuction = { 
+Description = { Conjunction ~ (KEYWORD_OR ~ Conjunction)* }
+Conjunction = { 
         (ClassIRI ~ "that" ~ KEYWORD_NOT? ~ Restriction ~ ( KEYWORD_AND ~ KEYWORD_NOT? ~ Restriction )*)
     |   (Primary ~ (KEYWORD_AND ~ Primary)*)
 }

diff --git a/src/parser.rs b/src/parser.rs
@@ -214,9 +214,9 @@ mod tests {
     }
 
     #[test]
-    fn conjuction() {
+    fn conjunction() {
         assert_parse!(
-            Rule::Conjuction,
+            Rule::Conjunction,
             r#"owl:Thing that hasFirstName exactly 1 and hasFirstName only string[minLength 1]"#
         );
     }
-Original file line number
+Diff line change
@@ Expand Up @@
         fn from(ope: ObjectPropertyExpression<A>) -> Self {
             Self::new(ope)
         }
-    }
+    }