Remove duplicates, declare operators

Author: afs

sparql-ns.ttl

@@ -20,79 +20,69 @@ sparql:Aggregate rdf:type rdfs:Class .
 
 ## Operators
 
-sparql:plus rdf:type sparql:Operator ;
+sparql:plus rdf:type sparql:Function, sparql:Operator ;
     rdfs:comment "This operator adds two numeric expressions and returns their sum." ;
     rdfs:isDefinedBy  ;
     .
 
-sparql:subtract rdf:type sparql:Operator ;
+sparql:subtract rdf:type sparql:Function, sparql:Operator ;
     rdfs:comment "This operator subtracts the second numeric expression from the first and returns the result." ;
     rdfs:isDefinedBy  ;
     .
 
-sparql:multiply rdf:type sparql:Operator ;
+sparql:multiply rdf:type sparql:Function, sparql:Operator ;
     rdfs:comment "This operator multiplies two numeric expressions and returns the product." ;
     rdfs:isDefinedBy  ;
     .
 
-sparql:divide rdf:type sparql:Operator ;
+sparql:divide rdf:type sparql:Function, sparql:Operator ;
     rdfs:comment "This operator divides the first numeric expression by the second and returns the result." ;
     rdfs:isDefinedBy  ;
     .
 
-sparql:unary-minus rdf:type sparql:Operator ;
+sparql:unary-minus rdf:type sparql:Function, sparql:Operator ;
     rdfs:comment "This unary operator returns the negation of a numeric expression." ;
     rdfs:isDefinedBy  ;
     .
 
-sparql:unary-plus rdf:type sparql:Operator ;
+sparql:unary-plus rdf:type sparql:Function, sparql:Operator ;
     rdfs:comment "This unary operator returns the numeric expression unchanged, acting primarily as a syntactic indicator." ;
     rdfs:isDefinedBy  ;
     .
 
-sparql:equals rdf:type sparql:Operator ;
+sparql:equals rdf:type sparql:Function, sparql:Operator ;
     rdfs:comment "This operator compares two expressions for equality.";
     rdfs:isDefinedBy  ;
     .
 
-sparql:not-equals rdf:type sparql:Operator ;
+sparql:not-equals rdf:type sparql:Function, sparql:Operator ;
     rdfs:comment "This operator tests two expressions for inequality.";
     rdfs:isDefinedBy  ;
     .
 
-sparql:greaterThan rdf:type sparql:Operator ;
+sparql:greaterThan rdf:type sparql:Function, sparql:Operator ;
     rdfs:comment "This operator tests whether the first RDF term is greater than the second RDF term.";
     rdfs:isDefinedBy  ;
     .
 
-sparql:lessThan rdf:type sparql:Operator ;
+sparql:lessThan rdf:type sparql:Function, sparql:Operator ;
     rdfs:comment "This operator tests whether the first RDF term is less than the second RDF term.";
     rdfs:isDefinedBy  ;
     .
 
-sparql:greaterThanOrEqual rdf:type sparql:Operator ;
+sparql:greaterThanOrEqual rdf:type sparql:Function, sparql:Operator ;
     rdfs:comment "This operator tests whether the first RDF term is greater or equal to the second RDF term.";
     rdfs:isDefinedBy  ;
     .
 
-sparql:lessThanOrEqual rdf:type sparql:Operator ;
+sparql:lessThanOrEqual rdf:type sparql:Function, sparql:Operator ;
     rdfs:comment "This operator tests whether the first RDF term is less than or equal to the second RDF term.";
     rdfs:isDefinedBy  ;
     .
-
-sparql:operator-and rdf:type sparql:Operator ;
-    rdfs:comment "This operator calculates the logical 'and' of two RDF terms" ;
-    rdfs:isDefinedBy  ;
-    .
-
-sparql:operator-or rdf:type sparql:Operator ;
-    rdfs:comment "This operator calculates the logical 'or' of two RDF terms" ;
-    rdfs:isDefinedBy  ;
-    .
-
-sparql:operator-not rdf:type sparql:Operator ;
-    rdfs:comment "This operator calculates the logical 'not' of two RDF terms" ;
-    rdfs:isDefinedBy  ;
+    
+sparql:logical-not rdf:type sparql:Functional, sparql:Operator ;
+    rdfs:comment "This form computes the logical NOT of a boolean expression." ;
+    rdfs:isDefinedBy  ;
     .
 
 # Section: Functional Forms
@@ -122,12 +112,12 @@ sparql:filter-not-exists rdf:type sparql:FunctionalForm ;
     rdfs:isDefinedBy  ;
     .
 
-sparql:logical-or rdf:type sparql:FunctionalForm ;
+sparql:logical-or rdf:type sparql:FunctionalForm, sparql:Operator ;
     rdfs:comment "This form computes the logical OR of two boolean expressions." ;
     rdfs:isDefinedBy  ;
     .
 
-sparql:logical-and rdf:type sparql:FunctionalForm ;
+sparql:logical-and rdf:type sparql:FunctionalForm, sparql:Operator ;
     rdfs:comment "This form computes the logical AND of two boolean expressions." ;
     rdfs:isDefinedBy  ;
     .