[DL-Learner SVN] SF.net SVN: dl-learner: [975] trunk/src/dl-learner/org/dllearner/parser

[<jen...@us...>]

Revision: 975
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=975&view=rev
Author:   jenslehmann
Date:     2008-06-22 04:09:36 -0700 (Sun, 22 Jun 2008)

Log Message:
-----------
parser fixes

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/parser/ConfParser.java
    trunk/src/dl-learner/org/dllearner/parser/ConfParserTokenManager.java
    trunk/src/dl-learner/org/dllearner/parser/KBParser.java
    trunk/src/dl-learner/org/dllearner/parser/conf.jj
    trunk/src/dl-learner/org/dllearner/parser/kb.jj

Modified: trunk/src/dl-learner/org/dllearner/parser/ConfParser.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/parser/ConfParser.java	2008-06-21 14:27:17 UTC (rev 974)
+++ trunk/src/dl-learner/org/dllearner/parser/ConfParser.java	2008-06-22 11:09:36 UTC (rev 975)
@@ -20,8 +20,7 @@
 import org.dllearner.Info;
 
 import org.dllearner.cli.*;
-import org.dllearner.utilities.*;
-import org.dllearner.utilities.datastructures.StringTuple;
+import org.dllearner.utilities.datastructures.*;
 
 public @SuppressWarnings("all") class ConfParser implements ConfParserConstants {
 

Modified: trunk/src/dl-learner/org/dllearner/parser/ConfParserTokenManager.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/parser/ConfParserTokenManager.java	2008-06-21 14:27:17 UTC (rev 974)
+++ trunk/src/dl-learner/org/dllearner/parser/ConfParserTokenManager.java	2008-06-22 11:09:36 UTC (rev 975)
@@ -16,7 +16,7 @@
 import java.io.StringReader;
 import org.dllearner.Info;
 import org.dllearner.cli.*;
-import org.dllearner.utilities.*;
+import org.dllearner.utilities.datastructures.*;
 
 public @SuppressWarnings("all") class ConfParserTokenManager implements ConfParserConstants
 {

Modified: trunk/src/dl-learner/org/dllearner/parser/KBParser.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/parser/KBParser.java	2008-06-21 14:27:17 UTC (rev 974)
+++ trunk/src/dl-learner/org/dllearner/parser/KBParser.java	2008-06-22 11:09:36 UTC (rev 975)
@@ -18,12 +18,6 @@
                         return internalNamespace + name;
         }
 
-        //TODO beware of this function it is evil
-        public static Description parseConcept(String string, String namespace) throws ParseException {
-        	internalNamespace = namespace;
-        	return parseConcept(string);
-        }
-        
         public static Description parseConcept(String string) throws ParseException {
                 // when just parsing the string as concept, we have no guarantee
                 // that the parser uses all symbols, e.g. a AND b returns just a
@@ -36,6 +30,12 @@
                 return eqAxiom.getConcept2();
         }
 
+        //TODO beware of this function it is evil (author: Sebastian Hellmann)
+    public static Description parseConcept(String string, String namespace) throws ParseException {
+             internalNamespace = namespace;
+              return parseConcept(string);
+    }
+
         public static KB parseKBFile(String content) throws IOException, ParseException {
                 KBParser parser = new KBParser(new StringReader(content));
                 return parser.KB();
@@ -715,15 +715,6 @@
     finally { jj_save(7, xla); }
   }
 
-  final private boolean jj_3R_14() {
-    if (jj_scan_token(19)) return true;
-    if (jj_3R_25()) return true;
-    if (jj_3R_4()) return true;
-    if (jj_scan_token(COMMAND_END)) return true;
-    if (jj_3R_2()) return true;
-    return false;
-  }
-
   final private boolean jj_3_7() {
     if (jj_scan_token(22)) return true;
     if (jj_3R_2()) return true;
@@ -992,6 +983,15 @@
     return false;
   }
 
+  final private boolean jj_3R_14() {
+    if (jj_scan_token(19)) return true;
+    if (jj_3R_25()) return true;
+    if (jj_3R_4()) return true;
+    if (jj_scan_token(COMMAND_END)) return true;
+    if (jj_3R_2()) return true;
+    return false;
+  }
+
   public KBParserTokenManager token_source;
   SimpleCharStream jj_input_stream;
   public Token token, jj_nt;

Modified: trunk/src/dl-learner/org/dllearner/parser/conf.jj
===================================================================
--- trunk/src/dl-learner/org/dllearner/parser/conf.jj	2008-06-21 14:27:17 UTC (rev 974)
+++ trunk/src/dl-learner/org/dllearner/parser/conf.jj	2008-06-22 11:09:36 UTC (rev 975)
@@ -49,7 +49,7 @@
 import org.dllearner.Info;
 
 import org.dllearner.cli.*;
-import org.dllearner.utilities.*;
+import org.dllearner.utilities.datastructures.*;
 
 public class ConfParser {
 	

Modified: trunk/src/dl-learner/org/dllearner/parser/kb.jj
===================================================================
--- trunk/src/dl-learner/org/dllearner/parser/kb.jj	2008-06-21 14:27:17 UTC (rev 974)
+++ trunk/src/dl-learner/org/dllearner/parser/kb.jj	2008-06-22 11:09:36 UTC (rev 975)
@@ -59,6 +59,12 @@
 		return eqAxiom.getConcept2();
 	}
 
+	//TODO beware of this function it is evil (author: Sebastian Hellmann)
+    public static Description parseConcept(String string, String namespace) throws ParseException {
+             internalNamespace = namespace;
+              return parseConcept(string);
+    }
+
 	public static KB parseKBFile(String content) throws IOException, ParseException {
 		KBParser parser = new KBParser(new StringReader(content));
 		return parser.KB();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.