#include <errno.h>
static
-struct type_class *lookup_type_class_scope(GQuark qname,
- struct declaration_scope *scope)
+struct type *
+ lookup_type_scope(GQuark type_name, struct declaration_scope *scope)
{
- return g_hash_table_lookup(scope->type_classes,
- (gconstpointer) (unsigned long) qname);
+ return g_hash_table_lookup(scope->types,
+ (gconstpointer) (unsigned long) type_name);
}
-struct type_class *lookup_type_class(GQuark qname,
- struct declaration_scope *scope)
+struct type *lookup_type(GQuark type_name, struct declaration_scope *scope)
{
- struct type_class *tc;
+ struct type *type;
while (scope) {
- tc = lookup_type_class_scope(qname, scope);
- if (tc)
- return tc;
+ type = lookup_type_scope(type_name, scope);
+ if (type)
+ return type;
scope = scope->parent_scope;
}
return NULL;
}
-static void free_type_class(struct type_class *type_class)
+int register_type(struct type *type, struct declaration_scope *scope)
{
- type_class->class_free(type_class);
+ if (!type->name)
+ return -EPERM;
+
+ /* Only lookup in local scope */
+ if (lookup_type_scope(type->name, scope))
+ return -EEXIST;
+
+ g_hash_table_insert(scope->types,
+ (gpointer) (unsigned long) type->name,
+ type);
+ type_ref(type);
+ return 0;
+}
+
+static
+struct declaration *
+ lookup_declaration_scope(GQuark field_name, struct declaration_scope *scope)
+{
+ return g_hash_table_lookup(scope->declarations,
+ (gconstpointer) (unsigned long) field_name);
}
-static void free_type(struct type *type)
+struct declaration *
+ lookup_declaration(GQuark field_name, struct declaration_scope *scope)
{
- type->p.type_free(type);
+ struct declaration *declaration;
+
+ while (scope) {
+ declaration = lookup_declaration_scope(field_name, scope);
+ if (declaration)
+ return declaration;
+ scope = scope->parent_scope;
+ }
+ return NULL;
}
-int register_type_class(struct type_class *type_class,
- struct declaration_scope *scope)
+int register_declaration(GQuark field_name, struct declaration *declaration,
+ struct declaration_scope *scope)
{
+ if (!field_name)
+ return -EPERM;
+
/* Only lookup in local scope */
- if (lookup_type_class_scope(type_class->name, scope))
+ if (lookup_declaration_scope(field_name, scope))
return -EEXIST;
- g_hash_table_insert(scope->type_classes,
- (gpointer) (unsigned long) type_class->name,
- type_class);
+ g_hash_table_insert(scope->declarations,
+ (gpointer) (unsigned long) field_name,
+ declaration);
+ declaration_ref(declaration);
return 0;
}
-void type_class_ref(struct type_class *type_class)
+void type_ref(struct type *type)
{
- type_class->ref++;
+ type->ref++;
}
-void type_class_unref(struct type_class *type_class)
+void type_unref(struct type *type)
{
- if (!--type_class->ref)
- free_type_class(type_class);
+ if (!--type->ref)
+ type->type_free(type);
}
-void type_ref(struct type *type)
+void declaration_ref(struct declaration *declaration)
{
- type->ref++;
+ declaration->ref++;
}
-void type_unref(struct type *type)
+void declaration_unref(struct declaration *declaration)
{
- if (!--type->ref)
- free_type(type);
+ if (!--declaration->ref)
+ declaration->type->declaration_free(declaration);
}
struct declaration_scope *
-new_declaration_scope(struct declaration_scope *parent_scope)
+ new_declaration_scope(struct declaration_scope *parent_scope)
{
struct declaration_scope *scope = g_new(struct declaration_scope, 1);
- scope->type_classes = g_hash_table_new_full(g_direct_hash,
+ scope->types = g_hash_table_new_full(g_direct_hash,
+ g_direct_equal, NULL,
+ (GDestroyNotify) type_unref);
+ scope->declarations = g_hash_table_new_full(g_direct_hash,
g_direct_equal, NULL,
- (GDestroyNotify) type_class_unref);
+ (GDestroyNotify) declaration_unref);
scope->parent_scope = parent_scope;
return scope;
}
void free_declaration_scope(struct declaration_scope *scope)
{
- g_hash_table_destroy(scope->type_classes);
+ g_hash_table_destroy(scope->declarations);
+ g_hash_table_destroy(scope->types);
g_free(scope);
}