Skip to content

Commit 7933bf7

Browse files
committed
XS: new parrser
Signed-off-by: Masatake YAMATO <[email protected]>
1 parent aec0a1d commit 7933bf7

File tree

16 files changed

+837
-1
lines changed

16 files changed

+837
-1
lines changed

Tmain/list-roles.d/stdout-expected.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ Vera d/macro undef on undefined
114114
Vera h/header local on local header
115115
Vera h/header system on system header
116116
Verilog m/module decl on declaring instances
117+
XS M/moduleFile included on included with INCLUDE keyword
117118
Zsh f/function autoloaded on function name passed to autoload built-in command
118119
Zsh h/heredoc endmarker on end marker
119120
Zsh s/script autoloaded on autoloaded
@@ -234,6 +235,7 @@ Vera d/macro undef on undefined
234235
Vera h/header local on local header
235236
Vera h/header system on system header
236237
Verilog m/module decl on declaring instances
238+
XS M/moduleFile included on included with INCLUDE keyword
237239
Zsh f/function autoloaded on function name passed to autoload built-in command
238240
Zsh h/heredoc endmarker on end marker
239241
Zsh s/script autoloaded on autoloaded
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
--sort=no
2+
--extras-XS=-{noprefix}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
X input.xs /^MODULE = X PACKAGE = X PREFIX = xyz_$/;" m
2+
X input.xs /^MODULE = X PACKAGE = X PREFIX = xyz_$/;" p module:X
3+
xyz_f input.xs /^xyz_f(dbtype)$/;" f package:X.X typeref:typename:void
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
MODULE = X PACKAGE = X PREFIX = xyz_
2+
3+
void
4+
xyz_f(dbtype)
5+
char * dbtype

Units/parser-xs.r/pod.d/args.ctags

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
--sort=no
2+
--extras=+g
3+
--fields=+Sl

