[DL-Learner SVN] SF.net SVN: dl-learner:[3423] trunk/interfaces/src/main/java/org/dllearner/ confparser3

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

Revision: 3423
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3423&view=rev
Author:   jenslehmann
Date:     2011-11-21 15:34:59 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------
allowed multiline strings

Modified Paths:
--------------
    trunk/interfaces/src/main/java/org/dllearner/confparser3/ConfParser.java
    trunk/interfaces/src/main/java/org/dllearner/confparser3/ConfParserTokenManager.java
    trunk/interfaces/src/main/java/org/dllearner/confparser3/conf3.jj

Modified: trunk/interfaces/src/main/java/org/dllearner/confparser3/ConfParser.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/confparser3/ConfParser.java	2011-11-21 15:12:51 UTC (rev 3422)
+++ trunk/interfaces/src/main/java/org/dllearner/confparser3/ConfParser.java	2011-11-21 15:34:59 UTC (rev 3423)
@@ -403,18 +403,6 @@
     finally { jj_save(8, xla); }
   }
 
-  private boolean jj_3_1() {
-    if (jj_3R_6()) return true;
-    if (jj_scan_token(16)) return true;
-    return false;
-  }
-
-  private boolean jj_3_7() {
-    if (jj_scan_token(18)) return true;
-    if (jj_scan_token(19)) return true;
-    return false;
-  }
-
   private boolean jj_3_3() {
     if (jj_scan_token(20)) return true;
     if (jj_3R_6()) return true;
@@ -489,6 +477,18 @@
     return false;
   }
 
+  private boolean jj_3_1() {
+    if (jj_3R_6()) return true;
+    if (jj_scan_token(16)) return true;
+    return false;
+  }
+
+  private boolean jj_3_7() {
+    if (jj_scan_token(18)) return true;
+    if (jj_scan_token(19)) return true;
+    return false;
+  }
+
   /** Generated Token Manager. */
   public ConfParserTokenManager token_source;
   SimpleCharStream jj_input_stream;

Modified: trunk/interfaces/src/main/java/org/dllearner/confparser3/ConfParserTokenManager.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/confparser3/ConfParserTokenManager.java	2011-11-21 15:12:51 UTC (rev 3422)
+++ trunk/interfaces/src/main/java/org/dllearner/confparser3/ConfParserTokenManager.java	2011-11-21 15:34:59 UTC (rev 3423)
@@ -120,7 +120,7 @@
                      jjCheckNAddTwoStates(3, 4);
                   break;
                case 3:
-                  if ((0xfffffffbffffdbffL & l) != 0L)
+                  if ((0xfffffffbffffffffL & l) != 0L)
                      jjCheckNAddTwoStates(3, 4);
                   break;
                case 4:

Modified: trunk/interfaces/src/main/java/org/dllearner/confparser3/conf3.jj
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/confparser3/conf3.jj	2011-11-21 15:12:51 UTC (rev 3422)
+++ trunk/interfaces/src/main/java/org/dllearner/confparser3/conf3.jj	2011-11-21 15:34:59 UTC (rev 3423)
@@ -114,7 +114,8 @@
   | < ID: ["a"-"z"] (["_","a"-"z","A"-"Z","0"-"9"])* >
   | < NUMBER: (["1"-"9"] (["0"-"9"])* | "0") >
   | < DOUBLE: (["1"-"9"] (["0"-"9"])* | "0") "." (["0"-"9"])* >
-  | <STRING: "\"" (~["\"","\\","\n","\r"])* "\"">
+  | < STRING: "\"" (~["\"","\\"])* "\"">
+//  | < STRING: "\"" (~["\"","\\","\n","\r"])* "\"">
 }
 
 void Start() : 

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