qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-13 00:24:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

detect re-declaring identifiers as different types (typedef, enum, var, etc)

Browse source 
This is an imperfect revision of history.
This commit is contained in:
Bill Currie 2004-11-02 07:02:00 +00:00 committed by Jeff Teunissen
parent a2e05dbe83
commit fff41d664a
4 changed files with 78 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tools/qfcc/include/type.h
View file

@ -48,6 +48,12 @@ typedef struct type_s {
} s; } s;
} type_t; } type_t;
typedef struct typedef_s {
struct typedef_s *next;
const char *name;
type_t *type;
} typedef_t;
extern type_t type_void; extern type_t type_void;
extern type_t type_string; extern type_t type_string;
extern type_t type_float; extern type_t type_float;
@ -86,7 +92,7 @@ struct dstring_s;
type_t *new_type (void); type_t *new_type (void);
type_t *find_type (type_t *new); type_t *find_type (type_t *new);
void new_typedef (const char *name, type_t *type); void new_typedef (const char *name, type_t *type);
type_t *get_typedef (const char *name); typedef_t *get_typedef (const char *name);
type_t *field_type (type_t *aux); type_t *field_type (type_t *aux);
type_t *pointer_type (type_t *aux); type_t *pointer_type (type_t *aux);
type_t *array_type (type_t *aux, int size); type_t *array_type (type_t *aux, int size);

8
tools/qfcc/source/qc-lex.l
View file

