Updating code given that lpeglabel.T only throws one label

1 files changed, 16 insertions, 30 deletions

diff --git a/lpvm.c b/lpvm.c
index a57c4b3..4d9797c 100644
--- a/lpvm.c
+++ b/lpvm.c
@@ -31,17 +31,6 @@ static void setlabelfail(Labelset *ls) {
         loopset(i, ls->cs[i] = 0); 
   ls->cs[IDXLFAIL] = 1;
 }
-
-static void clearandsetlabel(Labelset *ls, byte b) { 
-        loopset(i, ls->cs[i] = 0); 
-  setlabel(ls->cs, b);
-}
-
-
-static int cs_disjoint (const Charset *cs1, const Charset *cs2) {
-  loopset(i, if ((cs1->cs[i] & cs2->cs[i]) != 0) return 0;)
-  return 1;
-}
 /* labeled failure end */
 
 /*
@@ -54,8 +43,8 @@ static int cs_disjoint (const Charset *cs1, const Charset *cs2) {
 typedef struct Stack {
   const char *s;  /* saved position (or NULL for calls) */
   const Instruction *p;  /* next instruction */
-  int caplevel;
   const Labelset *ls; /* labeled failure */
+  int caplevel;
 } Stack;
 
 
@@ -165,7 +154,7 @@ static int removedyncap (lua_State *L, Capture *capture,
 ** Opcode interpreter
 */
 const char *match (lua_State *L, const char *o, const char *s, const char *e,
-                   Instruction *op, Capture *capture, int ptop, Labelset *labelf, const char **sfail) { /* labeled failure */
+                   Instruction *op, Capture *capture, int ptop, byte *labelf, const char **sfail) { /* labeled failure */
   Stack stackbase[INITBACK];
   Stack *stacklimit = stackbase + INITBACK;
   Stack *stack = stackbase;  /* point to first empty slot in stack */
@@ -177,14 +166,13 @@ const char *match (lua_State *L, const char *o, const char *s, const char *e,
         setlabelfail(&lsfail);
   stack->p = &giveup; stack->s = s; stack->caplevel = 0; stack++;
   lua_pushlightuserdata(L, stackbase);
-  /*printf("match: %s\n", s);*/
-        for (;;) {
-/*#if defined(DEBUG)*/
-    /*  printf("s: |%s| stck:%d, dyncaps:%d, caps:%d  ",
+  for (;;) {
+#if defined(DEBUG)
+      printf("s: |%s| stck:%d, dyncaps:%d, caps:%d  ",
              s, stack - getstackbase(L, ptop), ndyncap, captop);
-      printinst(op, p);*/
-      /*printcaplist(capture, capture + captop);*/
-/*#endif*/
+      printinst(op, p);
+      printcaplist(capture, capture + captop);
+#endif
     assert(stackidx(ptop) + ndyncap == lua_gettop(L) && ndyncap <= captop);
     switch ((Opcode)p->i.code) {
       case IEnd: {
@@ -205,7 +193,7 @@ const char *match (lua_State *L, const char *o, const char *s, const char *e,
       case IAny: {
         if (s < e) { p++; s++; }
         else {
-          setlabelfail(labelf);  /* labeled failure */
+          *labelf = LFAIL; /* labeled failure */
                                         *sfail = s;
           goto fail;
         }
@@ -219,7 +207,7 @@ const char *match (lua_State *L, const char *o, const char *s, const char *e,
       case IChar: {
         if ((byte)*s == p->i.aux && s < e) { p++; s++; }
         else {
-          setlabelfail(labelf);  /* labeled failure */
+          *labelf = LFAIL; /* labeled failure */
                                         *sfail = s;
           goto fail;
         }
@@ -235,7 +223,7 @@ const char *match (lua_State *L, const char *o, const char *s, const char *e,
         if (testchar((p+1)->buff, c) && s < e)
           { p += CHARSETINSTSIZE; s++; }
         else {
-          setlabelfail(labelf);  /* labeled failure */
+          *labelf = LFAIL; /* labeled failure */
                                         *sfail = s;
           goto fail;
         }
@@ -251,7 +239,7 @@ const char *match (lua_State *L, const char *o, const char *s, const char *e,
       case IBehind: {
         int n = p->i.aux;
         if (n > s - o) {
-          setlabelfail(labelf);  /* labeled failure */
+          *labelf = LFAIL; /* labeled failure */
                                         *sfail = s;
           goto fail;
         }
@@ -322,9 +310,8 @@ const char *match (lua_State *L, const char *o, const char *s, const char *e,
         continue;
       }
       case IThrow: { /* labeled failure */
-        clearandsetlabel(labelf, p->i.aux);
+        *labelf = p->i.aux;
                                 *sfail = s;
-                                /*printf("s = %s, sfail = %s\n", s, *sfail);*/
         goto fail;
       }
       case IFailTwice:
@@ -332,14 +319,13 @@ const char *match (lua_State *L, const char *o, const char *s, const char *e,
         stack--;
         /* go through */
       case IFail:
-      setlabelfail(labelf);  /* labeled failure */
+      *labelf = LFAIL; /* labeled failure */
                         *sfail = s;
       fail: { /* pattern failed: try to backtrack */
         do {  /* remove pending calls */
           assert(stack > getstackbase(L, ptop));
           s = (--stack)->s;
-          /*printf("s = %s, disj = %d\n", s, cs_disjoint(stack->ls, labelf));*/
-        } while (s == NULL || (stack->p != &giveup && cs_disjoint(stack->ls, labelf)));
+        } while (s == NULL || (stack->p != &giveup && !testlabel(stack->ls->cs, *labelf)));
         if (ndyncap > 0)  /* is there matchtime captures? */
           ndyncap -= removedyncap(L, capture, stack->caplevel, captop);
         captop = stack->caplevel;
@@ -356,7 +342,7 @@ const char *match (lua_State *L, const char *o, const char *s, const char *e,
         fr -= rem;  /* 'rem' items were popped from Lua stack */
         res = resdyncaptures(L, fr, s - o, e - o);  /* get result */
         if (res == -1) { /* fail? */
-                setlabelfail(labelf);  /* labeled failure */
+                *labelf = LFAIL;  /* labeled failure */
                                         *sfail = (const char *) s; /* TODO: ??? */
           goto fail;
         }