Merge pull request #3 from andremm/maxlabels

Increasing MAXLABELS from 32 to 64

2 files changed, 10 insertions, 10 deletions

diff --git a/lptree.c b/lptree.c
index f290d63..548128d 100644
--- a/lptree.c
+++ b/lptree.c
@@ -706,8 +706,8 @@ static int lp_throw (lua_State *L) {
         Labelset ls = 0;
         int i;
         for (i = 1; i <= n; i++) {
-                int d = (int)luaL_checkinteger(L, i);
-                luaL_argcheck(L, d >= 0 && d < (int)MAXLABELS, i, "invalid label index");
+                long long int d = (long long int)luaL_checkinteger(L, i);
+                luaL_argcheck(L, d >= 0 && d < (long long int)MAXLABELS, i, "invalid label index");
                 setlabel(ls, d);
         }
         newlabelleaf(L, ls);
@@ -723,8 +723,8 @@ static int lp_labchoice (lua_State *L) {
         int i;
         Labelset ls = 0;
         for (i = 3; i <= n; i++) {
-                int d = (int)luaL_checkinteger(L, i);
-                luaL_argcheck(L, d >= 0 && d < (int)MAXLABELS, i, "invalid label index");
+                long long int d = (long long int)luaL_checkinteger(L, i);
+                luaL_argcheck(L, d >= 0 && d < (long long int)MAXLABELS, i, "invalid label index");
                 setlabel(ls, d);
         }
   tree = newroot2sib(L, TLabChoice);
@@ -1205,11 +1205,11 @@ static int lp_match (lua_State *L) {
   r = match(L, s, s + i, s + l, code, capture, ptop, &labelf, &sfail); /* labeled failure */
         /*printf("sfail = %s\n", sfail);*/
   if (r == NULL) { /* labeled failure begin */
-    int j = 0;
+    long long int j = 0;
     int n = 1;
     lua_pushnil(L);
-    while (j < (int) MAXLABELS) {
-      if (labelf & (1 << j)) {  
+    while (j < (long long int) MAXLABELS) {
+      if (labelf & (1ULL << j)) {       
         lua_pushinteger(L, j);
         n++;
                                 break; /* Changing the semantics: only one label */
diff --git a/lptypes.h b/lptypes.h
index 3f1041e..1f30bc4 100644
--- a/lptypes.h
+++ b/lptypes.h
@@ -111,14 +111,14 @@ typedef struct Charset {
 
 
 /* labeled failure begin */
-typedef int Labelset;
+typedef long long int Labelset;
 
-#define MAXLABELS (sizeof(int) * 8)
+#define MAXLABELS (sizeof(long long int) * 8)
 
 #define LFAIL 1
 
 /* set bit 'b' in set 's' */
-#define setlabel(s, b) ((s) |= (1 << (b)))
+#define setlabel(s, b) ((s) |= (1ULL << (b)))
 /* labeled failure end */