Miroirs/eliot
1
0
Fork 0
mirror of git://git.savannah.nongnu.org/eliot.git synced 2025-01-18 10:26:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

- automake 1.10 (ylwrap) naming system modification

Browse source
This commit is contained in:
Antoine Fraboulet 2007-08-04 19:57:45 +00:00
parent 5199b6b7c1
commit 33e5b23004
3 changed files with 43 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
dic/Makefile.am
View file

@ -21,10 +21,11 @@ noinst_LIBRARIES = libdic.a
INCLUDES = -I$(top_srcdir) INCLUDES = -I$(top_srcdir)
libdic_a_CFLAGS=$(DEBUGFLAGS) libdic_a_CFLAGS=$(DEBUGFLAGS)
libdic_a_YFLAGS=-d libdic_a_YFLAGS=
libdic_a_LFLAGS=
libdic_a_SOURCES= \ libdic_a_SOURCES= \
er.y \ ery.y \
er.l \ erl.l \
dic_internals.h \ dic_internals.h \
dic_search.c dic_search.h \ dic_search.c dic_search.h \
dic.c dic.h \ dic.c dic.h \
@ -33,21 +34,30 @@ libdic_a_SOURCES = \
regexp.c regexp.h \ regexp.c regexp.h \
alist.h alist.c alist.h alist.c
BUILT_SOURCES= \
libdic_a-erl.c \
libdic_a-erl.h \
libdic_a-ery.c \
libdic_a-ery.h
nodist_libdic_a_SOURCES= \ nodist_libdic_a_SOURCES= \
er.c \ libdic_a-erl.c \
scanner.h \ libdic_a-erl.h \
libdic_a-er.c \ libdic_a-ery.c \
libdic_a-er.h libdic_a-ery.h
BUILT_SOURCES=er.c \ CLEANFILES= \
scanner.h \ libdic_a-erl.c \
libdic_a-er.c \ libdic_a-erl.h \
libdic_a-er.h libdic_a-ery.c \
libdic_a-ery.h
CLEANFILES=er.c \
scanner.h \ ## automake workaround to generate .h file
libdic_a-er.c \ libdic_a-erl.h: erl.l
libdic_a-er.h ${LEX} ${srcdir}/erl.l
#####################################
##################################### #####################################
if BUILD_DICTOOLS if BUILD_DICTOOLS
@ -67,8 +77,8 @@ listdic_SOURCES= \
dic.c dic.h \ dic.c dic.h \
listdic.c listdic.c
regexp_SOURCES= regexpmain.c
#regexp_CFLAGS=-DDEBUG_RE #regexp_CFLAGS=-DDEBUG_RE
regexp_SOURCES=regexpmain.c
regexp_LDADD=libdic.a regexp_LDADD=libdic.a
endif endif

4
dic/er.l → dic/erl.l
View file

@ -20,14 +20,14 @@
#include "dic.h" #include "dic.h"
#include "regexp.h" #include "regexp.h"
#include "libdic_a-er.h" #include "libdic_a-ery.h"
#define MASK_TO_REMOVE 0x1F #define MASK_TO_REMOVE 0x1F
%} %}
%option prefix="regexp" %option prefix="regexp"
%option outfile="lex.yy.c" %option outfile="lex.yy.c"
%option header-file="scanner.h" %option header-file="libdic_a-erl.h"
%option reentrant bison-bridge %option reentrant bison-bridge
%option bison-locations %option bison-locations
%option noyywrap nounput %option noyywrap nounput

23
dic/er.y → dic/ery.y
View file

@ -25,9 +25,12 @@
#include "dic.h" #include "dic.h"
#include "regexp.h" #include "regexp.h"
#include "libdic_a-er.h" #include "libdic_a-ery.h"
#include "scanner.h" #include "libdic_a-erl.h"
/* ************************************************** */
/* ************************************************** */
/* ************************************************** */
/** /**
* function prototype for parser generated by bison * function prototype for parser generated by bison
@ -35,6 +38,7 @@
int regexpparse(yyscan_t scanner, NODE** root, int regexpparse(yyscan_t scanner, NODE** root,
struct search_RegE_list_t *list, struct search_RegE_list_t *list,
struct regexp_error_report_t *err); struct regexp_error_report_t *err);
/** /**
* function prototype for error reporting * function prototype for error reporting
*/ */
@ -43,6 +47,9 @@ void regexperror(YYLTYPE *llocp, yyscan_t scanner, NODE** root,
struct regexp_error_report_t *err, struct regexp_error_report_t *err,
char const *msg); char const *msg);
/* ************************************************** */
/* ************************************************** */
/* ************************************************** */
%} %}
%union { %union {
@ -270,8 +277,10 @@ vardis: LEX_CHAR
%% %%
void regexperror(YYLTYPE *llocp, yyscan_t yyscanner, NODE** root, #define UNUSED __attribute__((unused))
struct search_RegE_list_t *list,
void regexperror(YYLTYPE *llocp, yyscan_t UNUSED yyscanner, NODE UNUSED **root,
struct search_RegE_list_t UNUSED *list,
struct regexp_error_report_t *err, char const *msg) struct regexp_error_report_t *err, char const *msg)
{ {
err->pos1 = llocp->first_column; err->pos1 = llocp->first_column;
@ -282,8 +291,4 @@ void regexperror(YYLTYPE *llocp, yyscan_t yyscanner, NODE** root,
/* /*
* shut down the compiler * shut down the compiler
*/ */
static int yy_init_globals (yyscan_t yyscanner ) //int yy_init_globals (yyscan_t yyscanner);
{
yy_init_globals(yyscanner);
return 0;
}