Merge pull request #26 from edubart/fix-lpeg-clashing

Fix name clashing issues with LPEG

6 files changed, 23 insertions, 23 deletions

diff --git a/lpcap.h b/lpcap.h
index dc10d69..f3d1836 100644
--- a/lpcap.h
+++ b/lpcap.h
@@ -48,9 +48,9 @@ typedef struct CapState {
 } CapState;
 
 
-int runtimecap (CapState *cs, Capture *close, const char *s, int *rem);
-int getcaptures (lua_State *L, const char *s, const char *r, int ptop);
-int finddyncap (Capture *cap, Capture *last);
+LUAI_FUNC int runtimecap (CapState *cs, Capture *close, const char *s, int *rem);
+LUAI_FUNC int getcaptures (lua_State *L, const char *s, const char *r, int ptop);
+LUAI_FUNC int finddyncap (Capture *cap, Capture *last);
 
 #endif
 
diff --git a/lpcode.h b/lpcode.h
index 34ee276..bdd3ec1 100644
--- a/lpcode.h
+++ b/lpcode.h
@@ -11,14 +11,14 @@
 #include "lptree.h"
 #include "lpvm.h"
 
-int tocharset (TTree *tree, Charset *cs);
-int checkaux (TTree *tree, int pred);
-int fixedlen (TTree *tree);
-int hascaptures (TTree *tree);
-int lp_gc (lua_State *L);
-Instruction *compile (lua_State *L, Pattern *p);
-void realloccode (lua_State *L, Pattern *p, int nsize);
-int sizei (const Instruction *i);
+LUAI_FUNC int tocharset (TTree *tree, Charset *cs);
+LUAI_FUNC int checkaux (TTree *tree, int pred);
+LUAI_FUNC int fixedlen (TTree *tree);
+LUAI_FUNC int hascaptures (TTree *tree);
+LUAI_FUNC int lp_gc (lua_State *L);
+LUAI_FUNC Instruction *compile (lua_State *L, Pattern *p);
+LUAI_FUNC void realloccode (lua_State *L, Pattern *p, int nsize);
+LUAI_FUNC int sizei (const Instruction *i);
 
 
 #define PEnullable      0
diff --git a/lpprint.h b/lpprint.h
index 15ef121..c4d57a0 100644
--- a/lpprint.h
+++ b/lpprint.h
@@ -13,12 +13,12 @@
 
 #if defined(LPEG_DEBUG)
 
-void printpatt (Instruction *p, int n);
-void printtree (TTree *tree, int ident);
-void printktable (lua_State *L, int idx);
-void printcharset (const byte *st);
-void printcaplist (Capture *cap, Capture *limit);
-void printinst (const Instruction *op, const Instruction *p);
+LUAI_FUNC void printpatt (Instruction *p, int n);
+LUAI_FUNC void printtree (TTree *tree, int ident);
+LUAI_FUNC void printktable (lua_State *L, int idx);
+LUAI_FUNC void printcharset (const byte *st);
+LUAI_FUNC void printcaplist (Capture *cap, Capture *limit);
+LUAI_FUNC void printinst (const Instruction *op, const Instruction *p);
 
 #else
 
diff --git a/lptree.h b/lptree.h
index 05e0680..c0ae5dc 100644
--- a/lptree.h
+++ b/lptree.h
@@ -73,7 +73,7 @@ typedef struct Pattern {
 
 
 /* number of children for each tree */
-extern const byte numsiblings[];
+LUAI_FUNC const byte numsiblings[];
 
 /* access to children */
 #define sib1(t)         ((t) + 1)
diff --git a/lptypes.h b/lptypes.h
index bf9aed1..6a6e159 100644
--- a/lptypes.h
+++ b/lptypes.h
@@ -18,8 +18,8 @@
 #define VERSION         "1.6.0"
 
 
-#define PATTERN_T       "lpeg-pattern"
-#define MAXSTACKIDX     "lpeg-maxstack"
+#define PATTERN_T       "lpeglabel-pattern"
+#define MAXSTACKIDX     "lpeglabel-maxstack"
 
 
 /*
@@ -35,7 +35,7 @@
 #define lua_rawlen              lua_objlen
 
 #define luaL_setfuncs(L,f,n)    luaL_register(L,NULL,f)
-#define luaL_newlib(L,f)        luaL_register(L,"lpeg",f)
+#define luaL_newlib(L,f)        luaL_register(L,"lpeglabel",f)
 
 typedef size_t lua_Unsigned;
 
diff --git a/lpvm.h b/lpvm.h
index 19f4108..a056701 100644
--- a/lpvm.h
+++ b/lpvm.h
@@ -58,8 +58,8 @@ typedef union Instruction {
 #define utf_to(inst)    (((inst)->i.key << 8) | (inst)->i.aux)
 
 
-void printpatt (Instruction *p, int n);
-const char *match (lua_State *L, const char *o, const char *s, const char *e,
+LUAI_FUNC void printpatt (Instruction *p, int n);
+LUAI_FUNC const char *match (lua_State *L, const char *o, const char *s, const char *e,
                    Instruction *op, Capture *capture, int ptop, short *labelf, const char **sfail); /* labeled failure */
 
 #endif