Commit c23af0df authored by Jeroen Vreeken's avatar Jeroen Vreeken Committed by Michel Roelofs
Browse files

Flex/Bison changes

parent 4f80f683
...@@ -22,6 +22,10 @@ VPATH= /lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib ...@@ -22,6 +22,10 @@ VPATH= /lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib
@echo "BISON $<" @echo "BISON $<"
@bison -d $< @bison -d $<
%.yy.h: %.l %.tab.h
@echo " FLEX $<"
@flex --header-file=$*.yy.h $<
%.yy.c: %.l %.tab.h %.yy.c: %.l %.tab.h
@echo " FLEX $<" @echo " FLEX $<"
@flex -o $@ $< @flex -o $@ $<
......
...@@ -62,7 +62,10 @@ CONTROLLER= $(CONTROLLERSRCS:.c=.o) ...@@ -62,7 +62,10 @@ CONTROLLER= $(CONTROLLERSRCS:.c=.o)
all: il2cdir $(BLOCKS) $(CONTROLLER) controllerlib all: il2cdir $(BLOCKS) $(CONTROLLER) controllerlib
controller_load.o: controller_load_parser.tab.h
controller_load_parser.tab.o: controller_load_parser.yy.c
controller_load.o: controller_load_parser.tab.h controller_load_parser.yy.h
il2cdir: il2cdir:
@echo " SUBDIR: $@" @echo " SUBDIR: $@"
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <malloc.h> #include <malloc.h>
#include <stdbool.h> #include <stdbool.h>
#include "controller_load_parser.tab.h" #include "controller_load_parser.tab.h"
#include "controller_load_parser.yy.h"
#include "controller_load.h" #include "controller_load.h"
#include "controller_sample.h" #include "controller_sample.h"
#include <utils/dynarg.h> #include <utils/dynarg.h>
...@@ -29,16 +30,17 @@ ...@@ -29,16 +30,17 @@
static char *controller_load_filename; static char *controller_load_filename;
int yyparse(void);
void yyset_lineno (int line_number ); int yyparse(yyscan_t scanner, FILE *);
int yyget_lineno(void);
extern FILE *yyin;
static int controller_load_ret; static int controller_load_ret;
void yyerror(char const *s) void yyerror(yyscan_t scanner, char const *s)
{ {
fprintf(stderr, "%s:%d: %s\n", controller_load_filename, yyget_lineno(), s); fprintf(stderr, "%s:%d: %s\n",
controller_load_filename,
yyget_lineno(scanner),
s);
controller_load_ret = -1; controller_load_ret = -1;
} }
...@@ -176,11 +178,13 @@ void controller_load_frequency(double frequency) ...@@ -176,11 +178,13 @@ void controller_load_frequency(double frequency)
static bool controller_load_use_string = false; static bool controller_load_use_string = false;
static char *controller_load_string = NULL; static char *controller_load_string = NULL;
static size_t controller_load_stringlen = 0; static size_t controller_load_stringlen = 0;
static FILE *controller_load_input_file;
int controller_load_yy_input(char *buf, int *readbytes, int sizebytes) int controller_load_yy_input(char *buf, int *readbytes, int sizebytes)
{ {
if (!controller_load_use_string) { if (!controller_load_use_string) {
*readbytes = fread(buf, 1, sizebytes, yyin); *readbytes = fread(buf, 1, sizebytes,
controller_load_input_file);
} else { } else {
int copybytes; int copybytes;
...@@ -200,6 +204,7 @@ int controller_load_yy_input(char *buf, int *readbytes, int sizebytes) ...@@ -200,6 +204,7 @@ int controller_load_yy_input(char *buf, int *readbytes, int sizebytes)
static int controller_load_shell(char *args, char *out, int *outlen) static int controller_load_shell(char *args, char *out, int *outlen)
{ {
int ret; int ret;
yyscan_t scanner;
controller_load_string = args; controller_load_string = args;
controller_load_stringlen = strlen(args); controller_load_stringlen = strlen(args);
...@@ -207,9 +212,12 @@ static int controller_load_shell(char *args, char *out, int *outlen) ...@@ -207,9 +212,12 @@ static int controller_load_shell(char *args, char *out, int *outlen)
printf("parsing: %s\n", args); printf("parsing: %s\n", args);
yyset_lineno(0); yylex_init(&scanner);
ret = yyparse();
ret = yyparse(scanner, NULL);
yylex_destroy(scanner);
if (ret) { if (ret) {
*outlen = sprintf(out, *outlen = sprintf(out,
"failed to parse arguments\n"); "failed to parse arguments\n");
...@@ -241,16 +249,19 @@ int controller_load(char *filename) ...@@ -241,16 +249,19 @@ int controller_load(char *filename)
controller_load_filename = filename; controller_load_filename = filename;
controller_load_ret = 0; controller_load_ret = 0;
yyin = fopen(filename, "r"); yyscan_t scanner;
if (!yyin)
controller_load_input_file = fopen(filename, "r");
if (!controller_load_input_file)
return -1; return -1;
controller_load_use_string = false; controller_load_use_string = false;
yyset_lineno(0); yylex_init(&scanner);
controller_load_ret = yyparse();
controller_load_ret = yyparse(scanner, controller_load_input_file);
fclose(yyin); yylex_destroy(scanner);
yyin = NULL; fclose(controller_load_input_file);
return controller_load_ret; return controller_load_ret;
} }
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
*/ */
%option noinput %option noinput
%option reentrant
%option bison-bridge
%{ %{
#include <stdio.h> #include <stdio.h>
...@@ -25,8 +27,6 @@ ...@@ -25,8 +27,6 @@
#include "controller_load_parser.tab.h" #include "controller_load_parser.tab.h"
#include "controller_load.h" #include "controller_load.h"
static void __attribute__ ((unused)) yyunput (int c,char *buf_ptr );
#undef YY_INPUT #undef YY_INPUT
#define YY_INPUT(buf,readbytes,sizebytes) controller_load_yy_input(buf,&readbytes,sizebytes) #define YY_INPUT(buf,readbytes,sizebytes) controller_load_yy_input(buf,&readbytes,sizebytes)
...@@ -68,33 +68,33 @@ intcast "("[ \t]*"int"[ \t]*")" ...@@ -68,33 +68,33 @@ intcast "("[ \t]*"int"[ \t]*")"
{intcast} { return INTCASTSYM; } {intcast} { return INTCASTSYM; }
{string} { {string} {
yylval.string = strdup(yytext + 1); yylval->string = strdup(yytext + 1);
yylval.string[strlen(yylval.string)-1] = 0; yylval->string[strlen(yylval->string)-1] = 0;
return STRINGSYM; return STRINGSYM;
} }
{double} { {double} {
sscanf(yytext, "%lg", &yylval.dbl); sscanf(yytext, "%lg", &yylval->dbl);
return DOUBLESYM; return DOUBLESYM;
} }
{unsignedlong} { {unsignedlong} {
sscanf(yytext, "0x%lx", &yylval.ul); sscanf(yytext, "0x%lx", &yylval->ul);
return UNSIGNEDLONGSYM; return UNSIGNEDLONGSYM;
} }
{int} { {int} {
yylval.integer = atoi(yytext); yylval->integer = atoi(yytext);
return INTSYM; return INTSYM;
} }
"true" { yylval.integer = 1; return BOOLSYM; } "true" { yylval->integer = 1; return BOOLSYM; }
"false" { yylval.integer = 0; return BOOLSYM; } "false" { yylval->integer = 0; return BOOLSYM; }
[ \t\r] /* skip */ [ \t\r] /* skip */
{comment} /* skip */ {comment} /* skip */
"\n" { yyset_lineno(yyget_lineno()+1);} "\n" { yyset_lineno(yyget_lineno(yyscanner)+1, yyscanner);}
%% %%
int yywrap(void) { return 1; } int yywrap(yyscan_t scanner) { return 1; }
...@@ -25,12 +25,20 @@ ...@@ -25,12 +25,20 @@
#include <controller/controller_trace.h> #include <controller/controller_trace.h>
#include <controller/controller_sample.h> #include <controller/controller_sample.h>
void yyerror(char const *s); #define YYERROR_VERBOSE
int yylex(void);
#include <controller/controller_load_parser.tab.h>
#include <controller/controller_load_parser.yy.h>
void yyerror(yyscan_t *scanner, char const *s);
%} %}
%parse-param {yyscan_t scanner}
%lex-param {yyscan_t scanner}
%pure-parser
%start ctrllist %start ctrllist
%token BRACEOPENSYM %token BRACEOPENSYM
...@@ -89,7 +97,7 @@ block : BRACEOPENSYM ...@@ -89,7 +97,7 @@ block : BRACEOPENSYM
BRACECLOSESYM BRACECLOSESYM
{ {
if(controller_block_create($2, $4, controller_load_va_list)) if(controller_block_create($2, $4, controller_load_va_list))
yyerror("Error creating block"); yyerror(scanner, "Error creating block");
free($2); free($2);
free($4); free($4);
controller_load_var_clear(); controller_load_var_clear();
...@@ -109,7 +117,7 @@ param : BRACEOPENSYM ...@@ -109,7 +117,7 @@ param : BRACEOPENSYM
BRACECLOSESYM BRACECLOSESYM
{ {
if (controller_block_param_set($2, $4, controller_load_va_list)) if (controller_block_param_set($2, $4, controller_load_va_list))
yyerror("Error setting parameter"); yyerror(scanner, "Error setting parameter");
controller_load_var_clear(); controller_load_var_clear();
} }
; ;
...@@ -179,7 +187,7 @@ link : BRACEOPENSYM ...@@ -179,7 +187,7 @@ link : BRACEOPENSYM
BRACECLOSESYM BRACECLOSESYM
{ {
if (controller_block_connect($2, $4, $6, $8, $10)) if (controller_block_connect($2, $4, $6, $8, $10))
yyerror("Error connecting blocks"); yyerror(scanner, "Error connecting blocks");
free($2); free($2);
free($4); free($4);
free($6); free($6);
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <netdb.h> #include <netdb.h>
#include <signal.h> #include <signal.h>
#include <errno.h> #include <errno.h>
#include <limits.h>
#include "controller_block.h" #include "controller_block.h"
#include "block_setpoint_generator.h" #include "block_setpoint_generator.h"
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <netdb.h> #include <netdb.h>
#include <signal.h> #include <signal.h>
#include <errno.h> #include <errno.h>
#include <limits.h>
#include <controller/controller_block.h> #include <controller/controller_block.h>
#include <controller/controller_trace.h> #include <controller/controller_trace.h>
......
#ifndef yyHEADER_H
#define yyHEADER_H 1
#define yyIN_HEADER 1
#line 6 "il.yy.h"
#line 8 "il.yy.h"
#define YY_INT_ALIGNED short int
/* A lexical scanner generated by flex */
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
#define YY_FLEX_SUBMINOR_VERSION 35
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
/* First, we deal with platform-specific or compiler-specific issues. */
/* begin standard C headers. */
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <stdlib.h>
/* end standard C headers. */
/* flex integer type definitions */
#ifndef FLEXINT_H
#define FLEXINT_H
/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
* if you want the limit (max/min) macros for int types.
*/
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS 1
#endif
#include <inttypes.h>
typedef int8_t flex_int8_t;
typedef uint8_t flex_uint8_t;
typedef int16_t flex_int16_t;
typedef uint16_t flex_uint16_t;
typedef int32_t flex_int32_t;
typedef uint32_t flex_uint32_t;
#else
typedef signed char flex_int8_t;
typedef short int flex_int16_t;
typedef int flex_int32_t;
typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t;
#endif /* ! C99 */
/* Limits of integral types. */
#ifndef INT8_MIN
#define INT8_MIN (-128)
#endif
#ifndef INT16_MIN
#define INT16_MIN (-32767-1)
#endif
#ifndef INT32_MIN
#define INT32_MIN (-2147483647-1)
#endif
#ifndef INT8_MAX
#define INT8_MAX (127)
#endif
#ifndef INT16_MAX
#define INT16_MAX (32767)
#endif
#ifndef INT32_MAX
#define INT32_MAX (2147483647)
#endif
#ifndef UINT8_MAX
#define UINT8_MAX (255U)
#endif
#ifndef UINT16_MAX
#define UINT16_MAX (65535U)
#endif
#ifndef UINT32_MAX
#define UINT32_MAX (4294967295U)
#endif
#endif /* ! FLEXINT_H */
#ifdef __cplusplus
/* The "const" storage-class-modifier is valid. */
#define YY_USE_CONST
#else /* ! __cplusplus */
/* C99 requires __STDC__ to be defined as 1. */
#if defined (__STDC__)
#define YY_USE_CONST
#endif /* defined (__STDC__) */
#endif /* ! __cplusplus */
#ifdef YY_USE_CONST
#define yyconst const
#else
#define yyconst
#endif
/* Size of default input buffer. */
#ifndef YY_BUF_SIZE
#define YY_BUF_SIZE 16384
#endif
#ifndef YY_TYPEDEF_YY_BUFFER_STATE
#define YY_TYPEDEF_YY_BUFFER_STATE
typedef struct yy_buffer_state *YY_BUFFER_STATE;
#endif
extern int yyleng;
extern FILE *yyin, *yyout;
#ifndef YY_TYPEDEF_YY_SIZE_T
#define YY_TYPEDEF_YY_SIZE_T
typedef size_t yy_size_t;
#endif
#ifndef YY_STRUCT_YY_BUFFER_STATE
#define YY_STRUCT_YY_BUFFER_STATE
struct yy_buffer_state
{
FILE *yy_input_file;
char *yy_ch_buf; /* input buffer */
char *yy_buf_pos; /* current position in input buffer */
/* Size of input buffer in bytes, not including room for EOB
* characters.
*/
yy_size_t yy_buf_size;
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
*/
int yy_n_chars;
/* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to
* delete it.
*/
int yy_is_our_buffer;
/* Whether this is an "interactive" input source; if so, and
* if we're using stdio for input, then we want to use getc()
* instead of fread(), to make sure we stop fetching input after
* each newline.
*/
int yy_is_interactive;
/* Whether we're considered to be at the beginning of a line.
* If so, '^' rules will be active on the next match, otherwise
* not.
*/
int yy_at_bol;
int yy_bs_lineno; /**< The line count. */
int yy_bs_column; /**< The column count. */
/* Whether to try to fill the input buffer when we reach the
* end of it.
*/
int yy_fill_buffer;
int yy_buffer_status;
};
#endif /* !YY_STRUCT_YY_BUFFER_STATE */
void yyrestart (FILE *input_file );
void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer );
YY_BUFFER_STATE yy_create_buffer (FILE *file,int size );
void yy_delete_buffer (YY_BUFFER_STATE b );
void yy_flush_buffer (YY_BUFFER_STATE b );
void yypush_buffer_state (YY_BUFFER_STATE new_buffer );
void yypop_buffer_state (void );
YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size );
YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str );
YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len );
void *yyalloc (yy_size_t );
void *yyrealloc (void *,yy_size_t );
void yyfree (void * );
/* Begin user sect3 */
extern int yylineno;
extern char *yytext;
#define yytext_ptr yytext
#ifdef YY_HEADER_EXPORT_START_CONDITIONS
#define INITIAL 0
#endif
#ifndef YY_NO_UNISTD_H
/* Special case for "unistd.h", since it is non-ANSI. We include it way
* down here because we want the user's section 1 to have been scanned first.
* The user has a chance to override it with an option.
*/
#include <unistd.h>
#endif
#ifndef YY_EXTRA_TYPE
#define YY_EXTRA_TYPE void *
#endif
/* Accessor methods to globals.
These are made visible to non-reentrant scanners for convenience. */
int yylex_destroy (void );
int yyget_debug (void );
void yyset_debug (int debug_flag );
YY_EXTRA_TYPE yyget_extra (void );
void yyset_extra (YY_EXTRA_TYPE user_defined );
FILE *yyget_in (void );
void yyset_in (FILE * in_str );
FILE *yyget_out (void );
void yyset_out (FILE * out_str );
int yyget_leng (void );
char *yyget_text (void );
int yyget_lineno (void );
void yyset_lineno (int line_number );
/* Macros after this point can all be overridden by user definitions in
* section 1.
*/
#ifndef YY_SKIP_YYWRAP
#ifdef __cplusplus
extern "C" int yywrap (void );
#else
extern int yywrap (void );
#endif
#endif
#ifndef yytext_ptr
static void yy_flex_strncpy (char *,yyconst char *,int );
#endif
#ifdef YY_NEED_STRLEN
static int yy_flex_strlen (yyconst char * );
#endif
#ifndef YY_NO_INPUT
#endif
/* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE
#define YY_READ_BUF_SIZE 8192
#endif
/* Number of entries by which start-condition stack grows. */
#ifndef YY_START_STACK_INCR
#define YY_START_STACK_INCR 25
#endif
/* Default declaration of generated scanner - a define so the user can
* easily add parameters.
*/
#ifndef YY_DECL
#define YY_DECL_IS_OURS 1
extern int yylex (void);