diff --git a/siaras/Siaras.jjt b/siaras/Siaras.jjt
index 3ba07eccbfb4021871fe3b2677c9b5ba2e34313b..043521061e33949f39454b46c224604cb413e90e 100644
--- a/siaras/Siaras.jjt
+++ b/siaras/Siaras.jjt
@@ -6,9 +6,9 @@ options {
NODE_PREFIX = "";
JAVA_UNICODE_ESCAPE = true;
STATIC = false;
- DEBUG_PARSER = true;
- DEBUG_LOOKAHEAD = true;
- DEBUG_TOKEN_MANAGER = true;
+// DEBUG_PARSER = true;
+// DEBUG_LOOKAHEAD = true;
+// DEBUG_TOKEN_MANAGER = true;
} // options
@@ -105,7 +105,7 @@ SPECIAL_TOKEN : /* COMMENTS */
| < XMLNS_RDFS : "xmlns:rdfs" >
| < XMLNS_OWL : "xmlns:owl" >
-// | < VacuumGripper : "VacuumGripper" >
+// | < VacuumGripper : "VacuumGripper" >
}// RESERVED WORDS AND LITERALS
<DEFAULT, BOUNDS> TOKEN : /* LITERALS */
@@ -215,7 +215,7 @@ SPECIAL_TOKEN : /* COMMENTS */
"\u1040"-"\u1049"
]
>
-}// IDENTIFIERS
+}//IDENTIFIERS
<DEFAULT,BOUNDS> TOKEN : /* SEPARATORS */
{
@@ -234,8 +234,8 @@ SPECIAL_TOKEN : /* COMMENTS */
<DEFAULT,BOUNDS> TOKEN : /* OPERATORS */
{
< ASSIGN : "=" >
-// | < GT : ">" >
-// | < LT : "<" >
+ | < GT : ">" >
+ | < LT : "<" >
// | < BANG : "!" >
// | < TILDE : "~" >
// | < HOOK : "?" >
@@ -285,11 +285,11 @@ SPECIAL_TOKEN : /* COMMENTS */
Start Start() #Start : {}
{
-// ("<?xml version=\"1.0\"?>")?
-// ComplexElement()
- "<" Identifier() ">" "</" Identifier() ">"
+ ("<?xml version=\"1.0\"?>")?
+ ComplexElement()
{ return jjtThis; }
}
+// "<" Identifier() ">" "</" Identifier() ">"
// void Specification() #Specification : {}
// {
@@ -319,12 +319,12 @@ void AttributeList() #List : {}
(Attribute())*
}
-void ComplexElement() #ComplexElement : {} //{Token t;}
+void ComplexElement() #ComplexElement : {}
{
"<" Identifier() ">" "</" Identifier() ">"
+}
// (">" ElementList() "</" <IDENTIFIER> ">" | ElementList() "/>")
// {jjtThis.setIDENTIFIER(t.image);}
-}
void Identifier() #OwlIdentifier : {Token t;}
{
diff --git a/siaras/SiarasPrettyPrinter.java b/siaras/SiarasPrettyPrinter.java
index 1e612cf83facf59c5c84cd3d762bb78fb6303624..e13b38d2740c4ada8238105a04145c8c4975204a 100644
--- a/siaras/SiarasPrettyPrinter.java
+++ b/siaras/SiarasPrettyPrinter.java
@@ -9,7 +9,7 @@ public class SiarasPrettyPrinter extends Parser {
Start ast = parse(args);
// Dump the AST
-// ast.dumpTree(" ", System.out);
+ ast.dumpTree(" ", System.out);
// File siarasDir = new File("siaras");
diff --git a/testontologies/ontologyV07_instances.owl b/testontologies/ontologyV07_instances.owl
index eeb2314c515d01af99afb231d23d8572eef8f565..3a914e3d67e4bf5933672ca62b405421cd2e6046 100644
--- a/testontologies/ontologyV07_instances.owl
+++ b/testontologies/ontologyV07_instances.owl
@@ -1,91 +1,89 @@
-<VacuumGripper>
-</VacuumGripper>
-<!-- <VacuumGripper rdf:ID="Schmalz_FSGA_20_SI-55_M5-AG"> -->
-<!-- <hasSkill>
-->
-<!-- <AdjustVacuumToGrip rdf:ID="AdjustVacuumToGrip_16">
-->
-<!-- <isSkillOf>
-->
-<!-- <VacuumGripper rdf:ID="Schmalz_FSGPL_200_NBR-55_G1-2-IG">
-->
-<!-- <hasProperty>
-->
-<!-- <DiameterOfGripper rdf:ID="DiameterOfGripper_200">
-->
-<!-- <value rdf:datatype="http://www.w3.org/2001/XMLSchema#float"
-->
-<!-- >0.0</value>
-->
-<!-- <isPropertyOf rdf:resource="#Schmalz_FSGPL_200_NBR-55_G1-2-IG"/>
-->
-<!-- </DiameterOfGripper>
-->
-<!-- </hasProperty>
-->
-<!-- <hasSkill rdf:resource="#AdjustVacuumToGrip_16"/>
-->
-<!-- <hasProperty>
-->
-<!-- <Material rdf:ID="Material_Perbunan">
-->
-<!-- <isPropertyOf rdf:resource="#Schmalz_FSGPL_200_NBR-55_G1-2-IG"/>
-->
-<!-- <value rdf:datatype="http://www.w3.org/2001/XMLSchema#string"
-->
-<!-- >Perbunan NBR 55+-5</value>
-->
-<!-- </Material>
-->
-<!-- </hasProperty>
-->
-<!-- <hasProperty>
-->
-<!-- <MaximumForce rdf:ID="MaximumForce_850">
-->
-<!-- <value rdf:datatype="http://www.w3.org/2001/XMLSchema#float"
-->
-<!-- >0.0</value>
-->
-<!-- <isPropertyOf rdf:resource="#Schmalz_FSGPL_200_NBR-55_G1-2-IG"/>
-->
-<!-- </MaximumForce>
-->
-<!-- </hasProperty>
-->
-<!-- <hasProperty>
-->
-<!-- <Worm rdf:ID="Worm_22">
-->
-<!-- <isPropertyOf rdf:resource="#Schmalz_FSGPL_200_NBR-55_G1-2-IG"/>
-->
-<!-- <value rdf:datatype="http://www.w3.org/2001/XMLSchema#string"
-->
-<!-- >Inside</value>
-->
-<!-- </Worm>
-->
-<!-- </hasProperty>
-->
-<!-- <hasProperty>
-->
-<!-- <WormDiameter rdf:ID="WormDiameter_G1-2">
-->
-<!-- <isPropertyOf rdf:resource="#Schmalz_FSGPL_200_NBR-55_G1-2-IG"/>
-->
-<!-- <value rdf:datatype="http://www.w3.org/2001/XMLSchema#string"
-->
-<!-- >G1/2</value>
-->
-<!-- </WormDiameter>
-->
-<!-- </hasProperty>
-->
-<!-- <hasSkill>
-->
-<!-- <AdjustVacuumToRelease rdf:ID="AdjustVacuumToRelease_1">
-->
-<!-- <isSkillOf rdf:resource="#Schmalz_FSGA_20_SI-55_M5-AG"/>
-->
-<!-- <isSkillOf rdf:resource="#Schmalz_FSGPL_200_NBR-55_G1-2-IG"/>
-->
-<!-- </AdjustVacuumToRelease>
-->
-<!-- </hasSkill>
-->
-<!-- </VacuumGripper>
-->
-<!-- </isSkillOf>
-->
-<!-- <isSkillOf rdf:resource="#Schmalz_FSGA_20_SI-55_M5-AG"/>
-->
-<!-- </AdjustVacuumToGrip>
-->
-<!-- </hasSkill>
-->
-<!-- <hasProperty>
-->
-<!-- <WormDiameter rdf:ID="WormDiameter_M5">
-->
-<!-- <value rdf:datatype="http://www.w3.org/2001/XMLSchema#string"
-->
-<!-- >M5</value>
-->
-<!-- <isPropertyOf rdf:resource="#Schmalz_FSGA_20_SI-55_M5-AG"/>
-->
-<!-- </WormDiameter>
-->
-<!-- </hasProperty>
-->
-<!-- <hasProperty>
-->
-<!-- <DiameterOfGripper rdf:ID="DiameterOfGripper_20">
-->
-<!-- <value rdf:datatype="http://www.w3.org/2001/XMLSchema#float"
-->
-<!-- >0.0</value>
-->
-<!-- <isPropertyOf rdf:resource="#Schmalz_FSGA_20_SI-55_M5-AG"/>
-->
-<!-- </DiameterOfGripper>
-->
-<!-- </hasProperty>
-->
-<!-- <hasProperty>
-->
-<!-- <Material rdf:ID="Material_Silikon">
-->
-<!-- <isPropertyOf rdf:resource="#Schmalz_FSGA_20_SI-55_M5-AG"/>
-->
-<!-- <value rdf:datatype="http://www.w3.org/2001/XMLSchema#string"
-->
-<!-- >Silikon SI 55+-5</value>
-->
-<!-- </Material>
-->
-<!-- </hasProperty>
-->
-<!-- <hasProperty>
-->
-<!-- <Worm rdf:ID="Worm_13">
-->
-<!-- <value rdf:datatype="http://www.w3.org/2001/XMLSchema#string"
-->
-<!-- >Outside</value>
-->
-<!-- <isPropertyOf rdf:resource="#Schmalz_FSGA_20_SI-55_M5-AG"/>
-->
-<!-- </Worm>
-->
-<!-- </hasProperty>
-->
-<!-- <hasSkill rdf:resource="#AdjustVacuumToRelease_1"/>
-->
-<!-- <hasProperty>
-->
-<!-- <MaximumForce rdf:ID="MaximumForce_4.7">
-->
-<!-- <isPropertyOf rdf:resource="#Schmalz_FSGA_20_SI-55_M5-AG"/>
-->
-<!-- <value rdf:datatype="http://www.w3.org/2001/XMLSchema#float"
-->
-<!-- >0.0</value>
-->
-<!-- </MaximumForce>
-->
-<!-- </hasProperty>
-->
-<!-- </VacuumGripper> -->
+<VacuumGripper rdf:ID="Schmalz_FSGA_20_SI-55_M5-AG">
+ <hasSkill>
+ <AdjustVacuumToGrip rdf:ID="AdjustVacuumToGrip_16">
+ <isSkillOf>
+ <VacuumGripper rdf:ID="Schmalz_FSGPL_200_NBR-55_G1-2-IG">
+ <hasProperty>
+ <DiameterOfGripper rdf:ID="DiameterOfGripper_200">
+ <value rdf:datatype="http://www.w3.org/2001/XMLSchema#float"
+ >0.0</value>
+ <isPropertyOf rdf:resource="#Schmalz_FSGPL_200_NBR-55_G1-2-IG"/>
+ </DiameterOfGripper>
+ </hasProperty>
+ <hasSkill rdf:resource="#AdjustVacuumToGrip_16"/>
+ <hasProperty>
+ <Material rdf:ID="Material_Perbunan">
+ <isPropertyOf rdf:resource="#Schmalz_FSGPL_200_NBR-55_G1-2-IG"/>
+ <value rdf:datatype="http://www.w3.org/2001/XMLSchema#string"
+ >Perbunan NBR 55+-5</value>
+ </Material>
+ </hasProperty>
+ <hasProperty>
+ <MaximumForce rdf:ID="MaximumForce_850">
+ <value rdf:datatype="http://www.w3.org/2001/XMLSchema#float"
+ >0.0</value>
+ <isPropertyOf rdf:resource="#Schmalz_FSGPL_200_NBR-55_G1-2-IG"/>
+ </MaximumForce>
+ </hasProperty>
+ <hasProperty>
+ <Worm rdf:ID="Worm_22">
+ <isPropertyOf rdf:resource="#Schmalz_FSGPL_200_NBR-55_G1-2-IG"/>
+ <value rdf:datatype="http://www.w3.org/2001/XMLSchema#string"
+ >Inside</value>
+ </Worm>
+ </hasProperty>
+ <hasProperty>
+ <WormDiameter rdf:ID="WormDiameter_G1-2">
+ <isPropertyOf rdf:resource="#Schmalz_FSGPL_200_NBR-55_G1-2-IG"/>
+ <value rdf:datatype="http://www.w3.org/2001/XMLSchema#string"
+ >G1/2</value>
+ </WormDiameter>
+ </hasProperty>
+ <hasSkill>
+ <AdjustVacuumToRelease rdf:ID="AdjustVacuumToRelease_1">
+ <isSkillOf rdf:resource="#Schmalz_FSGA_20_SI-55_M5-AG"/>
+ <isSkillOf rdf:resource="#Schmalz_FSGPL_200_NBR-55_G1-2-IG"/>
+ </AdjustVacuumToRelease>
+ </hasSkill>
+ </VacuumGripper>
+ </isSkillOf>
+ <isSkillOf rdf:resource="#Schmalz_FSGA_20_SI-55_M5-AG"/>
+ </AdjustVacuumToGrip>
+ </hasSkill>
+ <hasProperty>
+ <WormDiameter rdf:ID="WormDiameter_M5">
+ <value rdf:datatype="http://www.w3.org/2001/XMLSchema#string"
+ >M5</value>
+ <isPropertyOf rdf:resource="#Schmalz_FSGA_20_SI-55_M5-AG"/>
+ </WormDiameter>
+ </hasProperty>
+ <hasProperty>
+ <DiameterOfGripper rdf:ID="DiameterOfGripper_20">
+ <value rdf:datatype="http://www.w3.org/2001/XMLSchema#float"
+ >0.0</value>
+ <isPropertyOf rdf:resource="#Schmalz_FSGA_20_SI-55_M5-AG"/>
+ </DiameterOfGripper>
+ </hasProperty>
+ <hasProperty>
+ <Material rdf:ID="Material_Silikon">
+ <isPropertyOf rdf:resource="#Schmalz_FSGA_20_SI-55_M5-AG"/>
+ <value rdf:datatype="http://www.w3.org/2001/XMLSchema#string"
+ >Silikon SI 55+-5</value>
+ </Material>
+ </hasProperty>
+ <hasProperty>
+ <Worm rdf:ID="Worm_13">
+ <value rdf:datatype="http://www.w3.org/2001/XMLSchema#string"
+ >Outside</value>
+ <isPropertyOf rdf:resource="#Schmalz_FSGA_20_SI-55_M5-AG"/>
+ </Worm>
+ </hasProperty>
+ <hasSkill rdf:resource="#AdjustVacuumToRelease_1"/>
+ <hasProperty>
+ <MaximumForce rdf:ID="MaximumForce_4.7">
+ <isPropertyOf rdf:resource="#Schmalz_FSGA_20_SI-55_M5-AG"/>
+ <value rdf:datatype="http://www.w3.org/2001/XMLSchema#float"
+ >0.0</value>
+ </MaximumForce>
+ </hasProperty>
+ </VacuumGripper>
diff --git a/testontologies/phony_instances.owl b/testontologies/phony_instances.owl
index 5fd046f0956cedee1ff9f44c1e99cd851843b0a1..d35b67c6b01b311bb6cc5d7a4a1339f23a3c209b 100644
--- a/testontologies/phony_instances.owl
+++ b/testontologies/phony_instances.owl
@@ -1,2 +1,3 @@
<VacuumGripper>
</VacuumGripper>
+