matiec: comparison stage1

equal deleted inserted replaced

-:d926ee71f228
+:0b472e25eb16
 /* file with declaration of absyntax classes... */
 #include "../absyntax/absyntax.hh"
 /* file with declaration of token constants. Generated by bison! */
-#include "iec.y.hh"
+// #include "iec.y.hh"
-/* file with the declarations of symbol tables... */
+#include "stage1_2_priv.hh"
-#include "../util/symtable.hh"
 /* an ugly hack!!
 * We will probably not need it when we decide
 *  to cut down the abstract syntax down to size.
 #define ERROR error_exit(__FILE__,__LINE__)
 /* function defined in main.cc */
 extern void error_exit(const char *file_name, int line_no);
-/*********************************/
-/* The global symbol tables...   */
-/*********************************/
-/* NOTE: declared static because they are not accessed
-*       directly by the lexical parser (flex), but rather
-*       through the function get_identifier_token()
-*/
-/* A symbol table to store all the library elements */
-/* e.g.: <function_name , function_decl>
-*       <fb_name , fb_decl>
-*       <type_name , type_decl>
-*       <program_name , program_decl>
-*       <configuration_name , configuration_decl>
-*/
-static symtable_c<int, BOGUS_TOKEN_ID> library_element_symtable;
-/* A symbol table to store the declared variables of
-* the function currently being parsed...
-*/
-static symtable_c<int, BOGUS_TOKEN_ID> variable_name_symtable;
 /*************************/
 /* global variables...   */
 /*************************/
-static symbol_c *tree_root = NULL;
+/* NOTE: For some strange reason bison ver 2.3 is including these declarations
+*       in the iec.y.hh file, which is in turn included by flex.
-/* The name of the file currently being parsed...
+*       We cannot therefore define any variables over here, but merely declare
-* Note that flex accesses and updates this global variable
+*       their existance (otherwise we get errors when linking the code, since we
-* apropriately whenever it comes across an (*#include <filename> *)
+*       would get a new variable defined each time iec.y.hh is included!).
-* directive...
+*       Even though the variables are declared 'extern' over here, they will in
-*/
+*       fact be defined towards the end of this same file (i.e. in the prologue)
-const char *current_filename = NULL;
+*/
 /* A global flag used to tell the parser if overloaded funtions should be allowed.
 * The IEC 61131-3 standard allows overloaded funtions in the standard library,
 * but disallows them in user code...
 */
-bool allow_function_overloading = false;
+extern bool allow_function_overloading;
+/* A pointer to the root of the parsing tree that will be generated
+* by bison.
+*/
+extern symbol_c *tree_root;
 /************************/
 /* forward declarations */
 /************************/
 symbol_c *il_operator_c_2_identifier_c(symbol_c *il_operator);
 /* print an error message */
 void print_err_msg(const char *filename, int lineno, const char *additional_error_msg);
-/************************/
-/* forward declarations */
-/************************/
-/* The functions declared here are defined in iec.flex... */
-void print_include_stack(void);
-void cmd_goto_body_state(void);
-int  get_goto_body_state(void);
-void rst_goto_body_state(void);
 %}
 %glr-parser
 // %expect-rr 1
 /*****************************/
 /* Prelimenary constructs... */
 /*****************************/
-%type <leaf> start
-%type <leaf>	any_identifier
-%token <ID>	prev_declared_variable_name_token
-%token <ID>	prev_declared_fb_name_token
-%type <leaf>	prev_declared_variable_name
-%type <leaf>	prev_declared_fb_name
-%token  <ID>	prev_declared_simple_type_name_token
-%token  <ID>	prev_declared_subrange_type_name_token
-%token  <ID>	prev_declared_enumerated_type_name_token
-%token  <ID>	prev_declared_array_type_name_token
-%token  <ID>	prev_declared_structure_type_name_token
-%token  <ID>	prev_declared_string_type_name_token
-%type  <leaf>	prev_declared_simple_type_name
-%type  <leaf>	prev_declared_subrange_type_name
-%type  <leaf>	prev_declared_enumerated_type_name
-%type  <leaf>	prev_declared_array_type_name
-%type  <leaf>	prev_declared_structure_type_name
-%type  <leaf>	prev_declared_string_type_name
-%token <ID>	prev_declared_derived_function_name_token
-%token <ID>	prev_declared_derived_function_block_name_token
-%token <ID>	prev_declared_program_type_name_token
-%type  <leaf>	prev_declared_derived_function_name
-%type  <leaf>	prev_declared_derived_function_block_name
-%type  <leaf>	prev_declared_program_type_name
 /* A bogus token that, in principle, flex MUST NEVER generate */
 /* USE 1:
 * ======
 * This token is currently also being used as the default
 * initialisation value of the token_id member in
 * This means that bison cannot handle it without some
 * caoxing from ourselves. We will then need this token
 * to do the coaxing...
 */
 %token BOGUS_TOKEN_ID
