diff options
author | Luigi Rizzo <rizzo@icir.org> | 2006-04-27 00:05:05 +0000 |
---|---|---|
committer | Luigi Rizzo <rizzo@icir.org> | 2006-04-27 00:05:05 +0000 |
commit | d19f767c3c1d52f82a216b47ca16e41749ed0a26 (patch) | |
tree | 1ffb0510ced01fb20509c5af6278770492910c27 /pbx/ael | |
parent | a85701655107bef4357050653465d5b285913944 (diff) |
uncomment some functions in the flex code that were actually
used in the bison code - detected by making aelparse compile
again.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22702 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx/ael')
-rw-r--r-- | pbx/ael/ael.flex | 23 | ||||
-rw-r--r-- | pbx/ael/ael_lex.c | 23 |
2 files changed, 26 insertions, 20 deletions
diff --git a/pbx/ael/ael.flex b/pbx/ael/ael.flex index fb86903a3..62e5d9720 100644 --- a/pbx/ael/ael.flex +++ b/pbx/ael/ael.flex @@ -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) { diff --git a/pbx/ael/ael_lex.c b/pbx/ael/ael_lex.c index d4103ec22..005d2ebbd 100644 --- a/pbx/ael/ael_lex.c +++ b/pbx/ael/ael_lex.c @@ -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) { |