Implement additional class restriction expression parsing

fastobo · Feb 25, 2024 · e66b6df · e66b6df
1 parent 41a390a
commit e66b6df
Showing 1 changed file with 19 additions and 2 deletions.
diff --git a/src/from_pair.rs b/src/from_pair.rs
@@ -287,7 +287,10 @@ fn from_restriction_pair<A: ForIRI>(
             Ok(ClassExpression::ObjectAllValuesFrom { ope, bce })
         }
         Rule::ObjectHasValueRestriction => {
-            unimplemented!()
+            let mut pairs = inner.into_inner();
+            let ope = FromPair::from_pair(pairs.next().unwrap(), ctx)?;
+            let i = FromPair::from_pair(pairs.next().unwrap(), ctx)?;
+            Ok(ClassExpression::ObjectHasValue { ope, i })
         }
         Rule::ObjectHasSelfRestriction => {
             let mut pairs = inner.into_inner();
@@ -1132,7 +1135,21 @@ impl<A: ForIRI> FromPair<A> for DataPropertyFrame<A> {
                         }
                     )
                 }
-                Rule::DataPropertyCharacteristicsClause => unimplemented!(),
+                Rule::DataPropertyCharacteristicsClause => {
+                    annotated_axiom!(
+                        pair,
+                        inner,
+                        ctx,
+                        frame,
+                        axiom = {
+                            let dp = frame.entity.clone();
+                            match descend(pair).as_rule() {
+                                Rule::FunctionalCharacteristic => FunctionalDataProperty(dp).into(),
+                                rule => unexpected_rule!(ObjectPropertyFrame, rule),
+                            }
+                        }
+                    )
+                }
                 Rule::DataPropertySubPropertyOfClause => {
                     annotated_axiom!(
                         pair,