+%{
+/* The interface through which bison and flex interact. */
+/* May only be included after the definition of BOGUS_TOKEN_ID */
+#include "stage1_2_priv.hh"
+%}
+%type <leaf> start
+%type <leaf>	any_identifier
+%token <ID>	prev_declared_variable_name_token
+%token <ID>	prev_declared_fb_name_token
+%type <leaf>	prev_declared_variable_name
+%type <leaf>	prev_declared_fb_name
+%token  <ID>	prev_declared_simple_type_name_token
+%token  <ID>	prev_declared_subrange_type_name_token
+%token  <ID>	prev_declared_enumerated_type_name_token
+%token  <ID>	prev_declared_array_type_name_token
+%token  <ID>	prev_declared_structure_type_name_token
+%token  <ID>	prev_declared_string_type_name_token
+%type  <leaf>	prev_declared_simple_type_name
+%type  <leaf>	prev_declared_subrange_type_name
+%type  <leaf>	prev_declared_enumerated_type_name
+%type  <leaf>	prev_declared_array_type_name
+%type  <leaf>	prev_declared_structure_type_name
+%type  <leaf>	prev_declared_string_type_name
+%token <ID>	prev_declared_derived_function_name_token
+%token <ID>	prev_declared_derived_function_block_name_token
+%token <ID>	prev_declared_program_type_name_token
+%type  <leaf>	prev_declared_derived_function_name
+%type  <leaf>	prev_declared_derived_function_block_name
+%type  <leaf>	prev_declared_program_type_name
 /* The pragmas... */
 %token <ID>	pragma_token
 %type <leaf>	pragma
 %token WSTRING
 %token STRING
 %token BOOL
-%token TIME
+// %token TIME
-%token DATE
+// %token DATE
-%token DATE_AND_TIME
+// %token DATE_AND_TIME
 %token DT
-%token TIME_OF_DAY
+// %token TIME_OF_DAY
 %token TOD
 /********************************/
 /* B 1.3.2 - Generic data types */
 %token <ID>	standard_function_block_name_token
 %token FUNCTION_BLOCK
 %token END_FUNCTION_BLOCK
 %token VAR_TEMP
-%token END_VAR
+// %token END_VAR
 %token VAR
-%token NON_RETAIN
+// %token NON_RETAIN
-%token END_VAR
+// %token END_VAR
 /**********************/
 /* B 1.5.3 - Programs */
 /**********************/
 %type  <tmp_symbol> action_header
 %type  <leaf>	action
 %type  <leaf>	transition_name
-%token ASSIGN
+// %token ASSIGN
 %token ACTION
 %token END_ACTION
 %token TRANSITION
 %token END_TRANSITION
 %token RESOURCE
 %token ON
 %token END_RESOURCE
 %token VAR_CONFIG
 %token VAR_ACCESS
-%token END_VAR
+// %token END_VAR
 %token WITH
-%token PROGRAM
+// %token PROGRAM
-%token RETAIN
+// %token RETAIN
-%token NON_RETAIN
+// %token NON_RETAIN
-%token PRIORITY
+// %token PRIORITY
 %token SINGLE
 %token INTERVAL
 %token READ_WRITE
 %token READ_ONLY
 // %type  <leaf>	unary_operator
 %type  <leaf>	primary_expression
 /* intermediate helper symbol for primary_expression */
 %type  <leaf>	function_invocation
-%token AND
+// %token AND
-%token XOR
+// %token XOR
-%token OR
+// %token OR
-%token MOD
+// %token MOD
-%token NOT
+// %token NOT
 %token OPER_NE
 %token OPER_GE
 %token OPER_LE
 %token OPER_EXP
 /*********************************/
 /* B 3.2.1 Assignment Statements */
 /*********************************/
 %type <leaf> assignment_statement
