Merge pull request #65 from GTkorvo/TypeID

Change type_id name to avoid problems with OSX14
GTkorvo · Sep 19, 2023 · 67e411c · 67e411c
2 parents 2f3fe98 + cadab42
commit 67e411c
Show file tree

Hide file tree

Showing 12 changed files with 52 additions and 121 deletions.
diff --git a/cod/cod.l b/cod/cod.l
@@ -183,7 +183,7 @@ return			{RETURN(RETURN_TOKEN);}
 [A-Za-z_][A-Za-z0-9_]*	{
 				yylval.info.string = create_string_from_yytext();
 				if (is_defined_type(yylval.info.string)) {
-				    RETURN(type_id);
+				    RETURN(type_identifier);
 				} else if (is_enumeration_constant(yylval.info.string)) {
 				    RETURN(enumeration_constant);
 				} else {

diff --git a/cod/cod.y b/cod/cod.y
@@ -286,7 +286,7 @@ cod_dup_list(sm_list list)
 %token <info> string_constant
 %token <info> floating_constant
 %token <info> identifier_ref
-%token <info> type_id
+%token <info> type_identifier
 %token <info> enumeration_constant
 
 %type <info> struct_or_union;
@@ -1039,7 +1039,7 @@ type_specifier:
 	    $$->node.type_specifier.lx_srcpos = $1.lx_srcpos;
 	    $$->node.type_specifier.token = STRING;
 	}
-	| type_id {
+	| type_identifier {
 	    $$ = cod_new_identifier();
 	    $$->node.identifier.lx_srcpos = $1.lx_srcpos;
 	    $$->node.identifier.id = $1.string;

diff --git a/cod/pregen_source/Linux/cod.l b/cod/pregen_source/Linux/cod.l
@@ -71,8 +71,7 @@ extern int my_yy_input();
 #endif
 static
 int
-is_defined_type(id)
-char *id;
+is_defined_type(char *id)
 {
     int i = 0;
     while(types && types[i]) {
@@ -83,8 +82,7 @@ char *id;
 }
 static
 int
-is_enumeration_constant(id)
-char *id;
+is_enumeration_constant(char *id)
 {
     int i = 0;
     while(enums && enums[i]) {
@@ -185,7 +183,7 @@ return			{RETURN(RETURN_TOKEN);}
 [A-Za-z_][A-Za-z0-9_]*	{
 				yylval.info.string = create_string_from_yytext();
 				if (is_defined_type(yylval.info.string)) {
-				    RETURN(type_id);
+				    RETURN(type_identifier);
 				} else if (is_enumeration_constant(yylval.info.string)) {
 				    RETURN(enumeration_constant);
 				} else {
@@ -329,7 +327,7 @@ static char *create_string_from_yytext()
 
 static void check_strbuf()
 {
-    int cur_len = string_buf_ptr - string_buffer;
+    intptr_t cur_len = string_buf_ptr - string_buffer;
     if ((cur_len + 1) == buffer_len) {
 	buffer_len += 20;
 	string_buffer = realloc(string_buffer, buffer_len + 1);
@@ -361,87 +359,21 @@ yywrap YY_PROTO(( void ))
 }
 
 
-#ifndef input
 /* flex, not lex */
 void yy_delete_buffer YY_PROTO((YY_BUFFER_STATE b));
 
-#ifdef WINNT
-/* old Windows code for MKS Toolkit version of flex */
-
-static void 
-terminate_string_parse()
-{
-    yyrestart(NULL);
-}
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_alloc( yy_size_t size )
-#else
-static void *yy_flex_alloc( size )
-yy_size_t size;
-#endif
-	{
-	return (void *) malloc( size );
-	}
-
-static char* current_input_string;
-
-int my_yy_input(buf,result,max_size) {
-
-      if (current_input_string == NULL) 
-      {
-
-           result = 0;
-      }
-      else
-           if (max_size < strlen(current_input_string)) 
-	   {
-	        memcpy((void*)buf, current_input_string, max_size);
-		current_input_string += max_size;
-		result = max_size;
-	   } else {
-	        int n = strlen(current_input_string);
-		memcpy((void*)buf, current_input_string, n+1);
-		current_input_string = NULL;
-		result = n;
-	   }
-
-/*      printf("my_yy_input buf[%s],result[%d]\n",buf,result);*/
-      return result;
-}
-
-static void
-setup_for_string_parse(string, defined_types, enum_constants)
-const char *string;
-char **defined_types;
-char **enum_constants;
-{
-    type_count = defined_type_count;
-    types = defined_types;
-    enums = enum_constants;
-
-    current_input_string = string;
-    lex_offset = 1;
-    line_count = 1;
-}
-#else
 
 static YY_BUFFER_STATE bb = NULL;
 
 static void
-reset_types_table(defined_types, enumerated_constants)
-char **defined_types;
-char **enumerated_constants;
+reset_types_table(char **defined_types, char **enumerated_constants)
 {
     types = defined_types;
     enums = enumerated_constants;
 }
 
 static void
-setup_for_string_parse(string, defined_types, enum_constants)
-const char *string;
-char **defined_types;
-char **enum_constants;
+setup_for_string_parse(const char *string, char **defined_types, char **enum_constants)
 {
     types = defined_types;
     enums = enum_constants;
@@ -462,5 +394,3 @@ terminate_string_parse()
 	}
 }
 
-#endif
-#endif
diff --git a/cod/pregen_source/Linux/cod.tab.c b/cod/pregen_source/Linux/cod.tab.c
@@ -146,7 +146,7 @@
      string_constant = 335,
      floating_constant = 336,
      identifier_ref = 337,
-     type_id = 338,
+     type_identifier = 338,
      enumeration_constant = 339
    };
 #endif
@@ -231,7 +231,7 @@
 #define string_constant 335
 #define floating_constant 336
 #define identifier_ref 337
-#define type_id 338
+#define type_identifier 338
 #define enumeration_constant 339
 
 
@@ -891,7 +891,7 @@ static const char *const yytname[] =
   "STATIC", "EXTERN_TOKEN", "STRUCT", "ENUM", "UNION", "CONST", "SIZEOF",
   "TYPEDEF", "RETURN_TOKEN", "CONTINUE", "BREAK", "GOTO", "PRINT", "COMMA",
   "DOTDOTDOT", "integer_constant", "character_constant", "string_constant",
-  "floating_constant", "identifier_ref", "type_id", "enumeration_constant",
+  "floating_constant", "identifier_ref", "type_identifier", "enumeration_constant",
   "$accept", "start", "primary_expression", "postfix_expression",
   "argument_expression_list", "unary_expression", "unary_operator",
   "cast_expression", "multiplicative_expression", "additive_expression",

diff --git a/cod/pregen_source/Linux/cod.tab.h b/cod/pregen_source/Linux/cod.tab.h
@@ -119,7 +119,7 @@
      string_constant = 335,
      floating_constant = 336,
      identifier_ref = 337,
-     type_id = 338,
+     type_identifier = 338,
      enumeration_constant = 339
    };
 #endif
@@ -204,15 +204,15 @@
 #define string_constant 335
 #define floating_constant 336
 #define identifier_ref 337
-#define type_id 338
+#define type_identifier 338
 #define enumeration_constant 339
 
 
 
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 187 "cod/cod.y"
+#line 201 "cod/cod.y"
 {
     lx_info info;
     sm_ref reference;

diff --git a/cod/pregen_source/Linux/cod.y b/cod/pregen_source/Linux/cod.y
@@ -286,7 +286,7 @@ cod_dup_list(sm_list list)
 %token <info> string_constant
 %token <info> floating_constant
 %token <info> identifier_ref
-%token <info> type_id
+%token <info> type_identifier
 %token <info> enumeration_constant
 
 %type <info> struct_or_union;
@@ -1039,7 +1039,7 @@ type_specifier:
 	    $$->node.type_specifier.lx_srcpos = $1.lx_srcpos;
 	    $$->node.type_specifier.token = STRING;
 	}
-	| type_id {
+	| type_identifier {
 	    $$ = cod_new_identifier();
 	    $$->node.identifier.lx_srcpos = $1.lx_srcpos;
 	    $$->node.identifier.id = $1.string;