From ac5cebd608d94d45c4aeb6b3a03e4a131860c781 Mon Sep 17 00:00:00 2001
From: Anders Nilsson <andersn@control.lth.se>
Date: Thu, 19 Jun 2014 11:38:24 +0200
Subject: [PATCH] Small bugfixes
---
.gitignore | 1 +
Rewrites.jrag | 5 ++++-
build.xml | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 5910731..aec448c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ GenCompiler.class
Parser.class
GenCompiler.ja
GenCompiler.jar
+OntologyCompiler.jar
diff --git a/Rewrites.jrag b/Rewrites.jrag
index 24d5f9c..3bbd2aa 100644
--- a/Rewrites.jrag
+++ b/Rewrites.jrag
@@ -30,13 +30,16 @@ aspect MiscUtilities {
syn lazy String Attribute.trim() {
String s = getValue().getSTRING_LITERAL();
- s.replaceAll("&iml;","");
+ s = s.replaceAll("-","_");
if (s.indexOf('"') == 0) {
s = s.substring(1,s.length()-1).trim();
}
if (s.indexOf('#') > -1) {
s = s.substring(s.indexOf('#')+1,s.length()).trim();
}
+ if (s.indexOf(';') > -1) {
+ s = s.substring(s.indexOf(';')+1,s.length()).trim();
+ }
return s.trim();
}
diff --git a/build.xml b/build.xml
index 5666f3a..643db5d 100644
--- a/build.xml
+++ b/build.xml
@@ -117,7 +117,7 @@
</target>
<target name="jar" depends="build">
- <jar destfile="GenCompiler.jar" basedir="." includes="**/*.class" excludes="test/**">
+ <jar destfile="OntologyCompiler.jar" basedir="." includes="**/*.class" excludes="test/**">
<manifest>
<attribute name="Main-Class" value="GenCompiler"/>
</manifest>
--
GitLab