X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Finteger.c;h=ea292900ce80886141bf21a171ec3b76d2573db8;hp=1e926f7b4041e4c4f19c0e745a010d0e62eb6e41;hb=c054553dac076f91196b372fa19efaf2adc4e4f9;hpb=8a4035bcbfe691490b031f08533676597f72a4ac

diff --git a/types/integer.c b/types/integer.c
index 1e926f7b..ea292900 100644
--- a/types/integer.c
+++ b/types/integer.c
@@ -3,7 +3,7 @@
  *
  * BabelTrace - Integer Type Converter
  *
- * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010, 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,12 +21,19 @@
 #include <babeltrace/format.h>
 #include <stdint.h>
 
+static
+struct type *_integer_type_new(struct type_class *type_class,
+			       struct declaration_scope *parent_scope);
+static
+void _integer_type_free(struct type *type);
+
 void integer_copy(struct stream_pos *dest, const struct format *fdest, 
 		  struct stream_pos *src, const struct format *fsrc,
-		  const struct type_class *type_class)
+		  struct type *type)
 {
-	struct type_class_integer *int_class =
-		container_of(type_class, struct type_class_integer, p);
+	struct type_integer *integer = container_of(type, struct type_integer,
+						    p);
+	struct type_class_integer *int_class = integer->_class;
 
 	if (!int_class->signedness) {
 		uint64_t v;
@@ -41,22 +48,17 @@ void integer_copy(struct stream_pos *dest, const struct format *fdest,
 	}
 }
 
-void integer_type_free(struct type_class_integer *int_class)
+static
+void _integer_type_class_free(struct type_class *type_class)
 {
-	g_free(int_class);
-}
-
-static void _integer_type_free(struct type_class *type_class)
-{
-	struct type_class_integer *int_class =
+	struct type_class_integer *integer_class =
 		container_of(type_class, struct type_class_integer, p);
-	integer_type_free(int_class);
+	g_free(integer_class);
 }
 
-struct type_class_integer *integer_type_new(const char *name,
-					    size_t len, int byte_order,
-					    int signedness,
-					    size_t alignment)
+struct type_class_integer *
+integer_type_class_new(const char *name, size_t len, int byte_order,
+		       int signedness, size_t alignment)
 {
 	struct type_class_integer *int_class;
 	int ret;
@@ -65,7 +67,9 @@ struct type_class_integer *integer_type_new(const char *name,
 	int_class->p.name = g_quark_from_string(name);
 	int_class->p.alignment = alignment;
 	int_class->p.copy = integer_copy;
-	int_class->p.free = _integer_type_free;
+	int_class->p.class_free = _integer_type_class_free;
+	int_class->p.type_free = _integer_type_free;
+	int_class->p.type_new = _integer_type_new;
 	int_class->p.ref = 1;
 	int_class->len = len;
 	int_class->byte_order = byte_order;
@@ -79,3 +83,29 @@ struct type_class_integer *integer_type_new(const char *name,
 	}
 	return int_class;
 }
+
+static
+struct type_integer *_integer_type_new(struct type_class *type_class,
+				       struct declaration_scope *parent_scope)
+{
+	struct type_class_integer *integer_class =
+		container_of(type_class, struct type_class_integer, p);
+	struct type_integer *integer;
+
+	integer = g_new(struct type_integer, 1);
+	type_class_ref(&integer_class->p);
+	integer->p._class = integer_class;
+	integer->p.ref = 1;
+	integer->value._unsigned = 0;
+	return &integer->p;
+}
+
+static
+void _integer_type_free(struct type *type)
+{
+	struct type_integer *integer =
+		container_of(type, struct type_integer, p);
+
+	type_class_unref(integer->p._class);
+	g_free(integer);
+}