-%token ASSIGN   /* ":=" */
+// %token ASSIGN   /* ":=" */
 /*****************************************/
 /* B 3.2.2 Subprogram Control Statements */
 /*****************************************/
 %type <leaf>	fb_invocation
 %type <leaf>	param_assignment
 /* helper symbol for fb_invocation */
 %type <list> param_assignment_list
-%token ASSIGN
+// %token ASSIGN
-%token SENDTO   /* "=>" */
+// %token SENDTO   /* "=>" */
 %token RETURN
 /********************************/
 /* B 3.2.3 Selection Statements */
 %token ELSIF
 %token ELSE
 %token END_IF
 %token CASE
-%token OF
+// %token OF
-%token ELSE
+// %token ELSE
 %token END_CASE
 /********************************/
 %type <leaf>	exit_statement
 /* Integrated directly into for_statement */
 // %type <leaf>	for_list
 %token FOR
-%token ASSIGN
+// %token ASSIGN
-%token TO
+// %token TO
 %token BY
 %token DO
 %token END_FOR
 %token WHILE
-%token DO
+// %token DO
 %token END_WHILE
 %token REPEAT
 %token UNTIL
 %token END_REPEAT
 /* variables defined in code generated by flex... */
 extern FILE *yyin;
 extern int yylineno;
+/* A global flag used to tell the parser if overloaded funtions should be allowed.
+* The IEC 61131-3 standard allows overloaded funtions in the standard library,
+* but disallows them in user code...
+*/
+bool allow_function_overloading = false;
+/* A pointer to the root of the parsing tree that will be generated
+* by bison.
+*/
+symbol_c *tree_root;
 /* The following function is called automatically by bison whenever it comes across
 * an error. Unfortunately it calls this function before executing the code that handles
 * the error itself, so we cannot print out the correct line numbers of the error location
 * over here.
 * Our solution is to store the current error message in a global variable, and have all
 void print_err_msg(const char *filename, int lineno, const char *additional_error_msg) {
 fprintf(stderr, "error %d: %s\n", yynerrs, additional_error_msg);
 print_include_stack();
 fprintf(stderr, "%s:%d: %s\n", filename, lineno, current_error_msg);
-}
-/* Function only called from within flex!
-*
-* search for a symbol in either of the two symbol tables
-* declared above, and return the token id of the first
-* symbol found.
-* Searches first in the variables, and only if not found
-* does it continue searching in the library elements
-*/
-int get_identifier_token(const char *identifier_str) {
-//  std::cout << "get_identifier_token(" << identifier_str << "): \n";
-int token_id;
-if ((token_id = variable_name_symtable.find_value(identifier_str)) == variable_name_symtable.end_value())
-if ((token_id = library_element_symtable.find_value(identifier_str)) == library_element_symtable.end_value())
-return identifier_token;
-return token_id;
 }
 /* convert between an il_operator to a function name */
 if (name == NULL)
 ERROR;
 free(il_operator);
 return new identifier_c(strdup(name));
-}
-/*
-* Join two strings together. Allocate space with malloc(3).
-*/
-static char *strdup2(const char *a, const char *b) {
-char *res = (char *)malloc(strlen(a) + strlen(b) + 1);
-if (!res)
-return NULL;
-return strcat(strcpy(res, a), b);  /* safe, actually */
-}
-/*
-* Join three strings together. Allocate space with malloc(3).
-*/
-static char *strdup3(const char *a, const char *b, const char *c) {
-char *res = (char *)malloc(strlen(a) + strlen(b) + strlen(c) + 1);
-if (!res)
-return NULL;
-return strcat(strcat(strcpy(res, a), b), c);  /* safe, actually */
 }
 #define LIBFILE "ieclib.txt"
 #define DEF_LIBFILENAME LIBDIRECTORY "/" LIBFILE
-int stage1_2(const char *filename, const char *includedir, symbol_c **tree_root_ref) {
+int stage1_2__(const char *filename, const char *includedir, symbol_c **tree_root_ref) {
 FILE *in_file = NULL, *lib_file = NULL;
 char *libfilename = NULL;
 if((in_file = fopen(filename, "r")) == NULL) {
 char *errmsg = strdup2("Error opening main file ", filename);

changeset 15	0b472e25eb16
parent 13	77174ccc5471
child 17	38754701ac41