From 04f9a8e62c3b4d3f15c09e522c7c8e2405e890c4 Mon Sep 17 00:00:00 2001
From: Anders Nilsson <anders.nilsson@cs.lth.se>
Date: Wed, 29 Nov 2006 16:52:50 +0100
Subject: [PATCH] Synching

---
 CompilerGeneration.jrag | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/CompilerGeneration.jrag b/CompilerGeneration.jrag
index ace8c48..30968e8 100644
--- a/CompilerGeneration.jrag
+++ b/CompilerGeneration.jrag
@@ -62,10 +62,10 @@ aspect AbsGrammarGeneration {
 	}
 
     void OwlRestriction.genAbsGrammar(PrintStream pStream) {
-		pStream.print(getRestrictionClassId().substring(0,1).toLowerCase()+
-					  getRestrictionClassId().substring(1));
-		pStream.print(":");
-		pStream.print(getRestrictionClassId());
+// 		pStream.print(getRestrictionClassId().substring(0,1).toLowerCase()+
+// 					  getRestrictionClassId().substring(1));
+// 		pStream.print(":");
+		pStream.print(name());
 		if (allValuesFrom()) {
 			pStream.print("*");
 		}
@@ -177,12 +177,14 @@ aspect GenRewrites {
 		for (int i=0; i<restr.getNumOwlRestriction(); i++) {
 			OwlRestriction r = restr.getOwlRestriction(i);
 			if (r.allValuesFrom()) {
-				pStream.println(ind(3)+"node.set"+r.name().substring(0,1).toLowerCase()+
-								r.name().substring(1)+"List(new List());");
+				pStream.println(ind(3)+"node.set"+r.name()+"List(new List());");
+// 				pStream.println(ind(3)+"node.set"+r.name().substring(0,1).toLowerCase()+
+// 								r.name().substring(1)+"List(new List());");
 			} else {
 				pStream.println(ind(3)+r.name()+" c"+ix+" = new "+r.name()+"();");
-				pStream.println(ind(3)+"node.set"+r.name().substring(0,1).toLowerCase()+
-								r.name().substring(1)+"(c"+(ix++)+");");
+				pStream.println(ind(3)+"node.set"+r.name()+"(c"+(ix++)+");");
+// 				pStream.println(ind(3)+"node.set"+r.name().substring(0,1).toLowerCase()+
+// 								r.name().substring(1)+"(c"+(ix++)+");");
 			}
 		}
 		pStream.println(ind(3)+"return node;");
-- 
GitLab