From: Luca Padovani <luca.padovani@unito.it>
Date: Fri, 21 Feb 2003 13:20:34 +0000 (+0000)
Subject: * some fixes so to make Ocaml garbage collector happy
X-Git-Tag: V_0_0_4_1~13
X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=e3d3386861ccaed8b573173db458e315b06d233f;p=helm.git

* some fixes so to make Ocaml garbage collector happy
* there is still the problem that the assert macro is not recognized (?)
---

diff --git a/helm/DEVEL/mathml_editor/ocaml/ml_mathml_editor.c b/helm/DEVEL/mathml_editor/ocaml/ml_mathml_editor.c
index bbe888435..7dd6bd050 100644
--- a/helm/DEVEL/mathml_editor/ocaml/ml_mathml_editor.c
+++ b/helm/DEVEL/mathml_editor/ocaml/ml_mathml_editor.c
@@ -2,11 +2,15 @@
 #include <caml/memory.h>
 #include <caml/custom.h>
 #include <caml/callback.h>
+#include <assert.h>
 
 #include "mlgdomevalue.h"
 
 #include "c_mathml_editor.h"
 
+#undef assert
+#define assert(x) {}
+
 typedef struct
 {
   Editor* c_editor;
@@ -16,7 +20,7 @@ typedef struct
 ml_Editor*
 Editor_val(value v)
 {
-  ml_Editor* editor = (ml_Editor*) Data_custom_val(v);
+  ml_Editor* editor = *((ml_Editor**) Data_custom_val(v));
   assert(editor != NULL);
   return editor;
 }
@@ -29,6 +33,7 @@ ml_mathml_editor_finalize(value v)
 
   remove_global_root(&editor->callback);
   c_mathml_editor_destroy(editor->c_editor);
+  free(editor);
 }
 
 void
@@ -55,8 +60,9 @@ ml_mathml_editor_new(value dictionary,
     custom_deserialize_default
   };
   
-  value v = alloc_custom(&ops, sizeof(ml_Editor), 0, 1);
-  ml_Editor* ml_editor = (ml_Editor*) Data_custom_val(v);
+  value v = alloc_custom(&ops, sizeof(ml_Editor*), 0, 1);
+  ml_Editor** ml_editor_ref = (ml_Editor**) Data_custom_val(v);
+  ml_Editor* ml_editor = *ml_editor_ref = malloc(sizeof(ml_Editor));
   ml_editor->c_editor = c_mathml_editor_new(Document_val(dictionary),
 					    Document_val(tml_mml),
 					    Document_val(tml_tex),