aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSérgio Medeiros <sqmedeiros@gmail.com>2021-08-20 08:27:54 -0300
committerGitHub <noreply@github.com>2021-08-20 08:27:54 -0300
commited183860289664af0f3727307653c9bf2bccdc80 (patch)
treec2d8e3bdd0d6d189572bd50d8d9a078097fcc3b5
parent635a51b5c88e958c27b26e049c639ea774946367 (diff)
parent7668d9076da6e2ae9e220eafb5c6ee1e933c088d (diff)
downloadlpeglabel-ed183860289664af0f3727307653c9bf2bccdc80.tar.gz
lpeglabel-ed183860289664af0f3727307653c9bf2bccdc80.tar.bz2
lpeglabel-ed183860289664af0f3727307653c9bf2bccdc80.zip
Merge pull request #30 from logiceditor-com/avr/8279/eliminate-conflicts-with-original-lpeg
change prefix of source files from 'lp' to 'lpl'
-rw-r--r--README.md2
-rw-r--r--lplcap.c (renamed from lpcap.c)6
-rw-r--r--lplcap.h (renamed from lpcap.h)8
-rw-r--r--lplcode.c (renamed from lpcode.c)6
-rw-r--r--lplcode.h (renamed from lpcode.h)12
-rw-r--r--lplprint.c (renamed from lpprint.c)8
-rw-r--r--lplprint.h (renamed from lpprint.h)10
-rw-r--r--lpltree.c (renamed from lptree.c)12
-rw-r--r--lpltree.h (renamed from lptree.h)8
-rw-r--r--lpltypes.h (renamed from lptypes.h)6
-rw-r--r--lplvm.c (renamed from lpvm.c)10
-rw-r--r--lplvm.h (renamed from lpvm.h)8
-rw-r--r--makefile12
13 files changed, 54 insertions, 54 deletions
diff --git a/README.md b/README.md
index c9cbb4a..d098fb6 100644
--- a/README.md
+++ b/README.md
@@ -486,5 +486,5 @@ its initial rule.
486 486
487In case your grammar has many regular and recovery rules, 487In case your grammar has many regular and recovery rules,
488you may get an error message such as grammar: <em>has too many rules</em>. 488you may get an error message such as grammar: <em>has too many rules</em>.
489In this case, we need to change *MAXRULES* in `lptypes.h`. 489In this case, we need to change *MAXRULES* in `lpltypes.h`.
490 490
diff --git a/lpcap.c b/lplcap.c
index b332fde..924d371 100644
--- a/lpcap.c
+++ b/lplcap.c
@@ -1,13 +1,13 @@
1/* 1/*
2** $Id: lpcap.c $ 2** $Id: lplcap.c $
3** Copyright 2007, Lua.org & PUC-Rio (see 'lpeg.html' for license) 3** Copyright 2007, Lua.org & PUC-Rio (see 'lpeg.html' for license)
4*/ 4*/
5 5
6#include "lua.h" 6#include "lua.h"
7#include "lauxlib.h" 7#include "lauxlib.h"
8 8
9#include "lpcap.h" 9#include "lplcap.h"
10#include "lptypes.h" 10#include "lpltypes.h"
11 11
12 12
13#define captype(cap) ((cap)->kind) 13#define captype(cap) ((cap)->kind)
diff --git a/lpcap.h b/lplcap.h
index f3d1836..5d4de71 100644
--- a/lpcap.h
+++ b/lplcap.h
@@ -1,12 +1,12 @@
1/* 1/*
2** $Id: lpcap.h $ 2** $Id: lplcap.h $
3*/ 3*/
4 4
5#if !defined(lpcap_h) 5#if !defined(lplcap_h)
6#define lpcap_h 6#define lplcap_h
7 7
8 8
9#include "lptypes.h" 9#include "lpltypes.h"
10 10
11 11
12/* kinds of captures */ 12/* kinds of captures */
diff --git a/lpcode.c b/lplcode.c
index 78c6566..be041c4 100644
--- a/lpcode.c
+++ b/lplcode.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lpcode.c $ 2** $Id: lplcode.c $
3** Copyright 2007, Lua.org & PUC-Rio (see 'lpeg.html' for license) 3** Copyright 2007, Lua.org & PUC-Rio (see 'lpeg.html' for license)
4*/ 4*/
5 5
@@ -9,8 +9,8 @@
9#include "lua.h" 9#include "lua.h"
10#include "lauxlib.h" 10#include "lauxlib.h"
11 11
12#include "lptypes.h" 12#include "lpltypes.h"
13#include "lpcode.h" 13#include "lplcode.h"
14 14
15 15
16/* signals a "no-instruction */ 16/* signals a "no-instruction */
diff --git a/lpcode.h b/lplcode.h
index bdd3ec1..1b4ec78 100644
--- a/lpcode.h
+++ b/lplcode.h
@@ -1,15 +1,15 @@
1/* 1/*
2** $Id: lpcode.h $ 2** $Id: lplcode.h $
3*/ 3*/
4 4
5#if !defined(lpcode_h) 5#if !defined(lplcode_h)
6#define lpcode_h 6#define lplcode_h
7 7
8#include "lua.h" 8#include "lua.h"
9 9
10#include "lptypes.h" 10#include "lpltypes.h"
11#include "lptree.h" 11#include "lpltree.h"
12#include "lpvm.h" 12#include "lplvm.h"
13 13
14LUAI_FUNC int tocharset (TTree *tree, Charset *cs); 14LUAI_FUNC int tocharset (TTree *tree, Charset *cs);
15LUAI_FUNC int checkaux (TTree *tree, int pred); 15LUAI_FUNC int checkaux (TTree *tree, int pred);
diff --git a/lpprint.c b/lplprint.c
index af03edc..7a9f95c 100644
--- a/lpprint.c
+++ b/lplprint.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lpprint.c $ 2** $Id: lplprint.c $
3** Copyright 2007, Lua.org & PUC-Rio (see 'lpeg.html' for license) 3** Copyright 2007, Lua.org & PUC-Rio (see 'lpeg.html' for license)
4*/ 4*/
5 5
@@ -8,9 +8,9 @@
8#include <stdio.h> 8#include <stdio.h>
9 9
10 10
11#include "lptypes.h" 11#include "lpltypes.h"
12#include "lpprint.h" 12#include "lplprint.h"
13#include "lpcode.h" 13#include "lplcode.h"
14 14
15 15
16#if defined(LPEG_DEBUG) 16#if defined(LPEG_DEBUG)
diff --git a/lpprint.h b/lplprint.h
index c4d57a0..4f020f5 100644
--- a/lpprint.h
+++ b/lplprint.h
@@ -1,14 +1,14 @@
1/* 1/*
2** $Id: lpprint.h $ 2** $Id: lplprint.h $
3*/ 3*/
4 4
5 5
6#if !defined(lpprint_h) 6#if !defined(lplprint_h)
7#define lpprint_h 7#define lplprint_h
8 8
9 9
10#include "lptree.h" 10#include "lpltree.h"
11#include "lpvm.h" 11#include "lplvm.h"
12 12
13 13
14#if defined(LPEG_DEBUG) 14#if defined(LPEG_DEBUG)
diff --git a/lptree.c b/lpltree.c
index 4afbae7..e7c6638 100644
--- a/lptree.c
+++ b/lpltree.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lptree.c $ 2** $Id: lpltree.c $
3** Copyright 2013, Lua.org & PUC-Rio (see 'lpeg.html' for license) 3** Copyright 2013, Lua.org & PUC-Rio (see 'lpeg.html' for license)
4*/ 4*/
5 5
@@ -11,11 +11,11 @@
11#include "lua.h" 11#include "lua.h"
12#include "lauxlib.h" 12#include "lauxlib.h"
13 13
14#include "lptypes.h" 14#include "lpltypes.h"
15#include "lpcap.h" 15#include "lplcap.h"
16#include "lpcode.h" 16#include "lplcode.h"
17#include "lpprint.h" 17#include "lplprint.h"
18#include "lptree.h" 18#include "lpltree.h"
19 19
20 20
21/* number of siblings for each tree */ 21/* number of siblings for each tree */
diff --git a/lptree.h b/lpltree.h
index c0ae5dc..646ef48 100644
--- a/lptree.h
+++ b/lpltree.h
@@ -1,12 +1,12 @@
1/* 1/*
2** $Id: lptree.h $ 2** $Id: lpltree.h $
3*/ 3*/
4 4
5#if !defined(lptree_h) 5#if !defined(lpltree_h)
6#define lptree_h 6#define lpltree_h
7 7
8 8
9#include "lptypes.h" 9#include "lpltypes.h"
10 10
11 11
12/* 12/*
diff --git a/lptypes.h b/lpltypes.h
index 6a6e159..c5fbb1e 100644
--- a/lptypes.h
+++ b/lpltypes.h
@@ -1,12 +1,12 @@
1/* 1/*
2** $Id: lptypes.h $ 2** $Id: lpltypes.h $
3** LPeg - PEG pattern matching for Lua 3** LPeg - PEG pattern matching for Lua
4** Copyright 2007-2019, Lua.org & PUC-Rio (see 'lpeg.html' for license) 4** Copyright 2007-2019, Lua.org & PUC-Rio (see 'lpeg.html' for license)
5** written by Roberto Ierusalimschy 5** written by Roberto Ierusalimschy
6*/ 6*/
7 7
8#if !defined(lptypes_h) 8#if !defined(lpltypes_h)
9#define lptypes_h 9#define lpltypes_h
10 10
11 11
12#include <assert.h> 12#include <assert.h>
diff --git a/lpvm.c b/lplvm.c
index b7ae631..1dddfe6 100644
--- a/lpvm.c
+++ b/lplvm.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lpvm.c $ 2** $Id: lplvm.c $
3** Copyright 2007, Lua.org & PUC-Rio (see 'lpeg.html' for license) 3** Copyright 2007, Lua.org & PUC-Rio (see 'lpeg.html' for license)
4*/ 4*/
5 5
@@ -10,10 +10,10 @@
10#include "lua.h" 10#include "lua.h"
11#include "lauxlib.h" 11#include "lauxlib.h"
12 12
13#include "lpcap.h" 13#include "lplcap.h"
14#include "lptypes.h" 14#include "lpltypes.h"
15#include "lpvm.h" 15#include "lplvm.h"
16#include "lpprint.h" 16#include "lplprint.h"
17 17
18 18
19/* initial size for call/backtrack stack */ 19/* initial size for call/backtrack stack */
diff --git a/lpvm.h b/lplvm.h
index a056701..19a1502 100644
--- a/lpvm.h
+++ b/lplvm.h
@@ -1,11 +1,11 @@
1/* 1/*
2** $Id: lpvm.h $ 2** $Id: lplvm.h $
3*/ 3*/
4 4
5#if !defined(lpvm_h) 5#if !defined(lplvm_h)
6#define lpvm_h 6#define lplvm_h
7 7
8#include "lpcap.h" 8#include "lplcap.h"
9 9
10 10
11/* Virtual Machine's instructions */ 11/* Virtual Machine's instructions */
diff --git a/makefile b/makefile
index c06ab86..bf4aa80 100644
--- a/makefile
+++ b/makefile
@@ -25,7 +25,7 @@ CWARNS = -Wall -Wextra -pedantic \
25CFLAGS = $(CWARNS) $(COPT) -std=c99 -I$(LUADIR) -fPIC 25CFLAGS = $(CWARNS) $(COPT) -std=c99 -I$(LUADIR) -fPIC
26CC = gcc 26CC = gcc
27 27
28FILES = lpvm.o lpcap.o lptree.o lpcode.o lpprint.o 28FILES = lplvm.o lplcap.o lpltree.o lplcode.o lplprint.o
29# For Linux 29# For Linux
30linux: 30linux:
31 make lpeglabel.so "DLLFLAGS = -shared -fPIC" 31 make lpeglabel.so "DLLFLAGS = -shared -fPIC"
@@ -54,9 +54,9 @@ clean:
54 rm -f $(FILES) lpeglabel.so 54 rm -f $(FILES) lpeglabel.so
55 55
56 56
57lpcap.o: lpcap.c lpcap.h lptypes.h 57lplcap.o: lplcap.c lplcap.h lpltypes.h
58lpcode.o: lpcode.c lptypes.h lpcode.h lptree.h lpvm.h lpcap.h 58lplcode.o: lplcode.c lpltypes.h lplcode.h lpltree.h lplvm.h lplcap.h
59lpprint.o: lpprint.c lptypes.h lpprint.h lptree.h lpvm.h lpcap.h 59lplprint.o: lplprint.c lpltypes.h lplprint.h lpltree.h lplvm.h lplcap.h
60lptree.o: lptree.c lptypes.h lpcap.h lpcode.h lptree.h lpvm.h lpprint.h 60lpltree.o: lpltree.c lpltypes.h lplcap.h lplcode.h lpltree.h lplvm.h lplprint.h
61lpvm.o: lpvm.c lpcap.h lptypes.h lpvm.h lpprint.h lptree.h 61lplvm.o: lplvm.c lplcap.h lpltypes.h lplvm.h lplprint.h lpltree.h
62 62