Changeset 2171 for libswish3/trunk/src/libswish3/swish.c

Timestamp:

09/22/08 00:08:00 (4 months ago)

Author:

karpet

Message:

get rid of the circular reference in TokenList/Token?; make swish_init() a separate call from swish_init_swish3() so it can be called as class method rather than once-per-object; clean up some ref_cnt logic and mem debugging

Files:

• libswish3/trunk/src/libswish3/swish.c (modified) (5 diffs)

libswish3/trunk/src/libswish3/swish.c

@@ -31 +31 @@
-{
-    swish_3 *s3;
-    swish_init();
-    s3 = swish_xmalloc(sizeof(swish_3));
-    s3->ref_cnt = 0;
@@ -54 +53 @@
-    swish_3 *s3
-)
-
-
-
-
+
-    s3->parser->ref_cnt--;
-    if (s3->parser->ref_cnt < 1) {
-        swish_free_parser(s3->parser);
-        children_are_freed++;
-    }
-
@@ -67 +62 @@
-    if (s3->analyzer->ref_cnt < 1) {
-        swish_free_analyzer(s3->analyzer);
-        children_are_freed++;
-    }
-
@@ -73 +67 @@
-    if (s3->config->ref_cnt < 1) {
-        swish_free_config(s3->config);
-        children_are_freed++;
-    }
-
@@ -80 +73 @@
-    }
-    swish_xfree(s3);
-    
-    if (children_are_freed == 3) {
-        swish_mem_debug();
-    }
-}
-
+/* MUST call this before instantiating any swish_3 objects */
-void
-swish_init(