From ece46d6f344538c8e9126b1b7c33819cd1353299 Mon Sep 17 00:00:00 2001
From: Anders Nilsson <andersn@fiol>
Date: Mon, 18 Sep 2006 08:43:11 +0200
Subject: [PATCH] Just synching
---
.bzrignore | 1 +
DumpClasses.jrag | 4 ++--
Types.jrag | 18 +++++++++---------
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/.bzrignore b/.bzrignore
index db4cb17..55322fa 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -3,3 +3,4 @@ parser/semantic.cache
AST
*.class
semantic.cache
+plugins
diff --git a/DumpClasses.jrag b/DumpClasses.jrag
index d973dab..d31290f 100644
--- a/DumpClasses.jrag
+++ b/DumpClasses.jrag
@@ -17,7 +17,7 @@ aspect DumpClasses {
pStream.print(getId());
pStream.print(" : "+getSuperClass().getId());
pStream.print(" ::= ");
- Properties props = getFunctionalProperties();
+ Properties props = getProperties();
for (int i=0; i<props.getNumProperty(); i++) {
pStream.print("<");
pStream.print(props.getProperty(i).getId());
@@ -28,4 +28,4 @@ aspect DumpClasses {
}
pStream.println(";");
}
-}
\ No newline at end of file
+}
diff --git a/Types.jrag b/Types.jrag
index 9dbf284..a24baa5 100644
--- a/Types.jrag
+++ b/Types.jrag
@@ -37,12 +37,12 @@ aspect Types {
return new OwlClassDecl(new List(), new List(), "_Unknown_");
}
- syn lazy Properties OwlClassDecl.getFunctionalProperties() {
+ syn lazy Properties OwlClassDecl.getProperties() {
List l = new List();
- getTopElement().collectFunctionalProperties(l);
+ getTopElement().collectObjectProperties(l);
Properties p = new Properties();
for (int i=0; i<l.getNumChild(); i++) {
- OwlFunctionalProperty op = (OwlFunctionalProperty) l.getChild(i);
+ OwlObjectProperty op = (OwlObjectProperty) l.getChild(i);
if (op.domainIncludes(this)) {
p.addProperty(op);
}
@@ -52,13 +52,13 @@ aspect Types {
}
aspect Properties {
- void ASTNode.collectFunctionalProperties(List l) {
+ void ASTNode.collectObjectProperties(List l) {
for (int i=0; i<getNumChild(); i++) {
- getChild(i).collectFunctionalProperties(l);
+ getChild(i).collectObjectProperties(l);
}
}
- void OwlFunctionalProperty.collectFunctionalProperties(List l) {
+ void OwlObjectProperty.collectObjectProperties(List l) {
l.add(this);
}
@@ -66,7 +66,7 @@ aspect Properties {
return false;
}
- boolean OwlFunctionalProperty.domainIncludes(OClass clazz) {
+ boolean OwlObjectProperty.domainIncludes(OClass clazz) {
for (int i=0; i<getNumElement(); i++) {
if (getElement(i) instanceof RdfsDomain) {
return ((RdfsDomain) getElement(i)).domainIncludes(clazz);
@@ -107,7 +107,7 @@ aspect Properties {
syn lazy RdfsRange Element.range() = null;
- eq OwlFunctionalProperty.range() {
+ eq OwlObjectProperty.range() {
for (int i=0; i<getNumElement(); i++) {
if (getElement(i) instanceof RdfsRange) {
return (RdfsRange) getElement(i);
@@ -115,4 +115,4 @@ aspect Properties {
}
return null;
}
-}
\ No newline at end of file
+}
--
GitLab