uncomment some functions in the flex code that were actually
used in the bison code - detected by making aelparse compile again. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@22702 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
rizzo
parent
127c8f0535
commit
d87a3b0d91
|
|
@ -36,7 +36,7 @@ static int parencount = 0;
|
|||
static int commaout = 0;
|
||||
static int my_lineno = 1;
|
||||
static int my_col = 0;
|
||||
static char *my_file = 0;
|
||||
char *my_file = 0; /* used also in the bison code */
|
||||
char *prev_word;
|
||||
#define MAX_INCLUDE_DEPTH 50
|
||||
|
||||
|
|
@ -544,8 +544,9 @@ static int pbcpop(char x)
|
|||
return 1; /* error */
|
||||
}
|
||||
|
||||
#if 0
|
||||
static int c_prevword(void)
|
||||
/* used by the bison code */
|
||||
int c_prevword(void);
|
||||
int c_prevword(void)
|
||||
{
|
||||
char *c = prev_word;
|
||||
int ret = 0;
|
||||
|
|
@ -564,7 +565,6 @@ static int c_prevword(void)
|
|||
}
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* compute the total number of lines and columns in the text
|
||||
* passed as argument.
|
||||
|
|
@ -586,8 +586,9 @@ static void pbcwhere(const char *text, int *line, int *col )
|
|||
*col = loc_col;
|
||||
}
|
||||
|
||||
#if 0
|
||||
static void reset_parencount(yyscan_t yyscanner )
|
||||
/* used by the bison code */
|
||||
void reset_parencount(yyscan_t yyscanner );
|
||||
void reset_parencount(yyscan_t yyscanner )
|
||||
{
|
||||
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
|
||||
parencount = 0;
|
||||
|
|
@ -597,14 +598,18 @@ static void reset_parencount(yyscan_t yyscanner )
|
|||
BEGIN(paren);
|
||||
}
|
||||
|
||||
static void reset_semicount(yyscan_t yyscanner )
|
||||
/* used by the bison code */
|
||||
void reset_semicount(yyscan_t yyscanner );
|
||||
void reset_semicount(yyscan_t yyscanner )
|
||||
{
|
||||
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
|
||||
pbcpos = 0;
|
||||
BEGIN(semic);
|
||||
}
|
||||
|
||||
static void reset_argcount(yyscan_t yyscanner )
|
||||
/* used by the bison code */
|
||||
void reset_argcount(yyscan_t yyscanner );
|
||||
void reset_argcount(yyscan_t yyscanner )
|
||||
{
|
||||
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
|
||||
parencount = 0;
|
||||
|
|
@ -615,8 +620,6 @@ static void reset_argcount(yyscan_t yyscanner )
|
|||
BEGIN(argg);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/* used elsewhere, but some local vars */
|
||||
struct pval *ael2_parse(char *filename, int *errors)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -671,7 +671,7 @@ static int parencount = 0;
|
|||
static int commaout = 0;
|
||||
static int my_lineno = 1;
|
||||
static int my_col = 0;
|
||||
static char *my_file = 0;
|
||||
char *my_file = 0; /* used also in the bison code */
|
||||
char *prev_word;
|
||||
#define MAX_INCLUDE_DEPTH 50
|
||||
|
||||
|
|
@ -2895,8 +2895,9 @@ static int pbcpop(char x)
|
|||
return 1; /* error */
|
||||
}
|
||||
|
||||
#if 0
|
||||
static int c_prevword(void)
|
||||
/* used by the bison code */
|
||||
int c_prevword(void);
|
||||
int c_prevword(void)
|
||||
{
|
||||
char *c = prev_word;
|
||||
int ret = 0;
|
||||
|
|
@ -2915,7 +2916,6 @@ static int c_prevword(void)
|
|||
}
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* compute the total number of lines and columns in the text
|
||||
* passed as argument.
|
||||
|
|
@ -2937,8 +2937,9 @@ static void pbcwhere(const char *text, int *line, int *col )
|
|||
*col = loc_col;
|
||||
}
|
||||
|
||||
#if 0
|
||||
static void reset_parencount(yyscan_t yyscanner )
|
||||
/* used by the bison code */
|
||||
void reset_parencount(yyscan_t yyscanner );
|
||||
void reset_parencount(yyscan_t yyscanner )
|
||||
{
|
||||
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
|
||||
parencount = 0;
|
||||
|
|
@ -2948,14 +2949,18 @@ static void reset_parencount(yyscan_t yyscanner )
|
|||
BEGIN(paren);
|
||||
}
|
||||
|
||||
static void reset_semicount(yyscan_t yyscanner )
|
||||
/* used by the bison code */
|
||||
void reset_semicount(yyscan_t yyscanner );
|
||||
void reset_semicount(yyscan_t yyscanner )
|
||||
{
|
||||
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
|
||||
pbcpos = 0;
|
||||
BEGIN(semic);
|
||||
}
|
||||
|
||||
static void reset_argcount(yyscan_t yyscanner )
|
||||
/* used by the bison code */
|
||||
void reset_argcount(yyscan_t yyscanner );
|
||||
void reset_argcount(yyscan_t yyscanner )
|
||||
{
|
||||
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
|
||||
parencount = 0;
|
||||
|
|
@ -2966,8 +2971,6 @@ static void reset_argcount(yyscan_t yyscanner )
|
|||
BEGIN(argg);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/* used elsewhere, but some local vars */
|
||||
struct pval *ael2_parse(char *filename, int *errors)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
#
|
||||
# Don't use ast mm routines
|
||||
#
|
||||
UTILS:=astman smsq stereorize streamplayer
|
||||
UTILS:=astman smsq stereorize streamplayer aelparse
|
||||
|
||||
ifeq (${OSARCH},SunOS)
|
||||
SOL=../strcompat.o
|
||||
|
|
@ -70,7 +70,7 @@ aelparse : ../pbx/ael/aelflex.o ../pbx/ael/aelbison.o ../pbx/pbx_ael.o ael_main.
|
|||
$(CC) $(CFLAGS) -g -o aelparse ../pbx/ael/aelflex.o ../pbx/ael/aelbison.o ael_main.o ../pbx/pbx_ael.o ../ast_expr2f.o ../ast_expr2.o
|
||||
|
||||
ael_main.o : ael_main.c ../include/asterisk/ael_structs.h
|
||||
$(CC) $(CFLAGS) -c -g -o ael_main.o ael_main.c
|
||||
$(CC) $(CFLAGS) -include ../include/autoconfig.h -c -g -o ael_main.o ael_main.c
|
||||
|
||||
ael_main1.o : ael_main.c ../include/asterisk/ael_structs.h
|
||||
$(CC) $(CFLAGS) -c -g -o ael_main1.o ael_main.c
|
||||
|
|
|
|||
|
|
@ -6,17 +6,15 @@
|
|||
#include <ctype.h>
|
||||
#if !defined(SOLARIS) && !defined(__CYGWIN__)
|
||||
#include <err.h>
|
||||
#else
|
||||
#define quad_t int64_t
|
||||
#endif
|
||||
#include <errno.h>
|
||||
#include <regex.h>
|
||||
#include <limits.h>
|
||||
#include <asterisk/ast_expr.h>
|
||||
#include <asterisk/logger.h>
|
||||
#include <asterisk/module.h>
|
||||
#include <asterisk/channel.h>
|
||||
#include <asterisk/app.h>
|
||||
#include "asterisk/ast_expr.h"
|
||||
#include "asterisk/logger.h"
|
||||
#include "asterisk/module.h"
|
||||
#include "asterisk/channel.h"
|
||||
#include "asterisk/app.h"
|
||||
#include "asterisk/ael_structs.h"
|
||||
#define AST_CONFIG_MAX_PATH 255
|
||||
|
||||
|
|
|
|||
Reference in New Issue