@ -356,7 +356,7 @@ type_or_name (char *token)
{ {
static hashtab_t *keyword_tab; static hashtab_t *keyword_tab;
keyword_t *keyword; keyword_t *keyword;
type_t *type; typedef_t *typename;
class_t *class; class_t *class;
if (!keyword_tab) { if (!keyword_tab) {
@ -378,9 +378,9 @@ type_or_name (char *token)
if (token[0] == '@') { if (token[0] == '@') {
return '@'; return '@';
} }
if ((type = get_typedef (token))) { if ((typename = get_typedef (token))) {
yylval.type = type; yylval.typename = typename;
return TYPE; return TYPE_NAME;
} }
if ((class = get_class (token, 0))) { if ((class = get_class (token, 0))) {
yylval.string_val = save_string (token); yylval.string_val = save_string (token);

91
tools/qfcc/source/qc-parse.y
View file

@ -102,6 +102,7 @@ expr_t *argv_expr (void);
struct def_s *def; struct def_s *def;
struct hashtab_s *def_list; struct hashtab_s *def_list;
struct type_s *type; struct type_s *type;
struct typedef_s *typename;
struct expr_s *expr; struct expr_s *expr;
int integer_val; int integer_val;
float float_val; float float_val;
@ -148,6 +149,7 @@ expr_t *argv_expr (void);
%token SWITCH CASE DEFAULT STRUCT UNION ENUM TYPEDEF SUPER SELF THIS %token SWITCH CASE DEFAULT STRUCT UNION ENUM TYPEDEF SUPER SELF THIS
%token ARGS ARGC ARGV EXTERN STATIC SYSTEM SIZEOF %token ARGS ARGC ARGV EXTERN STATIC SYSTEM SIZEOF
%token <type> TYPE %token <type> TYPE
%token <typename> TYPE_NAME
%token CLASS DEFS ENCODE END IMPLEMENTATION INTERFACE PRIVATE PROTECTED %token CLASS DEFS ENCODE END IMPLEMENTATION INTERFACE PRIVATE PROTECTED
%token PROTOCOL PUBLIC SELECTOR %token PROTOCOL PUBLIC SELECTOR
@ -167,8 +169,9 @@ expr_t *argv_expr (void);
%type <function> begin_function %type <function> begin_function
%type <def_list> save_inits %type <def_list> save_inits
%type <switch_block> switch_block %type <switch_block> switch_block
%type <string_val> identifier
%type <string_val> selector reserved_word maybe_class %type <string_val> selector reserved_word
%type <param> optparmlist unaryselector keyworddecl keywordselector %type <param> optparmlist unaryselector keyworddecl keywordselector
%type <method> methodproto methoddecl %type <method> methodproto methoddecl
%type <expr> obj_expr identifier_list obj_messageexpr obj_string receiver %type <expr> obj_expr identifier_list obj_messageexpr obj_string receiver
@ -216,17 +219,17 @@ def
| storage_class simple_def { current_storage = st_global; } | storage_class simple_def { current_storage = st_global; }
| storage_class '{' simple_defs '}' ';' | storage_class '{' simple_defs '}' ';'
{ current_storage = st_global; } { current_storage = st_global; }
| STRUCT NAME | STRUCT identifier
{ current_struct = new_struct ($2); } '=' '{' struct_defs '}' ';' { } { current_struct = new_struct ($2); } opt_eq '{' struct_defs '}' ';' { }
| UNION NAME | UNION identifier
{ current_struct = new_union ($2); } '=' '{' struct_defs '}' ';' { } { current_struct = new_union ($2); } opt_eq '{' struct_defs '}' ';' { }
| STRUCT NAME ';' { decl_struct ($2); } | STRUCT identifier ';' { decl_struct ($2); }
| UNION NAME ';' { decl_union ($2); } | UNION identifier ';' { decl_union ($2); }
| ENUM '{' enum_list opt_comma '}' ';' | ENUM '{' enum_list opt_comma '}' ';'
{ process_enum ($3); } { process_enum ($3); }
| TYPEDEF type NAME ';' | TYPEDEF type identifier ';'
{ new_typedef ($3, $2); } { new_typedef ($3, $2); }
| TYPEDEF ENUM '{' enum_list opt_comma '}' NAME ';' | TYPEDEF ENUM '{' enum_list opt_comma '}' identifier ';'
{ {
process_enum ($4); process_enum ($4);
new_typedef ($7, &type_integer); new_typedef ($7, &type_integer);
@ -294,7 +297,7 @@ storage_class
struct_defs struct_defs
: /* empty */ : /* empty */
| struct_defs struct_def ';' | struct_defs struct_def ';'
| DEFS '(' maybe_class ')' | DEFS '(' identifier ')'
{ {
class_t *class = get_class ($3, 0); class_t *class = get_class ($3, 0);
@ -324,8 +327,8 @@ enum_list
; ;
enum enum
: NAME { $$ = new_name_expr ($1); } : identifier { $$ = new_name_expr ($1); }
| NAME '=' fexpr | identifier '=' fexpr
{ {
$$ = 0; $$ = 0;
$3 = constant_expr ($3); $3 = constant_expr ($3);
@ -371,6 +374,7 @@ non_field_type
type_name type_name
: TYPE { $$ = $1; } : TYPE { $$ = $1; }
| TYPE_NAME { $$ = $1->type; }
| CLASS_NAME | CLASS_NAME
{ {
class_t *class = get_class ($1, 0); class_t *class = get_class ($1, 0);
@ -380,8 +384,8 @@ type_name
} }
$$ = class->type; $$ = class->type;
} }
| STRUCT NAME { $$ = decl_struct ($2)->type; } | STRUCT identifier { $$ = decl_struct ($2)->type; }
| UNION NAME { $$ = decl_union ($2)->type; } | UNION identifier { $$ = decl_union ($2)->type; }
; ;
function_decl function_decl
@ -412,7 +416,7 @@ param_list
; ;
param param
: type NAME { $$ = new_param (0, $1, $2); } : type identifier { $$ = new_param (0, $1, $2); }
; ;
array_decl array_decl
@ -434,7 +438,10 @@ struct_def_list
; ;
struct_def_item struct_def_item
: NAME { new_struct_field (current_struct, $<type>0, $1, vis_public); } : identifier
{
new_struct_field (current_struct, $<type>0, $1, vis_public);
}
; ;
def_list def_list
@ -498,7 +505,7 @@ code_func
; ;
def_name def_name
: NAME : identifier
{ {
if (current_scope->type == sc_local if (current_scope->type == sc_local
&& current_scope->parent->type == sc_params) { && current_scope->parent->type == sc_params) {
@ -1114,6 +1121,14 @@ string_val
} }
; ;
identifier
: NAME
| CLASS_NAME
| TYPE_NAME { $$ = $1->name; }
;
// Objective-QC stuff
obj_def obj_def
: classdef { } : classdef { }
| classdecl | classdecl
@ -1130,12 +1145,12 @@ obj_def
; ;
identifier_list identifier_list
: maybe_class : identifier
{ {
$$ = new_block_expr (); $$ = new_block_expr ();
append_expr ($$, new_name_expr ($1)); append_expr ($$, new_name_expr ($1));
} }
| identifier_list ',' maybe_class | identifier_list ',' identifier
{ {
append_expr ($1, new_name_expr ($3)); append_expr ($1, new_name_expr ($3));
$$ = $1; $$ = $1;
@ -1151,13 +1166,8 @@ classdecl
} }
; ;
maybe_class
: NAME
| CLASS_NAME
;
class_name class_name
: maybe_class : identifier
{ {
$$ = get_class ($1, 0); $$ = get_class ($1, 0);
if (!$$) { if (!$$) {
@ -1168,7 +1178,7 @@ class_name
; ;
new_class_name new_class_name
: maybe_class : identifier
{ {
$$ = get_class ($1, 1); $$ = get_class ($1, 1);
if ($$->defined) { if ($$->defined) {
@ -1196,7 +1206,7 @@ new_class_with_super
; ;
category_name category_name
: maybe_class '(' maybe_class ')' : identifier '(' identifier ')'
{ {
$$ = get_category ($1, $3, 0); $$ = get_category ($1, $3, 0);
if (!$$) { if (!$$) {
@ -1207,7 +1217,7 @@ category_name
; ;
new_category_name new_category_name
: maybe_class '(' maybe_class ')' : identifier '(' identifier ')'
{ {
$$ = get_category ($1, $3, 1); $$ = get_category ($1, $3, 1);
if ($$->defined) { if ($$->defined) {
@ -1218,7 +1228,7 @@ new_category_name
; ;
protocol_name protocol_name
: maybe_class : identifier
{ {
$$ = get_protocol ($1, 0); $$ = get_protocol ($1, 0);
if ($$) { if ($$) {
@ -1281,12 +1291,11 @@ protocolrefs
; ;
protocol_list protocol_list
: maybe_class : identifier
{ {
$$ = new_block_expr (); $$ = add_protocol ($<protocol_list>0, $1);
append_expr ($$, new_name_expr ($1));
} }
| protocol_list ',' maybe_class | protocol_list ',' identifier
{ {
append_expr ($1, new_name_expr ($3)); append_expr ($1, new_name_expr ($3));
$$ = $1; $$ = $1;
@ -1332,7 +1341,7 @@ ivars
; ;
ivar_declarator ivar_declarator
: NAME : identifier
{ {
new_struct_field (current_ivars, $<type>0, $1, current_visibility); new_struct_field (current_ivars, $<type>0, $1, current_visibility);
} }
@ -1436,8 +1445,10 @@ keywordselector
; ;
selector selector
: maybe_class : NAME { $$ = save_string ($1); }
| CLASS_NAME { $$ = save_string ($1); }
| TYPE { $$ = save_string (yytext); } | TYPE { $$ = save_string (yytext); }
| TYPE_NAME { $$ = save_string ($1->name); }
| reserved_word | reserved_word
; ;
@ -1463,20 +1474,20 @@ reserved_word
; ;
keyworddecl keyworddecl
: selector ':' '(' type ')' NAME : selector ':' '(' type ')' identifier
{ $$ = new_param ($1, $4, $6); } { $$ = new_param ($1, $4, $6); }
| selector ':' NAME | selector ':' identifier
{ $$ = new_param ($1, &type_id, $3); } { $$ = new_param ($1, &type_id, $3); }
| ':' '(' type ')' NAME | ':' '(' type ')' identifier
{ $$ = new_param ("", $3, $5); } { $$ = new_param ("", $3, $5); }
| ':' NAME | ':' identifier
{ $$ = new_param ("", &type_id, $2); } { $$ = new_param ("", &type_id, $2); }
; ;
obj_expr obj_expr
: obj_messageexpr : obj_messageexpr
| SELECTOR '(' selectorarg ')' { $$ = selector_expr ($3); } | SELECTOR '(' selectorarg ')' { $$ = selector_expr ($3); }
| PROTOCOL '(' maybe_class ')' { $$ = protocol_expr ($3); } | PROTOCOL '(' identifier ')' { $$ = protocol_expr ($3); }
| ENCODE '(' type ')' { $$ = encode_expr ($3); } | ENCODE '(' type ')' { $$ = encode_expr ($3); }
| obj_string /* FIXME string object? */ | obj_string /* FIXME string object? */
; ;

15
tools/qfcc/source/type.c
View file

@ -57,12 +57,6 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "struct.h" #include "struct.h"
#include "type.h" #include "type.h"
typedef struct typedef_s {
struct typedef_s *next;
const char *name;
type_t *type;
} typedef_t;
// simple types. function types are dynamically allocated // simple types. function types are dynamically allocated
type_t type_void = { ev_void, "void" }; type_t type_void = { ev_void, "void" };
type_t type_string = { ev_string, "string" }; type_t type_string = { ev_string, "string" };
@ -192,17 +186,12 @@ new_typedef (const char *name, type_t *type)
Hash_Add (typedef_hash, td); Hash_Add (typedef_hash, td);
} }
type_t * typedef_t *
get_typedef (const char *name) get_typedef (const char *name)
{ {
typedef_t *td;
if (!typedef_hash) if (!typedef_hash)
return 0; return 0;
td = Hash_Find (typedef_hash, name); return Hash_Find (typedef_hash, name);
if (!td)
return 0;
return td->type;
} }
type_t * type_t *