Commit b7465562 authored by Anders Nilsson's avatar Anders Nilsson
Browse files

Some more fixes for new RoSta ontology. VERY Q&D, should create more flexible... 

Some more fixes for new RoSta ontology. VERY Q&D, should create more flexible parser asap, maybe using the one from X3D compiler?
parent c314fd21

CompilerGeneration.jrag

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ aspect AbsGrammarGeneration { 
		pStream.println("XmlnsDaml : Attribute ::= ;");

		pStream.println("XmlnsP1 : Attribute ::= ;");

		pStream.println("XmlnsDc : Attribute ::= ;");

		pStream.println("XmlnsExpr : Attribute ::= ;");

		pStream.println("XmlnsList : Attribute ::= ;");

		pStream.println("XmlBase : Attribute ::= ;");

		pStream.println("RdfResource : Attribute ::= ;");

		pStream.println("RdfAbout : Attribute ::= ;");

owl.ast

+6 −6
Original line number Diff line number Diff line
@@ -14,10 +14,10 @@ XmlHeader ::= Attribute*; 


abstract Element;

abstract ComplexElement : Element ::= Attribute* Element*;

J0First : ComplexElement;

J0Rest : ComplexElement;

J1KIFCondition : ComplexElement;

J1ExpressionData : ComplexElement;

ListFirst : ComplexElement;

ListRest : ComplexElement;

ExprKIFCondition : ComplexElement;

ExprExpressionData : ComplexElement;

RdfDeclaration : ComplexElement;

RdfDescription : ComplexElement;

RdfFirst : ComplexElement;
@@ -89,8 +89,8 @@ XmlBase : Attribute; 
Xmlns : Attribute;

XmlnsDaml : Attribute;

XmlnsDc : Attribute;

XmlnsJ0 : Attribute;

XmlnsJ1 : Attribute;

XmlnsExpr : Attribute;

XmlnsList : Attribute;

XmlnsOwl : Attribute;

XmlnsP1 : Attribute;

XmlnsProtege : Attribute;

owl.jjt

+28 −28
Original line number Diff line number Diff line
@@ -66,10 +66,10 @@ SPECIAL_TOKEN : /* COMMENTS */ 


<DEFAULT, BOUNDS> TOKEN : /* RESERVED WORDS AND LITERALS */

{

    < J0_FIRST              : "j.0:first" >

  | < J0_REST               : "j.0:rest" >

  | < J1_KIFCONDITION       : "j.1:KIF-Condition" >

  | < J1_EXPRESSIONDATA     : "j.1:expressionData" >

    < LIST_FIRST              : "list:first" >

  | < LIST_REST               : "list:rest" >

  | < EXPR_KIFCONDITION       : "expr:KIF-Condition" >

  | < EXPR_EXPRESSIONDATA     : "expr:expressionData" >

  | < OWL_ALLVALUESFROM     : "owl:allValuesFrom" >

  | < OWL_ALLDIFFERENT      : "owl:AllDifferent" >

  | < OWL_CARDINALITY        : "owl:cardinality" >
@@ -135,8 +135,8 @@ SPECIAL_TOKEN : /* COMMENTS */ 
  | < XMLNS                 : "xmlns" >	 

  | < XMLNS_DAML            : "xmlns:daml" >	 

  | < XMLNS_DC              : "xmlns:dc" >	 

  | < XMLNS_J0              : "xmlns:j.0" >	 

  | < XMLNS_J1              : "xmlns:j.1" >	 

  | < XMLNS_EXPR              : "xmlns:expr" >	 

  | < XMLNS_LIST              : "xmlns:list" >	 

  | < XMLNS_P1              : "xmlns:p1" >	 

  | < XMLNS_OWL             : "xmlns:owl" >	 

  | < XMLNS_PROTEGE         : "xmlns:protege" >
@@ -440,36 +440,36 @@ String getData() { 


void JElement(): {}

{

	J0First()

	| J0Rest()

	| J1KIFCondition()

	| J1ExpressionData()

	ListFirst()

	| ListRest()

	| ExprKIFCondition()

	| ExprExpressionData()

}



void J0First() #J0First : {}

void ListFirst() #ListFirst : {}

{

    <J0_FIRST> AttributeList() 

	(">" ElementList() "</" <J0_FIRST> ">" | ElementList() "/>")

    <LIST_FIRST> AttributeList() 

	(">" ElementList() "</" <LIST_FIRST> ">" | ElementList() "/>")

}



void J0Rest() #J0Rest : {}

void ListRest() #ListRest : {}

{

    <J0_REST> AttributeList() 

	(">" ElementList() "</" <J0_REST> ">" | ElementList() "/>")

    <LIST_REST> AttributeList() 

	(">" ElementList() "</" <LIST_REST> ">" | ElementList() "/>")

}





void J1KIFCondition() #J1KIFCondition : {}

void ExprKIFCondition() #ExprKIFCondition : {}

{

    <J1_KIFCONDITION> AttributeList() 

	(">" ElementList() "</" <J1_KIFCONDITION> ">" | ElementList() "/>")

    <EXPR_KIFCONDITION> AttributeList() 

	(">" ElementList() "</" <EXPR_KIFCONDITION> ">" | ElementList() "/>")

}





void J1ExpressionData() #J1ExpressionData : {}

void ExprExpressionData() #ExprExpressionData : {}

{

    <J1_EXPRESSIONDATA> AttributeList() 

	(">" ElementList() "</" <J1_EXPRESSIONDATA> ">" | ElementList() "/>")

    <EXPR_EXPRESSIONDATA> AttributeList() 

	(">" ElementList() "</" <EXPR_EXPRESSIONDATA> ">" | ElementList() "/>")

}



void OwlElement() : {}
@@ -923,8 +923,8 @@ void XmlnsAttribute() : {} 
    Xmlns()

	| XmlnsDaml()

	| XmlnsDc()

	| XmlnsJ0()

	| XmlnsJ1()

	| XmlnsExpr()

	| XmlnsList()

	| XmlnsOwl()

	| XmlnsP1()

	| XmlnsProtege()
@@ -951,14 +951,14 @@ void XmlnsDc() #XmlnsDc : {} 
    <XMLNS_DC> <ASSIGN> Value()

}



void XmlnsJ0() #XmlnsJ0 : {}

void XmlnsExpr() #XmlnsExpr : {}

{

    <XMLNS_J0> <ASSIGN> Value()

    <XMLNS_EXPR> <ASSIGN> Value()

}



void XmlnsJ1() #XmlnsJ1 : {}

void XmlnsList() #XmlnsList : {}

{

    <XMLNS_J1> <ASSIGN> Value()

    <XMLNS_LIST> <ASSIGN> Value()

}



void XmlnsP1() #XmlnsP1 : {}