[DL-Learner SVN] SF.net SVN: dl-learner:[3718] trunk/components-ext/src/main/java/org/ dllearner/algorithm/tbsl/sem

[<chr...@us...>]

Revision: 3718
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3718&view=rev
Author:   christinaunger
Date:     2012-05-18 08:19:44 +0000 (Fri, 18 May 2012)
Log Message:
-----------
[tbsl] me vs javacc (part 2718)

Modified Paths:
--------------
    trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/drs/reader/DRSParser.jj
    trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/drs/reader/DRSParserTokenManager.java
    trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/dudes/reader/DUDE_Parser.jj
    trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/dudes/reader/DUDE_ParserTokenManager.java

Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/drs/reader/DRSParser.jj
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/drs/reader/DRSParser.jj	2012-05-17 09:35:54 UTC (rev 3717)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/drs/reader/DRSParser.jj	2012-05-18 08:19:44 UTC (rev 3718)
@@ -249,7 +249,7 @@
 //TOKEN: {<WORD: (["a"-"z","A"-"Z","_",".","#",":"])+>}
 //TOKEN: {<DR: (["?","!"])?(["a"-"z","A"-"Z","0"-"9","."])+>}
 
-TOKEN: {<A: (["a"-"z","A"-"Z","0"-"9"])+>}
+TOKEN: {<A: (["a"-"z","A"-"Z","0"-"9","'"])+>}
 TOKEN: {<B: (["a"-"z","A"-"Z","_",".","#","0"-"9"])+":"(["a"-"z","A"-"Z","_",".","#","0"-"9"])+>} // oder eher: SLOT_([...])+
 TOKEN: {<C: ["?","!"](["a"-"z","A"-"Z","0"-"9"])+>}
 

Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/drs/reader/DRSParserTokenManager.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/drs/reader/DRSParserTokenManager.java	2012-05-17 09:35:54 UTC (rev 3717)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/drs/reader/DRSParserTokenManager.java	2012-05-18 08:19:44 UTC (rev 3718)
@@ -364,7 +364,7 @@
                      jjCheckNAddTwoStates(3, 4);
                   else if (curChar == 58)
                      jjCheckNAdd(5);
-                  if ((0x3ff000000000000L & l) != 0L)
+                  if ((0x3ff008000000000L & l) != 0L)
                   {
                      if (kind > 20)
                         kind = 20;
@@ -378,7 +378,7 @@
                      jjCheckNAdd(9);
                   else if ((0x8000000200000000L & l) != 0L)
                      jjCheckNAdd(7);
-                  if ((0x3ff000000000000L & l) != 0L)
+                  if ((0x3ff008000000000L & l) != 0L)
                   {
                      if (kind > 20)
                         kind = 20;
@@ -393,7 +393,7 @@
                   jjstateSet[jjnewStateCnt++] = 1;
                   break;
                case 2:
-                  if ((0x3ff000000000000L & l) == 0L)
+                  if ((0x3ff008000000000L & l) == 0L)
                      break;
                   if (kind > 20)
                      kind = 20;

Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/dudes/reader/DUDE_Parser.jj
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/dudes/reader/DUDE_Parser.jj	2012-05-17 09:35:54 UTC (rev 3717)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/dudes/reader/DUDE_Parser.jj	2012-05-18 08:19:44 UTC (rev 3718)
@@ -342,7 +342,7 @@
     
     |
    
-    dr1 = dr() "=" dr2 = dr() 
+    dr1 = dr() "=" dr2 = dr()
     {	
         Simple_DRS_Condition condition;
 
@@ -501,7 +501,7 @@
 //TOKEN: {<WORD: (["a"-"z","A"-"Z","_",".","#",":","0"-"9"])+>}
 //TOKEN: {<DR: (["?","!"])?(["a"-"z","A"-"Z","0"-"9","."])+>}
 
-TOKEN: {<A: (["a"-"z","A"-"Z","0"-"9"])+>}
+TOKEN: {<A: (["a"-"z","A"-"Z","0"-"9","'"])+>}
 TOKEN: {<B: (["a"-"z","A"-"Z","_",".","#","0"-"9"])+":"(["a"-"z","A"-"Z","_",".","#","0"-"9"])+>} // oder eher: SLOT_([...])+
 TOKEN: {<C: ["?","!"](["a"-"z","A"-"Z","0"-"9"])+>}
 

Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/dudes/reader/DUDE_ParserTokenManager.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/dudes/reader/DUDE_ParserTokenManager.java	2012-05-17 09:35:54 UTC (rev 3717)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/dudes/reader/DUDE_ParserTokenManager.java	2012-05-18 08:19:44 UTC (rev 3718)
@@ -403,7 +403,7 @@
                      jjCheckNAddTwoStates(3, 4);
                   else if (curChar == 58)
                      jjCheckNAdd(5);
-                  if ((0x3ff000000000000L & l) != 0L)
+                  if ((0x3ff008000000000L & l) != 0L)
                   {
                      if (kind > 26)
                         kind = 26;
@@ -417,7 +417,7 @@
                      jjCheckNAdd(9);
                   else if ((0x8000000200000000L & l) != 0L)
                      jjCheckNAdd(7);
-                  if ((0x3ff000000000000L & l) != 0L)
+                  if ((0x3ff008000000000L & l) != 0L)
                   {
                      if (kind > 26)
                         kind = 26;
@@ -432,7 +432,7 @@
                   jjstateSet[jjnewStateCnt++] = 1;
                   break;
                case 2:
-                  if ((0x3ff000000000000L & l) == 0L)
+                  if ((0x3ff008000000000L & l) == 0L)
                      break;
                   if (kind > 26)
                      kind = 26;

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