From 2337a8e914ceae3b41d1f0d662cefb19e352ae02 Mon Sep 17 00:00:00 2001
From: Anders Nilsson <anders.nilsson@cs.lth.se>
Date: Mon, 18 Sep 2006 17:02:56 +0200
Subject: [PATCH] Synching
---
DumpClasses.jrag | 10 +++++-----
Types.jrag | 26 ++++++++++++++------------
owl.ast | 8 +++++---
3 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/DumpClasses.jrag b/DumpClasses.jrag
index d31290f..bdde281 100644
--- a/DumpClasses.jrag
+++ b/DumpClasses.jrag
@@ -19,12 +19,12 @@ aspect DumpClasses {
pStream.print(" ::= ");
Properties props = getProperties();
for (int i=0; i<props.getNumProperty(); i++) {
- pStream.print("<");
+// pStream.print("<");
pStream.print(props.getProperty(i).getId());
- pStream.print(":");
- pStream.print(props.getProperty(i).range().type());
- pStream.print(">");
- pStream.print(" ");
+// pStream.print(":");
+// pStream.print(props.getProperty(i).range().type());
+// pStream.print(">");
+// pStream.print(" ");
}
pStream.println(";");
}
diff --git a/Types.jrag b/Types.jrag
index a24baa5..8778a43 100644
--- a/Types.jrag
+++ b/Types.jrag
@@ -39,26 +39,28 @@ aspect Types {
syn lazy Properties OwlClassDecl.getProperties() {
List l = new List();
- getTopElement().collectObjectProperties(l);
- Properties p = new Properties();
- for (int i=0; i<l.getNumChild(); i++) {
- OwlObjectProperty op = (OwlObjectProperty) l.getChild(i);
- if (op.domainIncludes(this)) {
- p.addProperty(op);
- }
- }
- return p;
+// getTopElement().collectProperties(l);
+ collectProperties(l);
+ return new Properties(l);
+// Properties p = new Properties();
+// for (int i=0; i<l.getNumChild(); i++) {
+// OwlProperty op = (OwlProperty) l.getChild(i);
+// if (op.domainIncludes(this)) {
+// p.addProperty(op);
+// }
+// }
+// return p;
}
}
aspect Properties {
- void ASTNode.collectObjectProperties(List l) {
+ void ASTNode.collectProperties(List l) {
for (int i=0; i<getNumChild(); i++) {
- getChild(i).collectObjectProperties(l);
+ getChild(i).collectProperties(l);
}
}
- void OwlObjectProperty.collectObjectProperties(List l) {
+ void OwlProperty.collectProperties(List l) {
l.add(this);
}
diff --git a/owl.ast b/owl.ast
index e89e550..4b38bf3 100644
--- a/owl.ast
+++ b/owl.ast
@@ -25,14 +25,14 @@ OwlDataRange : ComplexElement;
OwlDatatypeProperty : ComplexElement;
OwlDisjointWith : ComplexElement;
OwlEquivalentClass : ComplexElement;
-OwlFunctionalProperty : ComplexElement;
+OwlFunctionalProperty : OwlProperty;
OwlImports : ComplexElement;
OwlIntersectionOf : ComplexElement;
OwlInverseOf : ComplexElement;
OwlMinCardinality : ComplexElement;
-OwlObjectProperty : ComplexElement;
+OwlObjectProperty : OwlProperty;
OwlOneOf : ComplexElement;
-OwlOnProperty : ComplexElement;
+OwlOnProperty : OwlProperty;
OwlSomeValuesFrom : ComplexElement;
OwlRestriction : ComplexElement;
OwlUnionOf : ComplexElement;
@@ -69,3 +69,5 @@ OwlClassDecl : OClass ::= <Id:String> ;
OwlClassUse : OClass ::= <Id:String> ;
Properties ::= Property:Element*;
+
+OwlProperty : ComplexElement;
--
GitLab