qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-03-21 09:51:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

make struct_t and enum_t globally visible, re-do how enum info is stored

Browse source 
and make it possible to create a structure using a pre-existing type
This commit is contained in:
Bill Currie 2002-10-16 02:05:39 +00:00
parent 6af57049d5
commit 27effb5075
2 changed files with 33 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tools/qfcc/include/struct.h
View file

@ -46,10 +46,23 @@ typedef struct struct_field_s {
visibility_t visibility;
} struct_field_t;
typedef struct struct_s {
const char *name;
struct type_s *type;
int is_union;
} struct_t;
typedef struct enum_s {
const char *name;
int value;
} enum_t;
struct_field_t *new_struct_field (struct type_s *strct, struct type_s *type,
const char *name, visibility_t visibility);
struct_field_t *struct_find_field (struct type_s *strct, const char *name);
int struct_compare_fields (struct type_s *s1, struct type_s *s2);
struct type_s *init_struct (struct_t *strct, struct type_s *type,
const char *name);
struct type_s *new_struct (const char *name);
struct type_s *new_union (const char *name);
struct type_s *find_struct (const char *name);

46
tools/qfcc/source/struct.c
View file

@ -56,17 +56,6 @@ static const char rcsid[] =
#include "struct.h"
#include "type.h"
typedef struct {
const char *name;
type_t *type;
int is_union;
} struct_t;
typedef struct {
const char *name;
expr_t value;
} enum_t;
static hashtab_t *structs;
static hashtab_t *enums;
@ -124,6 +113,23 @@ struct_find_field (type_t *strct, const char *name)
return Hash_Find (strct->struct_fields, name);
}
type_t *
init_struct (struct_t *strct, type_t *type, const char *name)
{
strct->name = name ? save_string (name) : 0;
strct->type = type;
strct->type->type = ev_struct;
strct->type->struct_tail = &strct->type->struct_head;
strct->type->struct_fields = Hash_NewTable (61, struct_field_get_key, 0, 0);
strct->type->class = (struct class_s *)strct;
strct->is_union = 0;
if (name) {
strct->type->name = save_string (name);
Hash_Add (structs, strct);
}
return strct->type;
}
type_t *
new_struct (const char *name)
{
@ -140,18 +146,7 @@ new_struct (const char *name)
}
}
strct = malloc (sizeof (struct_t));
strct->name = name ? save_string (name) : 0;
strct->type = new_type ();
strct->type->type = ev_struct;
strct->type->struct_tail = &strct->type->struct_head;
strct->type->struct_fields = Hash_NewTable (61, struct_field_get_key, 0, 0);
strct->type->class = (struct class_s *)strct;
strct->is_union = 0;
if (name) {
strct->type->name = save_string (name);
Hash_Add (structs, strct);
}
return strct->type;
return init_struct (strct, new_type (), name);
}
type_t *
@ -292,8 +287,7 @@ process_enum (expr_t *enm)
if (!new_enum)
Sys_Error ("out of memory");
new_enum->name = name->e.string_val;
new_enum->value.type = ex_integer;
new_enum->value.e.integer_val = enum_val++;
new_enum->value = enum_val++;
Hash_Add (enums, new_enum);
//printf ("%s = %d\n", new_enum->name, new_enum->value.e.integer_val);
}
@ -309,7 +303,7 @@ get_enum (const char *name)
e = (enum_t *) Hash_Find (enums, name);
if (!e)
return 0;
return &e->value;
return new_integer_expr (e->value);
}
void