Fixed first

[cascardo/grammar.git] / rdp.h

diff --git a/rdp.h b/rdp.h
index 1455c52..a469fcc 100644 (file)
--- a/rdp.h
+++ b/rdp.h
@@ -3,39 +3,19 @@
 
 #include <grammar.h>
 
-#define RDP_TYPE            (rdp_get_type ())
-#define RDP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
-                                    RDP_TYPE, Rdp))
-#define RDP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), \
-                                    RDP_TYPE, RdpClass))
-#define IS_RDP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-                                    RDP_TYPE))
-#define IS_RDP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-                                    RDP_TYPE))
-#define RDP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-                                    RDP_TYPE, RdpClass))
-
-
 typedef struct _buffer buffer_t;
 
 typedef struct
 {
-  Grammar parent;
   nextcb cb;
   gpointer data;
   GList* buffer;
   symbol_t* start;
-} Rdp;
-
-typedef struct
-{
-  GrammarClass parent;
-} RdpClass;
-
-GType rdp_get_type ();
+  grammar_t* grammar;
+} rdp_t;
 
-Rdp* rdp_new (nextcb, gpointer, gint);
-void rdp_delete (Rdp*);
-gpointer rdp_build (Rdp*);
+rdp_t* rdp_new (nextcb, gpointer, gint, grammar_t*);
+void rdp_delete (rdp_t*);
+gpointer rdp_build (rdp_t*);
 
 #endif