Commit 03cfb563 authored by Anders Nilsson's avatar Anders Nilsson
Browse files

Some fixes to be able to parse full v08a.owl. Still crashes though

parent cd2d4ee6
......@@ -10,3 +10,5 @@ siaras/Siaras.ast
siaras/log.tmp
*Jambalaya.properties
siaras/GeneratedAspects.jrag
testontologies/*.xmi
testontologies/*.pprj
......@@ -213,6 +213,7 @@ aspect GenRewrites {
public void OwlClassDecl.genRewrites(PrintStream pStream) {
String ind = " ";
int ix = 0;
// Specialize ComplexElements to the actual class in the ontology
pStream.println(ind(1)+"rewrite ComplexElement {");
pStream.println(ind(2)+"when (getOwlIdentifier().getIDENTIFIER().equals(\""+
name()+"\") && !(this instanceof Thing))");
......@@ -250,6 +251,8 @@ aspect GenRewrites {
pStream.println(ind(3)+"return node;");
pStream.println(ind(2)+"}");
pStream.println(ind(1)+"}");
// Rearrange device nodes on the AST to get away from the
// current diagonal style from Protege
}
}
......
......@@ -175,7 +175,7 @@ SPECIAL_TOKEN : /* COMMENTS */
<DEFAULT, BOUNDS> TOKEN : /* IDENTIFIERS */
{
< IDENTIFIER: <LETTER> (<LETTER>|<DIGIT>)* >
< IDENTIFIER: <LETTER> (<LETTER>|<DIGIT>|":")* >
|
< #LETTER:
[
......@@ -194,7 +194,9 @@ SPECIAL_TOKEN : /* COMMENTS */
"\uf900"-"\ufaff",
"+",
"-",
"/"
"/",
",",
"."
]
>
|
......@@ -228,8 +230,8 @@ SPECIAL_TOKEN : /* COMMENTS */
| < LBRACKET : "[" >
| < RBRACKET : "]" >
| < SEMICOLON : ";" >
| < COMMA : "," >
| < DOT : "." >
// | < COMMA : "," >
// | < DOT : "." >
}// SEPARATORS
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment