dl-learner-svn

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

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

Revision: 3713
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3713&view=rev
Author:   christinaunger
Date:     2012-05-14 16:58:45 +0000 (Mon, 14 May 2012)
Log Message:
-----------
[tbsl] updated DRS reader

Modified Paths:
--------------
    trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/drs/reader/DRSParser.java
    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/DRSParserConstants.java
    trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/drs/reader/DRSParserTokenManager.java

Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/drs/reader/DRSParser.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/drs/reader/DRSParser.java	2012-05-14 13:24:12 UTC (rev 3712)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/drs/reader/DRSParser.java	2012-05-14 16:58:45 UTC (rev 3713)
@@ -126,7 +126,7 @@
       DRS drs1;
       DRS drs2;
     if (jj_2_15(2)) {
-      predicate = jj_consume_token(WORD);
+      predicate = word();
       jj_consume_token(6);
       dr_list = DR_List();
       jj_consume_token(7);
@@ -236,19 +236,31 @@
   final public Token dr() throws ParseException {
                Token t;
     if (jj_2_20(2)) {
-      t = jj_consume_token(WORD);
+      t = jj_consume_token(A);
     } else if (jj_2_21(2)) {
-      t = jj_consume_token(DR);
-    } else if (jj_2_22(2)) {
-      t = jj_consume_token(QUOTED_STRING);
+      t = jj_consume_token(C);
     } else {
       jj_consume_token(-1);
       throw new ParseException();
     }
-                                                                     {if (true) return t;}
+                                             {if (true) return t;}
     throw new Error("Missing return statement in function");
   }
 
+  final public Token word() throws ParseException {
+                 Token t;
+    if (jj_2_22(2)) {
+      t = jj_consume_token(A);
+    } else if (jj_2_23(2)) {
+      t = jj_consume_token(B);
+    } else {
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+                                               {if (true) return t;}
+    throw new Error("Missing return statement in function");
+  }
+
   private boolean jj_2_1(int xla) {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return !jj_3_1(); }
@@ -403,13 +415,20 @@
     finally { jj_save(21, xla); }
   }
 
+  private boolean jj_2_23(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_23(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(22, xla); }
+  }
+
   private boolean jj_3_2() {
     if (jj_3R_1()) return true;
     return false;
   }
 
   private boolean jj_3_18() {
-    if (jj_3R_4()) return true;
+    if (jj_3R_5()) return true;
     return false;
   }
 
@@ -420,13 +439,13 @@
 
   private boolean jj_3_19() {
     if (jj_scan_token(5)) return true;
-    if (jj_3R_5()) return true;
+    if (jj_3R_6()) return true;
     return false;
   }
 
   private boolean jj_3_17() {
     if (jj_scan_token(9)) return true;
-    if (jj_3R_4()) return true;
+    if (jj_3R_5()) return true;
     return false;
   }
 
@@ -436,7 +455,7 @@
   }
 
   private boolean jj_3R_2() {
-    if (jj_3R_6()) return true;
+    if (jj_3R_7()) return true;
     return false;
   }
 
@@ -445,16 +464,11 @@
     return false;
   }
 
-  private boolean jj_3R_5() {
-    if (jj_3R_3()) return true;
+  private boolean jj_3R_6() {
+    if (jj_3R_4()) return true;
     return false;
   }
 
-  private boolean jj_3_22() {
-    if (jj_scan_token(QUOTED_STRING)) return true;
-    return false;
-  }
-
   private boolean jj_3_3() {
     if (jj_3R_2()) return true;
     return false;
@@ -466,7 +480,7 @@
     return false;
   }
 
-  private boolean jj_3R_4() {
+  private boolean jj_3R_5() {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_1()) jj_scanpos = xsp;
@@ -483,7 +497,7 @@
   }
 
   private boolean jj_3_16() {
-    if (jj_3R_3()) return true;
+    if (jj_3R_4()) return true;
     if (jj_scan_token(8)) return true;
     return false;
   }
@@ -493,8 +507,13 @@
     return false;
   }
 
+  private boolean jj_3_23() {
+    if (jj_scan_token(B)) return true;
+    return false;
+  }
+
   private boolean jj_3_21() {
-    if (jj_scan_token(DR)) return true;
+    if (jj_scan_token(C)) return true;
     return false;
   }
 
@@ -509,7 +528,7 @@
     return false;
   }
 
-  private boolean jj_3R_6() {
+  private boolean jj_3R_7() {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_15()) {
@@ -525,8 +544,13 @@
     return false;
   }
 
+  private boolean jj_3_22() {
+    if (jj_scan_token(A)) return true;
+    return false;
+  }
+
   private boolean jj_3_15() {
-    if (jj_scan_token(WORD)) return true;
+    if (jj_3R_3()) return true;
     if (jj_scan_token(6)) return true;
     return false;
   }
@@ -536,37 +560,44 @@
     return false;
   }
 
+  private boolean jj_3R_3() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_22()) {
+    jj_scanpos = xsp;
+    if (jj_3_23()) return true;
+    }
+    return false;
+  }
+
   private boolean jj_3_5() {
     if (jj_scan_token(5)) return true;
     if (jj_3R_2()) return true;
     return false;
   }
 
-  private boolean jj_3_14() {
-    if (jj_scan_token(NO)) return true;
+  private boolean jj_3_20() {
+    if (jj_scan_token(A)) return true;
     return false;
   }
 
-  private boolean jj_3_20() {
-    if (jj_scan_token(WORD)) return true;
+  private boolean jj_3_14() {
+    if (jj_scan_token(NO)) return true;
     return false;
   }
 
-  private boolean jj_3R_3() {
+  private boolean jj_3R_4() {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_20()) {
     jj_scanpos = xsp;
-    if (jj_3_21()) {
-    jj_scanpos = xsp;
-    if (jj_3_22()) return true;
+    if (jj_3_21()) return true;
     }
-    }
     return false;
   }
 
   private boolean jj_3R_1() {
-    if (jj_3R_3()) return true;
+    if (jj_3R_4()) return true;
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_4()) jj_scanpos = xsp;
@@ -597,7 +628,7 @@
    private static void jj_la1_init_0() {
       jj_la1_0 = new int[] {};
    }
-  final private JJCalls[] jj_2_rtns = new JJCalls[22];
+  final private JJCalls[] jj_2_rtns = new JJCalls[23];
   private boolean jj_rescan = false;
   private int jj_gc = 0;
 
@@ -781,7 +812,7 @@
   /** Generate ParseException. */
   public ParseException generateParseException() {
     jj_expentries.clear();
-    boolean[] la1tokens = new boolean[27];
+    boolean[] la1tokens = new boolean[28];
     if (jj_kind >= 0) {
       la1tokens[jj_kind] = true;
       jj_kind = -1;
@@ -795,7 +826,7 @@
         }
       }
     }
-    for (int i = 0; i < 27; i++) {
+    for (int i = 0; i < 28; i++) {
       if (la1tokens[i]) {
         jj_expentry = new int[1];
         jj_expentry[0] = i;
@@ -822,7 +853,7 @@
 
   private void jj_rescan_token() {
     jj_rescan = true;
-    for (int i = 0; i < 22; i++) {
+    for (int i = 0; i < 23; i++) {
     try {
       JJCalls p = jj_2_rtns[i];
       do {
@@ -851,6 +882,7 @@
             case 19: jj_3_20(); break;
             case 20: jj_3_21(); break;
             case 21: jj_3_22(); break;
+            case 22: jj_3_23(); break;
           }
         }
         p = p.next;

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-14 13:24:12 UTC (rev 3712)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/drs/reader/DRSParser.jj	2012-05-14 16:58:45 UTC (rev 3713)
@@ -67,12 +67,12 @@
           dr_set = new HashSet<DiscourseReferent>();
        }
        drs = new DRS();
-       if (label != null)
+       if (label != null)
        {
           drs.setLabel(label.toString());
        }
        drs.setDiscourseReferents(dr_set);
-       if (conditions != null)
+       if (conditions != null)
        {
        	  drs.setDRSConditions(conditions);
        }
@@ -139,7 +139,7 @@
 }    
 {
 
-    predicate=<WORD> "(" dr_list=DR_List() ")"
+    predicate=word() "(" dr_list=DR_List() ")"
     {
         Simple_DRS_Condition condition;
 
@@ -224,8 +224,8 @@
       return dr_list;
    }
 }
-
 
+
 TOKEN: {<EVERY: "EVERY">}
 
 TOKEN: {<MOST: "MOST">}
@@ -242,18 +242,22 @@
 
 TOKEN: {<NO: "NO">}
 
-TOKEN: {<HOWMANY: "HOWMANY">}
+TOKEN: {<HOWMANY: "HOWMANY">}
 
 TOKEN: {<LABEL: "l"(["0"-"9"])+>}
 
-TOKEN: {<WORD: (["a"-"z","A"-"Z","_",".","#",":"])+>}
+//TOKEN: {<WORD: (["a"-"z","A"-"Z","_",".","#",":"])+>}
+//TOKEN: {<DR: (["?","!"])?(["a"-"z","A"-"Z","0"-"9","."])+>}
 
-TOKEN: {<DR: (["?","!"])?(["a"-"z","A"-"Z","0"-"9","."])+>}
+TOKEN: {<A: (["a"-"z","A"-"Z","0"-"9"])+>}
+TOKEN: {<B: "SLOT_"(["a"-"z","A"-"Z","_",".","#","0"-"9"])+>}
+TOKEN: {<C: ["?","!"](["a"-"z","A"-"Z","0"-"9"])+>}
 
+Token dr() : { Token t; }{ (t=<A> | t=<C>) { return t; } }
+Token word() : { Token t; }{ (t=<A> | t=<B>) { return t; } }
+
 TOKEN: {<QUOTED_STRING: "\'" (~["\'"])+ "\'" >}
 
-Token dr() : { Token t; }{ (t=<WORD> | t=<DR> | t=<QUOTED_STRING>) { return t; } }
-
 SKIP : { " " | "\t" | "\n" | "\r" }
 
 

Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/drs/reader/DRSParserConstants.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/drs/reader/DRSParserConstants.java	2012-05-14 13:24:12 UTC (rev 3712)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/drs/reader/DRSParserConstants.java	2012-05-14 16:58:45 UTC (rev 3713)
@@ -31,11 +31,13 @@
   /** RegularExpression Id. */
   int LABEL = 19;
   /** RegularExpression Id. */
-  int WORD = 20;
+  int A = 20;
   /** RegularExpression Id. */
-  int DR = 21;
+  int B = 21;
   /** RegularExpression Id. */
-  int QUOTED_STRING = 22;
+  int C = 22;
+  /** RegularExpression Id. */
+  int QUOTED_STRING = 23;
 
   /** Lexical state. */
   int DEFAULT = 0;
@@ -62,8 +64,9 @@
     "\"NO\"",
     "\"HOWMANY\"",
     "<LABEL>",
-    "<WORD>",
-    "<DR>",
+    "<A>",
+    "<B>",
+    "<C>",
     "<QUOTED_STRING>",
     "\" \"",
     "\"\\t\"",

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-14 13:24:12 UTC (rev 3712)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/drs/reader/DRSParserTokenManager.java	2012-05-14 16:58:45 UTC (rev 3713)
@@ -20,15 +20,20 @@
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x2L) != 0L)
+         if ((active0 & 0x7ee00L) != 0L)
+         {
+            jjmatchedKind = 20;
             return 2;
-         if ((active0 & 0x7fe00L) != 0L)
+         }
+         if ((active0 & 0x1000L) != 0L)
          {
             jjmatchedKind = 20;
-            return 8;
+            return 7;
          }
          return -1;
       case 1:
+         if ((active0 & 0x20200L) != 0L)
+            return 2;
          if ((active0 & 0x5fc00L) != 0L)
          {
             if (jjmatchedPos != 1)
@@ -36,47 +41,45 @@
                jjmatchedKind = 20;
                jjmatchedPos = 1;
             }
-            return 8;
+            return 2;
          }
-         if ((active0 & 0x20200L) != 0L)
-            return 8;
          return -1;
       case 2:
+         if ((active0 & 0x200L) != 0L)
+            return 2;
          if ((active0 & 0x5fc00L) != 0L)
          {
             jjmatchedKind = 20;
             jjmatchedPos = 2;
-            return 8;
+            return 2;
          }
-         if ((active0 & 0x200L) != 0L)
-            return 8;
          return -1;
       case 3:
          if ((active0 & 0x46400L) != 0L)
          {
             jjmatchedKind = 20;
             jjmatchedPos = 3;
-            return 8;
+            return 2;
          }
          if ((active0 & 0x19800L) != 0L)
-            return 8;
+            return 2;
          return -1;
       case 4:
+         if ((active0 & 0x400L) != 0L)
+            return 2;
          if ((active0 & 0x46000L) != 0L)
          {
             jjmatchedKind = 20;
             jjmatchedPos = 4;
-            return 8;
+            return 2;
          }
-         if ((active0 & 0x400L) != 0L)
-            return 8;
          return -1;
       case 5:
          if ((active0 & 0x46000L) != 0L)
          {
             jjmatchedKind = 20;
             jjmatchedPos = 5;
-            return 8;
+            return 2;
          }
          return -1;
       case 6:
@@ -84,10 +87,10 @@
          {
             jjmatchedKind = 20;
             jjmatchedPos = 6;
-            return 8;
+            return 2;
          }
          if ((active0 & 0x42000L) != 0L)
-            return 8;
+            return 2;
          return -1;
       default :
          return -1;
@@ -114,7 +117,7 @@
       case 44:
          return jjStopAtPos(0, 5);
       case 58:
-         return jjStartNfaWithStates_0(0, 1, 2);
+         return jjStopAtPos(0, 1);
       case 61:
          return jjStopAtPos(0, 8);
       case 65:
@@ -191,7 +194,7 @@
          return jjMoveStringLiteralDfa3_0(active0, 0x800L);
       case 84:
          if ((active0 & 0x200L) != 0L)
-            return jjStartNfaWithStates_0(2, 9, 8);
+            return jjStartNfaWithStates_0(2, 9, 2);
          break;
       case 87:
          return jjMoveStringLiteralDfa3_0(active0, 0x40000L);
@@ -213,7 +216,7 @@
    {
       case 69:
          if ((active0 & 0x1000L) != 0L)
-            return jjStartNfaWithStates_0(3, 12, 8);
+            return jjStartNfaWithStates_0(3, 12, 2);
          break;
       case 76:
          return jjMoveStringLiteralDfa4_0(active0, 0x4000L);
@@ -223,15 +226,15 @@
          return jjMoveStringLiteralDfa4_0(active0, 0x400L);
       case 84:
          if ((active0 & 0x800L) != 0L)
-            return jjStartNfaWithStates_0(3, 11, 8);
+            return jjStartNfaWithStates_0(3, 11, 2);
          break;
       case 87:
          if ((active0 & 0x8000L) != 0L)
-            return jjStartNfaWithStates_0(3, 15, 8);
+            return jjStartNfaWithStates_0(3, 15, 2);
          break;
       case 89:
          if ((active0 & 0x10000L) != 0L)
-            return jjStartNfaWithStates_0(3, 16, 8);
+            return jjStartNfaWithStates_0(3, 16, 2);
          break;
       default :
          break;
@@ -257,7 +260,7 @@
          return jjMoveStringLiteralDfa5_0(active0, 0x2000L);
       case 89:
          if ((active0 & 0x400L) != 0L)
-            return jjStartNfaWithStates_0(4, 10, 8);
+            return jjStartNfaWithStates_0(4, 10, 2);
          break;
       default :
          break;
@@ -301,11 +304,11 @@
          return jjMoveStringLiteralDfa7_0(active0, 0x4000L);
       case 84:
          if ((active0 & 0x2000L) != 0L)
-            return jjStartNfaWithStates_0(6, 13, 8);
+            return jjStartNfaWithStates_0(6, 13, 2);
          break;
       case 89:
          if ((active0 & 0x40000L) != 0L)
-            return jjStartNfaWithStates_0(6, 18, 8);
+            return jjStartNfaWithStates_0(6, 18, 2);
          break;
       default :
          break;
@@ -325,7 +328,7 @@
    {
       case 84:
          if ((active0 & 0x4000L) != 0L)
-            return jjStartNfaWithStates_0(7, 14, 8);
+            return jjStartNfaWithStates_0(7, 14, 2);
          break;
       default :
          break;
@@ -346,7 +349,7 @@
 private int jjMoveNfa_0(int startState, int curPos)
 {
    int startsAt = 0;
-   jjnewStateCnt = 8;
+   jjnewStateCnt = 14;
    int i = 1;
    jjstateSet[0] = startState;
    int kind = 0x7fffffff;
@@ -362,36 +365,24 @@
             switch(jjstateSet[--i])
             {
                case 0:
-                  if ((0x3ff400000000000L & l) != 0L)
+                  if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 21)
-                        kind = 21;
-                     jjCheckNAdd(4);
-                  }
-                  else if (curChar == 39)
-                     jjCheckNAdd(6);
-                  else if ((0x8000000200000000L & l) != 0L)
-                     jjCheckNAdd(4);
-                  if ((0x400400800000000L & l) != 0L)
-                  {
                      if (kind > 20)
                         kind = 20;
                      jjCheckNAdd(2);
                   }
+                  else if (curChar == 39)
+                     jjCheckNAdd(12);
+                  else if ((0x8000000200000000L & l) != 0L)
+                     jjCheckNAdd(10);
                   break;
-               case 8:
-                  if ((0x3ff400000000000L & l) != 0L)
-                  {
-                     if (kind > 21)
-                        kind = 21;
-                     jjCheckNAdd(4);
-                  }
-                  if ((0x400400800000000L & l) != 0L)
-                  {
-                     if (kind > 20)
-                        kind = 20;
-                     jjCheckNAdd(2);
-                  }
+               case 7:
+               case 2:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 20)
+                     kind = 20;
+                  jjCheckNAdd(2);
                   break;
                case 1:
                   if ((0x3ff000000000000L & l) == 0L)
@@ -400,35 +391,35 @@
                      kind = 19;
                   jjstateSet[jjnewStateCnt++] = 1;
                   break;
-               case 2:
-                  if ((0x400400800000000L & l) == 0L)
+               case 4:
+                  if ((0x3ff400800000000L & l) == 0L)
                      break;
-                  if (kind > 20)
-                     kind = 20;
-                  jjCheckNAdd(2);
+                  if (kind > 21)
+                     kind = 21;
+                  jjstateSet[jjnewStateCnt++] = 4;
                   break;
-               case 3:
+               case 9:
                   if ((0x8000000200000000L & l) != 0L)
-                     jjCheckNAdd(4);
+                     jjCheckNAdd(10);
                   break;
-               case 4:
-                  if ((0x3ff400000000000L & l) == 0L)
+               case 10:
+                  if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 21)
-                     kind = 21;
-                  jjCheckNAdd(4);
+                  if (kind > 22)
+                     kind = 22;
+                  jjCheckNAdd(10);
                   break;
-               case 5:
+               case 11:
                   if (curChar == 39)
-                     jjCheckNAdd(6);
+                     jjCheckNAdd(12);
                   break;
-               case 6:
+               case 12:
                   if ((0xffffff7fffffffffL & l) != 0L)
-                     jjCheckNAddTwoStates(6, 7);
+                     jjCheckNAddTwoStates(12, 13);
                   break;
-               case 7:
-                  if (curChar == 39 && kind > 22)
-                     kind = 22;
+               case 13:
+                  if (curChar == 39 && kind > 23)
+                     kind = 23;
                   break;
                default : break;
             }
@@ -442,50 +433,65 @@
             switch(jjstateSet[--i])
             {
                case 0:
-                  if ((0x7fffffe87fffffeL & l) != 0L)
+                  if ((0x7fffffe07fffffeL & l) != 0L)
                   {
                      if (kind > 20)
                         kind = 20;
                      jjCheckNAdd(2);
                   }
-                  if ((0x7fffffe07fffffeL & l) != 0L)
-                  {
-                     if (kind > 21)
-                        kind = 21;
-                     jjCheckNAdd(4);
-                  }
-                  if (curChar == 108)
+                  if (curChar == 83)
+                     jjstateSet[jjnewStateCnt++] = 7;
+                  else if (curChar == 108)
                      jjstateSet[jjnewStateCnt++] = 1;
                   break;
-               case 8:
-                  if ((0x7fffffe87fffffeL & l) != 0L)
+               case 7:
+                  if ((0x7fffffe07fffffeL & l) != 0L)
                   {
                      if (kind > 20)
                         kind = 20;
                      jjCheckNAdd(2);
                   }
-                  if ((0x7fffffe07fffffeL & l) != 0L)
-                  {
-                     if (kind > 21)
-                        kind = 21;
-                     jjCheckNAdd(4);
-                  }
+                  if (curChar == 76)
+                     jjstateSet[jjnewStateCnt++] = 6;
                   break;
                case 2:
-                  if ((0x7fffffe87fffffeL & l) == 0L)
+                  if ((0x7fffffe07fffffeL & l) == 0L)
                      break;
                   if (kind > 20)
                      kind = 20;
                   jjCheckNAdd(2);
                   break;
+               case 3:
+                  if (curChar == 95)
+                     jjCheckNAdd(4);
+                  break;
                case 4:
-                  if ((0x7fffffe07fffffeL & l) == 0L)
+                  if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
                   if (kind > 21)
                      kind = 21;
                   jjCheckNAdd(4);
                   break;
+               case 5:
+                  if (curChar == 84)
+                     jjstateSet[jjnewStateCnt++] = 3;
+                  break;
                case 6:
+                  if (curChar == 79)
+                     jjstateSet[jjnewStateCnt++] = 5;
+                  break;
+               case 8:
+                  if (curChar == 83)
+                     jjstateSet[jjnewStateCnt++] = 7;
+                  break;
+               case 10:
+                  if ((0x7fffffe07fffffeL & l) == 0L)
+                     break;
+                  if (kind > 22)
+                     kind = 22;
+                  jjstateSet[jjnewStateCnt++] = 10;
+                  break;
+               case 12:
                   jjAddStates(0, 1);
                   break;
                default : break;
@@ -500,7 +506,7 @@
          {
             switch(jjstateSet[--i])
             {
-               case 6:
+               case 12:
                   if ((jjbitVec0[i2] & l2) != 0L)
                      jjAddStates(0, 1);
                   break;
@@ -515,14 +521,14 @@
          kind = 0x7fffffff;
       }
       ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 8 - (jjnewStateCnt = startsAt)))
+      if ((i = jjnewStateCnt) == (startsAt = 14 - (jjnewStateCnt = startsAt)))
          return curPos;
       try { curChar = input_stream.readChar(); }
       catch(java.io.IOException e) { return curPos; }
    }
 }
 static final int[] jjnextStates = {
-   6, 7, 
+   12, 13, 
 };
 
 /** Token literal values. */
@@ -530,21 +536,21 @@
 "", "\72", "\133", "\174", "\135", "\54", "\50", "\51", "\75", "\116\117\124", 
 "\105\126\105\122\131", "\115\117\123\124", "\123\117\115\105", "\124\110\105\115\117\123\124", 
 "\124\110\105\114\105\101\123\124", "\101\106\105\127", "\115\101\116\131", "\116\117", 
-"\110\117\127\115\101\116\131", null, null, null, null, null, null, null, null, };
+"\110\117\127\115\101\116\131", null, null, null, null, null, null, null, null, null, };
 
 /** Lexer state names. */
 public static final String[] lexStateNames = {
    "DEFAULT",
 };
 static final long[] jjtoToken = {
-   0x7fffffL, 
+   0xffffffL, 
 };
 static final long[] jjtoSkip = {
-   0x7800000L, 
+   0xf000000L, 
 };
 protected SimpleCharStream input_stream;
-private final int[] jjrounds = new int[8];
-private final int[] jjstateSet = new int[16];
+private final int[] jjrounds = new int[14];
+private final int[] jjstateSet = new int[28];
 protected char curChar;
 /** Constructor. */
 public DRSParserTokenManager(SimpleCharStream stream){
@@ -571,7 +577,7 @@
 {
    int i;
    jjround = 0x80000001;
-   for (i = 8; i-- > 0;)
+   for (i = 14; i-- > 0;)
       jjrounds[i] = 0x80000000;
 }
 

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

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

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

Revision: 3714
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3714&view=rev
Author:   christinaunger
Date:     2012-05-15 07:20:52 +0000 (Tue, 15 May 2012)
Log Message:
-----------
[tbsl] updated DRS reader again

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

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-14 16:58:45 UTC (rev 3713)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/drs/reader/DRSParser.jj	2012-05-15 07:20:52 UTC (rev 3714)
@@ -250,7 +250,7 @@
 //TOKEN: {<DR: (["?","!"])?(["a"-"z","A"-"Z","0"-"9","."])+>}
 
 TOKEN: {<A: (["a"-"z","A"-"Z","0"-"9"])+>}
-TOKEN: {<B: "SLOT_"(["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"])+>}
 
 Token dr() : { Token t; }{ (t=<A> | t=<C>) { return t; } }

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-14 16:58:45 UTC (rev 3713)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/drs/reader/DRSParserTokenManager.java	2012-05-15 07:20:52 UTC (rev 3714)
@@ -20,20 +20,13 @@
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x7ee00L) != 0L)
+         if ((active0 & 0x7fe00L) != 0L)
          {
             jjmatchedKind = 20;
-            return 2;
+            return 4;
          }
-         if ((active0 & 0x1000L) != 0L)
-         {
-            jjmatchedKind = 20;
-            return 7;
-         }
          return -1;
       case 1:
-         if ((active0 & 0x20200L) != 0L)
-            return 2;
          if ((active0 & 0x5fc00L) != 0L)
          {
             if (jjmatchedPos != 1)
@@ -41,37 +34,39 @@
                jjmatchedKind = 20;
                jjmatchedPos = 1;
             }
-            return 2;
+            return 4;
          }
+         if ((active0 & 0x20200L) != 0L)
+            return 4;
          return -1;
       case 2:
-         if ((active0 & 0x200L) != 0L)
-            return 2;
          if ((active0 & 0x5fc00L) != 0L)
          {
             jjmatchedKind = 20;
             jjmatchedPos = 2;
-            return 2;
+            return 4;
          }
+         if ((active0 & 0x200L) != 0L)
+            return 4;
          return -1;
       case 3:
+         if ((active0 & 0x19800L) != 0L)
+            return 4;
          if ((active0 & 0x46400L) != 0L)
          {
             jjmatchedKind = 20;
             jjmatchedPos = 3;
-            return 2;
+            return 4;
          }
-         if ((active0 & 0x19800L) != 0L)
-            return 2;
          return -1;
       case 4:
          if ((active0 & 0x400L) != 0L)
-            return 2;
+            return 4;
          if ((active0 & 0x46000L) != 0L)
          {
             jjmatchedKind = 20;
             jjmatchedPos = 4;
-            return 2;
+            return 4;
          }
          return -1;
       case 5:
@@ -79,18 +74,18 @@
          {
             jjmatchedKind = 20;
             jjmatchedPos = 5;
-            return 2;
+            return 4;
          }
          return -1;
       case 6:
+         if ((active0 & 0x42000L) != 0L)
+            return 4;
          if ((active0 & 0x4000L) != 0L)
          {
             jjmatchedKind = 20;
             jjmatchedPos = 6;
-            return 2;
+            return 4;
          }
-         if ((active0 & 0x42000L) != 0L)
-            return 2;
          return -1;
       default :
          return -1;
@@ -194,7 +189,7 @@
          return jjMoveStringLiteralDfa3_0(active0, 0x800L);
       case 84:
          if ((active0 & 0x200L) != 0L)
-            return jjStartNfaWithStates_0(2, 9, 2);
+            return jjStartNfaWithStates_0(2, 9, 4);
          break;
       case 87:
          return jjMoveStringLiteralDfa3_0(active0, 0x40000L);
@@ -216,7 +211,7 @@
    {
       case 69:
          if ((active0 & 0x1000L) != 0L)
-            return jjStartNfaWithStates_0(3, 12, 2);
+            return jjStartNfaWithStates_0(3, 12, 4);
          break;
       case 76:
          return jjMoveStringLiteralDfa4_0(active0, 0x4000L);
@@ -226,15 +221,15 @@
          return jjMoveStringLiteralDfa4_0(active0, 0x400L);
       case 84:
          if ((active0 & 0x800L) != 0L)
-            return jjStartNfaWithStates_0(3, 11, 2);
+            return jjStartNfaWithStates_0(3, 11, 4);
          break;
       case 87:
          if ((active0 & 0x8000L) != 0L)
-            return jjStartNfaWithStates_0(3, 15, 2);
+            return jjStartNfaWithStates_0(3, 15, 4);
          break;
       case 89:
          if ((active0 & 0x10000L) != 0L)
-            return jjStartNfaWithStates_0(3, 16, 2);
+            return jjStartNfaWithStates_0(3, 16, 4);
          break;
       default :
          break;
@@ -260,7 +255,7 @@
          return jjMoveStringLiteralDfa5_0(active0, 0x2000L);
       case 89:
          if ((active0 & 0x400L) != 0L)
-            return jjStartNfaWithStates_0(4, 10, 2);
+            return jjStartNfaWithStates_0(4, 10, 4);
          break;
       default :
          break;
@@ -304,11 +299,11 @@
          return jjMoveStringLiteralDfa7_0(active0, 0x4000L);
       case 84:
          if ((active0 & 0x2000L) != 0L)
-            return jjStartNfaWithStates_0(6, 13, 2);
+            return jjStartNfaWithStates_0(6, 13, 4);
          break;
       case 89:
          if ((active0 & 0x40000L) != 0L)
-            return jjStartNfaWithStates_0(6, 18, 2);
+            return jjStartNfaWithStates_0(6, 18, 4);
          break;
       default :
          break;
@@ -328,7 +323,7 @@
    {
       case 84:
          if ((active0 & 0x4000L) != 0L)
-            return jjStartNfaWithStates_0(7, 14, 2);
+            return jjStartNfaWithStates_0(7, 14, 4);
          break;
       default :
          break;
@@ -349,7 +344,7 @@
 private int jjMoveNfa_0(int startState, int curPos)
 {
    int startsAt = 0;
-   jjnewStateCnt = 14;
+   jjnewStateCnt = 11;
    int i = 1;
    jjstateSet[0] = startState;
    int kind = 0x7fffffff;
@@ -364,19 +359,39 @@
          {
             switch(jjstateSet[--i])
             {
-               case 0:
+               case 4:
+                  if ((0x3ff400800000000L & l) != 0L)
+                     jjCheckNAddTwoStates(3, 4);
+                  else if (curChar == 58)
+                     jjCheckNAdd(5);
                   if ((0x3ff000000000000L & l) != 0L)
                   {
                      if (kind > 20)
                         kind = 20;
                      jjCheckNAdd(2);
                   }
+                  break;
+               case 0:
+                  if ((0x3ff400800000000L & l) != 0L)
+                     jjCheckNAddTwoStates(3, 4);
                   else if (curChar == 39)
-                     jjCheckNAdd(12);
+                     jjCheckNAdd(9);
                   else if ((0x8000000200000000L & l) != 0L)
-                     jjCheckNAdd(10);
+                     jjCheckNAdd(7);
+                  if ((0x3ff000000000000L & l) != 0L)
+                  {
+                     if (kind > 20)
+                        kind = 20;
+                     jjCheckNAdd(2);
+                  }
                   break;
-               case 7:
+               case 1:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 19)
+                     kind = 19;
+                  jjstateSet[jjnewStateCnt++] = 1;
+                  break;
                case 2:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
@@ -384,40 +399,37 @@
                      kind = 20;
                   jjCheckNAdd(2);
                   break;
-               case 1:
-                  if ((0x3ff000000000000L & l) == 0L)
-                     break;
-                  if (kind > 19)
-                     kind = 19;
-                  jjstateSet[jjnewStateCnt++] = 1;
+               case 3:
+                  if ((0x3ff400800000000L & l) != 0L)
+                     jjCheckNAddTwoStates(3, 4);
                   break;
-               case 4:
+               case 5:
                   if ((0x3ff400800000000L & l) == 0L)
                      break;
                   if (kind > 21)
                      kind = 21;
-                  jjstateSet[jjnewStateCnt++] = 4;
+                  jjCheckNAdd(5);
                   break;
-               case 9:
+               case 6:
                   if ((0x8000000200000000L & l) != 0L)
-                     jjCheckNAdd(10);
+                     jjCheckNAdd(7);
                   break;
-               case 10:
+               case 7:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 22)
                      kind = 22;
-                  jjCheckNAdd(10);
+                  jjCheckNAdd(7);
                   break;
-               case 11:
+               case 8:
                   if (curChar == 39)
-                     jjCheckNAdd(12);
+                     jjCheckNAdd(9);
                   break;
-               case 12:
+               case 9:
                   if ((0xffffff7fffffffffL & l) != 0L)
-                     jjCheckNAddTwoStates(12, 13);
+                     jjCheckNAddTwoStates(9, 10);
                   break;
-               case 13:
+               case 10:
                   if (curChar == 39 && kind > 23)
                      kind = 23;
                   break;
@@ -432,27 +444,27 @@
          {
             switch(jjstateSet[--i])
             {
-               case 0:
+               case 4:
+                  if ((0x7fffffe87fffffeL & l) != 0L)
+                     jjCheckNAddTwoStates(3, 4);
                   if ((0x7fffffe07fffffeL & l) != 0L)
                   {
                      if (kind > 20)
                         kind = 20;
                      jjCheckNAdd(2);
                   }
-                  if (curChar == 83)
-                     jjstateSet[jjnewStateCnt++] = 7;
-                  else if (curChar == 108)
-                     jjstateSet[jjnewStateCnt++] = 1;
                   break;
-               case 7:
+               case 0:
+                  if ((0x7fffffe87fffffeL & l) != 0L)
+                     jjCheckNAddTwoStates(3, 4);
                   if ((0x7fffffe07fffffeL & l) != 0L)
                   {
                      if (kind > 20)
                         kind = 20;
                      jjCheckNAdd(2);
                   }
-                  if (curChar == 76)
-                     jjstateSet[jjnewStateCnt++] = 6;
+                  if (curChar == 108)
+                     jjstateSet[jjnewStateCnt++] = 1;
                   break;
                case 2:
                   if ((0x7fffffe07fffffeL & l) == 0L)
@@ -462,36 +474,24 @@
                   jjCheckNAdd(2);
                   break;
                case 3:
-                  if (curChar == 95)
-                     jjCheckNAdd(4);
+                  if ((0x7fffffe87fffffeL & l) != 0L)
+                     jjCheckNAddTwoStates(3, 4);
                   break;
-               case 4:
+               case 5:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
                   if (kind > 21)
                      kind = 21;
-                  jjCheckNAdd(4);
+                  jjstateSet[jjnewStateCnt++] = 5;
                   break;
-               case 5:
-                  if (curChar == 84)
-                     jjstateSet[jjnewStateCnt++] = 3;
-                  break;
-               case 6:
-                  if (curChar == 79)
-                     jjstateSet[jjnewStateCnt++] = 5;
-                  break;
-               case 8:
-                  if (curChar == 83)
-                     jjstateSet[jjnewStateCnt++] = 7;
-                  break;
-               case 10:
+               case 7:
                   if ((0x7fffffe07fffffeL & l) == 0L)
                      break;
                   if (kind > 22)
                      kind = 22;
-                  jjstateSet[jjnewStateCnt++] = 10;
+                  jjstateSet[jjnewStateCnt++] = 7;
                   break;
-               case 12:
+               case 9:
                   jjAddStates(0, 1);
                   break;
                default : break;
@@ -506,7 +506,7 @@
          {
             switch(jjstateSet[--i])
             {
-               case 12:
+               case 9:
                   if ((jjbitVec0[i2] & l2) != 0L)
                      jjAddStates(0, 1);
                   break;
@@ -521,14 +521,14 @@
          kind = 0x7fffffff;
       }
       ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 14 - (jjnewStateCnt = startsAt)))
+      if ((i = jjnewStateCnt) == (startsAt = 11 - (jjnewStateCnt = startsAt)))
          return curPos;
       try { curChar = input_stream.readChar(); }
       catch(java.io.IOException e) { return curPos; }
    }
 }
 static final int[] jjnextStates = {
-   12, 13, 
+   9, 10, 
 };
 
 /** Token literal values. */
@@ -549,8 +549,8 @@
    0xf000000L, 
 };
 protected SimpleCharStream input_stream;
-private final int[] jjrounds = new int[14];
-private final int[] jjstateSet = new int[28];
+private final int[] jjrounds = new int[11];
+private final int[] jjstateSet = new int[22];
 protected char curChar;
 /** Constructor. */
 public DRSParserTokenManager(SimpleCharStream stream){
@@ -577,7 +577,7 @@
 {
    int i;
    jjround = 0x80000001;
-   for (i = 14; i-- > 0;)
+   for (i = 11; i-- > 0;)
       jjrounds[i] = 0x80000000;
 }
 

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