Changeset 11863

Timestamp:

02.07.2009 12:38:31 (9 months ago)

Author:

maeder

Message:

removed SuperPropertyOf? construct

Files:

• trunk/OWL/Parse.hs (modified) (3 diffs)

trunk/OWL/Parse.hs

@@ -585 +585 @@
 objPropExprAList = sepByComma $ optAnnos objectPropertyExpr
 
-subPropertyKey :: CharParser st Bool
-subPropertyKey = (pkeyword subPropertyOfC >> return True)
-   <|> (pkeyword superPropertyOfC >> return False)  -- sugar
+subPropertyKey :: CharParser st ()
+subPropertyKey = pkeyword subPropertyOfC
 
 characterKey :: CharParser st ()
@@ -606 +605 @@
       $ ObjectPropertyCharacter c opExp) ds
   <|> do
-    b <- subPropertyKey
+    subPropertyKey
     ds <- objPropExprAList
     return $ map (\ (as, s) -> PlainAxiom as
-      $ if b then SubObjectPropertyOf (OPExpression s) opExp
-        else SubObjectPropertyOf (OPExpression opExp) s) ds
+      $ SubObjectPropertyOf (OPExpression s) opExp) ds
   <|> do
     e <- equivOrDisjoint
@@ -659 +657 @@
     return [PlainAxiom as $ FunctionalDataProperty duri]
   <|> do
-    b <- subPropertyKey
+    subPropertyKey
     ds <- dataPropExprAList
-    return $ map (\ (as, s) -> PlainAxiom as $
-      if b then SubDataPropertyOf s duri
-      else SubDataPropertyOf duri s) ds
+    return $ map (\ (as, s) -> PlainAxiom as $ SubDataPropertyOf s duri) ds
   <|> do
     e <- equivOrDisjoint