Units/parser-xs.r/pod.d/expected.tags

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
XS::Typemap input.xs /^MODULE = XS::Typemap PACKAGE = XS::Typemap$/;" m language:XS
2+
XS::Typemap input.xs /^MODULE = XS::Typemap PACKAGE = XS::Typemap$/;" p language:XS module:XS::Typemap
3+
T_SV input.xs /^T_SV( sv )$/;" f language:XS package:XS::Typemap.XS::Typemap typeref:typename:SV * signature:(SV * sv)
4+
T_SVREF input.xs /^T_SVREF( svref )$/;" f language:XS package:XS::Typemap.XS::Typemap typeref:typename:SVREF signature:(SVREF svref)
5+
intArrayPtr input.xs /^intArray * intArrayPtr( int nelem ) {$/;" f language:C typeref:typename:intArray * signature:(int nelem)
6+
TYPEMAPS input.xs /^=head1 TYPEMAPS$/;" c language:Pod

Units/parser-xs.r/pod.d/input.xs

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/* Taken from perl-5.10.1/ext/XS-Typemap/Typemap.xs */
2+
3+
/* T_ARRAY - allocate some memory */
4+
intArray * intArrayPtr( int nelem ) {
5+
intArray * array;
6+
Newx(array, nelem, intArray);
7+
return array;
8+
}
9+
10+
11+
MODULE = XS::Typemap PACKAGE = XS::Typemap
12+
13+
PROTOTYPES: DISABLE
14+
15+
=head1 TYPEMAPS
16+
17+
Each C type is represented by an entry in the typemap file that
18+
is responsible for converting perl variables (SV, AV, HV and CV) to
19+
and from that type.
20+
21+
=over 4
22+
23+
=item T_SV
24+
25+
This simply passes the C representation of the Perl variable (an SV*)
26+
in and out of the XS layer. This can be used if the C code wants
27+
to deal directly with the Perl variable.
28+
29+
=cut
30+
31+
SV *
32+
T_SV( sv )
33+
SV * sv
34+
CODE:
35+
/* create a new sv for return that is a copy of the input
36+
do not simply copy the pointer since the SV will be marked
37+
mortal by the INPUT typemap when it is pushed back onto the stack */
38+
RETVAL = sv_mortalcopy( sv );
39+
/* increment the refcount since the default INPUT typemap mortalizes
40+
by default and we don't want to decrement the ref count twice
41+
by mistake */
42+
SvREFCNT_inc(RETVAL);
43+
OUTPUT:
44+
RETVAL
45+
46+
=item T_SVREF
47+
48+
Used to pass in and return a reference to an SV.
49+
50+
=cut
51+
52+
SVREF
53+
T_SVREF( svref )
54+
SVREF svref
55+
CODE:
56+
RETVAL = svref;
57+
OUTPUT:
58+
RETVAL
59+
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
--sort=no
2+
--extras=+g
3+
--extras=+r
4+
--fields=+rSE
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
SDBM_File input.xs /^MODULE = SDBM_File PACKAGE = SDBM_File PREFIX = sdbm_$/;" m roles:def
2+
SDBM_File input.xs /^MODULE = SDBM_File PACKAGE = SDBM_File PREFIX = sdbm_$/;" p module:SDBM_File roles:def
3+
sdbm_TIEHASH input.xs /^sdbm_TIEHASH(dbtype, filename, flags, mode, pagname=NULL)$/;" f package:SDBM_File.SDBM_File typeref:typename:SDBM_File signature:(char * dbtype,char * filename,int flags,int mode,char * pagname) roles:def
4+
TIEHASH input.xs /^sdbm_TIEHASH(dbtype, filename, flags, mode, pagname=NULL)$/;" f package:SDBM_File.SDBM_File typeref:typename:SDBM_File signature:(char * dbtype,char * filename,int flags,int mode,char * pagname) roles:def extras:noprefix
5+
sdbm_DESTROY input.xs /^sdbm_DESTROY(db)$/;" f package:SDBM_File.SDBM_File typeref:typename:void signature:(SDBM_File db) roles:def
6+
DESTROY input.xs /^sdbm_DESTROY(db)$/;" f package:SDBM_File.SDBM_File typeref:typename:void signature:(SDBM_File db) roles:def extras:noprefix
7+
sdbm_FETCH input.xs /^sdbm_FETCH(db, key)$/;" f package:SDBM_File.SDBM_File typeref:typename:datum_value signature:(SDBM_File db,datum_key key) roles:def
8+
FETCH input.xs /^sdbm_FETCH(db, key)$/;" f package:SDBM_File.SDBM_File typeref:typename:datum_value signature:(SDBM_File db,datum_key key) roles:def extras:noprefix
9+
sdbm_STORE input.xs /^sdbm_STORE(db, key, value, flags = DBM_REPLACE)$/;" f package:SDBM_File.SDBM_File typeref:typename:int signature:(SDBM_File db,datum_key key,datum_value value,int flags) roles:def
10+
STORE input.xs /^sdbm_STORE(db, key, value, flags = DBM_REPLACE)$/;" f package:SDBM_File.SDBM_File typeref:typename:int signature:(SDBM_File db,datum_key key,datum_value value,int flags) roles:def extras:noprefix
11+
sdbm_DELETE input.xs /^sdbm_DELETE(db, key)$/;" f package:SDBM_File.SDBM_File typeref:typename:int signature:(SDBM_File db,datum_key key) roles:def
12+
DELETE input.xs /^sdbm_DELETE(db, key)$/;" f package:SDBM_File.SDBM_File typeref:typename:int signature:(SDBM_File db,datum_key key) roles:def extras:noprefix
13+
sdbm_EXISTS input.xs /^sdbm_EXISTS(db,key)$/;" f package:SDBM_File.SDBM_File typeref:typename:int signature:(SDBM_File db,datum_key key) roles:def
14+
EXISTS input.xs /^sdbm_EXISTS(db,key)$/;" f package:SDBM_File.SDBM_File typeref:typename:int signature:(SDBM_File db,datum_key key) roles:def extras:noprefix
15+
sdbm_FIRSTKEY input.xs /^sdbm_FIRSTKEY(db)$/;" f package:SDBM_File.SDBM_File typeref:typename:datum_key signature:(SDBM_File db) roles:def
16+
FIRSTKEY input.xs /^sdbm_FIRSTKEY(db)$/;" f package:SDBM_File.SDBM_File typeref:typename:datum_key signature:(SDBM_File db) roles:def extras:noprefix
17+
sdbm_NEXTKEY input.xs /^sdbm_NEXTKEY(db, key)$/;" f package:SDBM_File.SDBM_File typeref:typename:datum_key signature:(SDBM_File db) roles:def
18+
NEXTKEY input.xs /^sdbm_NEXTKEY(db, key)$/;" f package:SDBM_File.SDBM_File typeref:typename:datum_key signature:(SDBM_File db) roles:def extras:noprefix
19+
sdbm_error input.xs /^sdbm_error(db)$/;" f package:SDBM_File.SDBM_File typeref:typename:int signature:(SDBM_File db) roles:def
20+
error input.xs /^sdbm_error(db)$/;" f package:SDBM_File.SDBM_File typeref:typename:int signature:(SDBM_File db) roles:def extras:noprefix
21+
sdbm_clearerr input.xs /^ sdbm_clearerr = 1$/;" a function:SDBM_File.SDBM_File.sdbm_error roles:def
22+
filter_fetch_key input.xs /^filter_fetch_key(db, code)$/;" f package:SDBM_File.SDBM_File typeref:typename:SV * signature:(SDBM_File db,SV * code,SV * RETVAL) roles:def
23+
SDBM_File::filter_fetch_key input.xs /^ SDBM_File::filter_fetch_key = fetch_key$/;" a function:SDBM_File.SDBM_File.filter_fetch_key roles:def
24+
SDBM_File::filter_store_key input.xs /^ SDBM_File::filter_store_key = store_key$/;" a function:SDBM_File.SDBM_File.filter_fetch_key roles:def
25+
SDBM_File::filter_fetch_value input.xs /^ SDBM_File::filter_fetch_value = fetch_value$/;" a function:SDBM_File.SDBM_File.filter_fetch_key roles:def
26+
SDBM_File::filter_store_value input.xs /^ SDBM_File::filter_store_value = store_value$/;" a function:SDBM_File.SDBM_File.filter_fetch_key roles:def
27+
SDBM_File input.xs /^MODULE = SDBM_File PACKAGE = SDBM_X PREFIX = sdbm_X_$/;" m roles:def
28+
SDBM_X input.xs /^MODULE = SDBM_File PACKAGE = SDBM_X PREFIX = sdbm_X_$/;" p module:SDBM_File roles:def
29+
constants.xs input.xs /^INCLUDE: constants.xs$/;" M roles:included extras:reference
30+
sdbm_X_DELETE0 input.xs /^sdbm_X_DELETE0(db, key)$/;" f package:SDBM_File.SDBM_X typeref:typename:int signature:(SDBM_File db,datum_key key) roles:def
31+
DELETE0 input.xs /^sdbm_X_DELETE0(db, key)$/;" f package:SDBM_File.SDBM_X typeref:typename:int signature:(SDBM_File db,datum_key key) roles:def extras:noprefix
32+
sdbm_X_DELETE1 input.xs /^sdbm_X_DELETE1(db, key)$/;" f package:SDBM_File.SDBM_X typeref:typename:int signature:(SDBM_File db,datum_key key) roles:def
33+
DELETE1 input.xs /^sdbm_X_DELETE1(db, key)$/;" f package:SDBM_File.SDBM_X typeref:typename:int signature:(SDBM_File db,datum_key key) roles:def extras:noprefix
34+
sin0 input.xs /^sin0()$/;" f package:SDBM_File.SDBM_X typeref:typename:double signature:() roles:def
35+
sin1 input.xs /^sin1();$/;" f package:SDBM_File.SDBM_X typeref:typename:double signature:() roles:def
36+
PERL_NO_GET_CONTEXT input.xs /^#define PERL_NO_GET_CONTEXT$/;" d file: roles:def extras:fileScope,guest
37+
EXTERN.h input.xs /^#include "EXTERN.h"/;" h roles:local extras:reference,guest
38+
perl.h input.xs /^#include "perl.h"/;" h roles:local extras:reference,guest
39+
XSUB.h input.xs /^#include "XSUB.h"/;" h roles:local extras:reference,guest
40+
sdbm.h input.xs /^#include "sdbm.h"/;" h roles:local extras:reference,guest
41+
fetch_key input.xs /^#define fetch_key /;" d file: roles:def extras:fileScope,guest
42+
store_key input.xs /^#define store_key /;" d file: roles:def extras:fileScope,guest
43+
fetch_value input.xs /^#define fetch_value /;" d file: roles:def extras:fileScope,guest
44+
store_value input.xs /^#define store_value /;" d file: roles:def extras:fileScope,guest
45+
__anoned1397e40108 input.xs /^typedef struct {$/;" s file: roles:def extras:fileScope,guest,anonymous
46+
dbp input.xs /^ DBM * dbp ;$/;" m struct:__anoned1397e40108 typeref:typename:DBM * file: roles:def extras:fileScope,guest
47+
filter input.xs /^ SV * filter[4];$/;" m struct:__anoned1397e40108 typeref:typename:SV * [4] file: roles:def extras:fileScope,guest
48+
filtering input.xs /^ int filtering ;$/;" m struct:__anoned1397e40108 typeref:typename:int file: roles:def extras:fileScope,guest
49+
SDBM_File_type input.xs /^ } SDBM_File_type;$/;" t typeref:struct:__anoned1397e40108 file: roles:def extras:fileScope,guest
50+
SDBM_File input.xs /^typedef SDBM_File_type * SDBM_File ;$/;" t typeref:typename:SDBM_File_type * file: roles:def extras:fileScope,guest
51+
datum_key input.xs /^typedef datum datum_key ;$/;" t typeref:typename:datum file: roles:def extras:fileScope,guest
52+
datum_value input.xs /^typedef datum datum_value ;$/;" t typeref:typename:datum file: roles:def extras:fileScope,guest
53+
sdbm_FETCH input.xs /^#define sdbm_FETCH(/;" d file: signature:(db,key) roles:def extras:fileScope,guest
54+
sdbm_STORE input.xs /^#define sdbm_STORE(/;" d file: signature:(db,key,value,flags) roles:def extras:fileScope,guest
55+
sdbm_DELETE input.xs /^#define sdbm_DELETE(/;" d file: signature:(db,key) roles:def extras:fileScope,guest
56+
sdbm_EXISTS input.xs /^#define sdbm_EXISTS(/;" d file: signature:(db,key) roles:def extras:fileScope,guest
57+
sdbm_FIRSTKEY input.xs /^#define sdbm_FIRSTKEY(/;" d file: signature:(db) roles:def extras:fileScope,guest
58+
sdbm_NEXTKEY input.xs /^#define sdbm_NEXTKEY(/;" d file: signature:(db,key) roles:def extras:fileScope,guest
59+
X input.xs /^#define X "X"/;" d file: roles:def extras:fileScope,guest
60+
Y input.xs /^#define Y "Y"/;" d file: roles:def extras:fileScope,guest
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
pcre2
Lines changed: 167 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
1+
/* Derrive from perl5/ext/SDBM_File/SDBM_File.xs */
2+
#define PERL_NO_GET_CONTEXT
3+
#include "EXTERN.h"
4+
#include "perl.h"
5+
#include "XSUB.h"
6+
#include "sdbm.h"
7+
8+
#define fetch_key 0
9+
#define store_key 1
10+
#define fetch_value 2
11+
#define store_value 3
12+
13+
typedef struct {
14+
DBM * dbp ;
15+
SV * filter[4];
16+
int filtering ;
17+
} SDBM_File_type;
18+
19+
typedef SDBM_File_type * SDBM_File ;
20+
typedef datum datum_key ;
21+
typedef datum datum_value ;
22+
23+
#define sdbm_FETCH(db,key) sdbm_fetch(db->dbp,key)
24+
#define sdbm_STORE(db,key,value,flags) sdbm_store(db->dbp,key,value,flags)
25+
#define sdbm_DELETE(db,key) sdbm_delete(db->dbp,key)
26+
#define sdbm_EXISTS(db,key) sdbm_exists(db->dbp,key)
27+
#define sdbm_FIRSTKEY(db) sdbm_firstkey(db->dbp)
28+
#define sdbm_NEXTKEY(db,key) sdbm_nextkey(db->dbp)
29+
30+
31+
MODULE = SDBM_File PACKAGE = SDBM_File PREFIX = sdbm_
32+
33+
PROTOTYPES: DISABLE
34+
35+
SDBM_File
36+
sdbm_TIEHASH(dbtype, filename, flags, mode, pagname=NULL)
37+
char * dbtype
38+
char * filename
39+
int flags
40+
int mode
41+
char * pagname
42+
CODE:
43+
{
44+
DBM * dbp ;
45+
46+
RETVAL = NULL ;
47+
if (pagname == NULL) {
48+
dbp = sdbm_open(filename, flags, mode);
49+
}
50+
else {
51+
dbp = sdbm_prep(filename, pagname, flags, mode);
52+
}
53+
if (dbp) {
54+
RETVAL = (SDBM_File)safecalloc(1, sizeof(SDBM_File_type));
55+
RETVAL->dbp = dbp ;
56+
}
57+
58+
}
59+
OUTPUT:
60+
RETVAL
61+
62+
void
63+
sdbm_DESTROY(db)
64+
SDBM_File db
65+
CODE:
66+
if (db) {
67+
int i = store_value;
68+
sdbm_close(db->dbp);
69+
do {
70+
if (db->filter[i])
71+
SvREFCNT_dec_NN(db->filter[i]);
72+
} while (i-- > 0);
73+
safefree(db) ;
74+
}
75+
76+
datum_value
77+
sdbm_FETCH(db, key)
78+
SDBM_File db
79+
datum_key key
80+
81+
int
82+
sdbm_STORE(db, key, value, flags = DBM_REPLACE)
83+
SDBM_File db
84+
datum_key key
85+
datum_value value
86+
int flags
87+
CLEANUP:
88+
if (RETVAL) {
89+
if (RETVAL < 0 && errno == EPERM)
90+
croak("No write permission to sdbm file");
91+
croak("sdbm store returned %d, errno %d, key \"%s\"",
92+
RETVAL,errno,key.dptr);
93+
sdbm_clearerr(db->dbp);
94+
}
95+
96+
int
97+
sdbm_DELETE(db, key)
98+
SDBM_File db
99+
datum_key key
100+
101+
int
102+
sdbm_EXISTS(db,key)
103+
SDBM_File db
104+
datum_key key
105+
106+
datum_key
107+
sdbm_FIRSTKEY(db)
108+
SDBM_File db
109+
110+
datum_key
111+
sdbm_NEXTKEY(db, key)
112+
SDBM_File db
113+
114+
int
115+
sdbm_error(db)
116+
SDBM_File db
117+
ALIAS:
118+
sdbm_clearerr = 1
119+
CODE:
120+
RETVAL = ix ? sdbm_clearerr(db->dbp) : sdbm_error(db->dbp);
121+
OUTPUT:
122+
RETVAL
123+
124+
SV *
125+
filter_fetch_key(db, code)
126+
SDBM_File db
127+
SV * code
128+
SV * RETVAL = &PL_sv_undef ;
129+
ALIAS:
130+
SDBM_File::filter_fetch_key = fetch_key
131+
SDBM_File::filter_store_key = store_key
132+
SDBM_File::filter_fetch_value = fetch_value
133+
SDBM_File::filter_store_value = store_value
134+
CODE:
135+
DBM_setFilter(db->filter[ix], code);
136+
137+
BOOT:
138+
{
139+
HV *stash = gv_stashpvs("SDBM_File", 1);
140+
newCONSTSUB(stash, "PAGFEXT", newSVpvs(PAGFEXT));
141+
newCONSTSUB(stash, "DIRFEXT", newSVpvs(DIRFEXT));
142+
newCONSTSUB(stash, "PAIRMAX", newSVuv(PAIRMAX));
143+
}
144+
145+
MODULE = SDBM_File PACKAGE = SDBM_X PREFIX = sdbm_X_
146+
147+
INCLUDE: constants.xs
148+
149+
int
150+
sdbm_X_DELETE0(db, key)
151+
SDBM_File db
152+
datum_key key
153+
154+
#define X "X"
155+
156+
int
157+
sdbm_X_DELETE1(db, key)
158+
SDBM_File db
159+
datum_key key
160+
161+
#define Y "Y"
162+
163+
double
164+
sin0()
165+
166+
double
167+
sin1();

docs/news.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,7 @@ The following parsers have been added:
482482
* TypeScript
483483
* Varlink *peg/packcc*
484484
* WindRes
485+
* XS *optlib pcre2*
485486
* XSLT v1.0 *libxml*
486487
* Yacc
487488
* Yaml *libyaml*

main/parsers_p.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848

4949
#ifdef HAVE_PCRE2
5050
#define OPTLIB2C_PCRE2_PARSER_LIST \
51-
RDocParser
51+
RDocParser, \
52+
XSParser
5253
#else
5354
#define OPTLIB2C_PCRE2_PARSER_LIST
5455
#endif

0 commit comments

Comments
 (0)