X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=fml%2Ffmlmem.c;h=3300b20ee956343e6c928650d5c5300bc42638e0;hb=8467171ebdb5f018740de8d82149c8ccc53d2815;hp=65c165071850a6a53c99673d28005a466beaa168;hpb=8d94089636adea198ec65479ba89fbad3cddb47d;p=egate.git

diff --git a/fml/fmlmem.c b/fml/fmlmem.c
index 65c1650..3300b20 100644
--- a/fml/fmlmem.c
+++ b/fml/fmlmem.c
@@ -2,7 +2,24 @@
  * FML interpreter. Europagate, 1995
  *
  * $Log: fmlmem.c,v $
- * Revision 1.2  1995/02/06 15:23:26  adam
+ * Revision 1.8  1995/02/23 08:32:05  adam
+ * Changed header.
+ *
+ * Revision 1.6  1995/02/10  18:15:52  adam
+ * FML function 'strcmp' implemented. This function can be used to
+ * test for existence of MARC fields.
+ *
+ * Revision 1.5  1995/02/09  14:37:18  adam
+ * Removed .depend from cvs. Removed function fml_mk_list.
+ *
+ * Revision 1.4  1995/02/09  14:33:37  adam
+ * Split source fml.c and define relevant build-in functions in separate
+ * files. New operators mult, div, not, llen implemented.
+ *
+ * Revision 1.3  1995/02/09  13:07:15  adam
+ * Nodes are freed now. Many bugs fixed.
+ *
+ * Revision 1.2  1995/02/06  15:23:26  adam
  * Added some more relational operators (le,ne,ge). Added increment
  * and decrement operators. Function index changed, so that first
  * element is 1 - not 0. Function fml_atom_val edited.
@@ -22,6 +39,9 @@
 #define FML_ATOM_CHUNK 1024
 #define FML_NODE_CHUNK 1024
 
+static int no_nodes = 0;
+static int no_atoms = 0;
+
 struct fml_node *fml_node_alloc (Fml fml)
 {
     struct fml_node *n;
@@ -44,6 +64,7 @@ struct fml_node *fml_node_alloc (Fml fml)
     fml->node_free_list = n->p[1];
     n->p[0] = n->p[1] = NULL;
     n->is_atom = 0;
+    no_nodes++;
     return n;
 }
 
@@ -67,6 +88,7 @@ static struct fml_atom *atom_malloc (Fml fml)
     }
     fa = fml->atom_free_list;
     fml->atom_free_list = fa->next;
+    no_atoms++;
     return fa;
 }
 
@@ -74,6 +96,7 @@ static void atom_delete (Fml fml, struct fml_atom *a)
 {
     a->next = fml->atom_free_list;
     fml->atom_free_list = a;
+    no_atoms--;
 }
 
 static struct fml_atom *atom_copy (Fml fml, struct fml_atom *a)
@@ -83,7 +106,7 @@ static struct fml_atom *atom_copy (Fml fml, struct fml_atom *a)
     a0 = a1 = atom_malloc (fml);
     while (a)
     {
-        memcpy (&a1->buf, &a->buf, FML_ATOM_CHUNK);
+        memcpy (&a1->buf, &a->buf, FML_ATOM_BUF);
         if (!a->next)
             break;
         a = a->next;
@@ -114,19 +137,22 @@ struct fml_atom *fml_atom_alloc (Fml fml, char *str)
     return a0;
 }
 
-struct fml_node *fml_mk_list (Fml fml, struct fml_node *fn)
+int fml_atom_cmp (Fml fml, struct fml_atom *a1, struct fml_atom *a2)
 {
-    if (fn->is_atom)
+    while (a1 && a2)
     {
-        struct fml_node *fn2;
-
-        fn2 = fml_node_alloc (fml);
-        fn2->is_atom = 1;
-        fn2->p[0] = fn->p[0];
-        return fn2;
+        int n;
+        n = strncmp (a1->buf, a2->buf, FML_ATOM_BUF);
+        if (n)
+            return n;
+        a1 = a1->next;
+        a2 = a2->next;
     }
-    else
-        return fn->p[0];
+    if (!a1 && !a2)
+        return 0;
+    if (a1)
+        return 1;
+    return -1;
 }
 
 int fml_atom_str (struct fml_atom *a, char *str)
@@ -162,7 +188,6 @@ void fml_atom_strx (struct fml_atom *a, char *str, int max)
     str[len+FML_ATOM_BUF-1] = '\0';
 }
 
-
 int fml_atom_val (struct fml_atom *a)
 {
     static char arg[256];
@@ -173,6 +198,18 @@ int fml_atom_val (struct fml_atom *a)
     return atoi (arg);
 }
 
+struct fml_node *fml_mk_node_val (Fml fml, int val)
+{
+    static char arg[64];
+    struct fml_node *fn;
+
+    sprintf (arg, "%d", val);
+    fn = fml_node_alloc (fml);
+    fn->is_atom = 1;
+    fn->p[0] = fml_atom_alloc (fml, arg);
+    return fn;
+}
+
 void fml_node_delete (Fml fml, struct fml_node *fn)
 {
     struct fml_node *f1;
@@ -186,6 +223,7 @@ void fml_node_delete (Fml fml, struct fml_node *fn)
         
         fn->p[1] = fml->node_free_list;
         fml->node_free_list = fn;
+        no_nodes--;
 
         fn = f1;
     }
@@ -214,3 +252,9 @@ struct fml_node *fml_node_copy (Fml fml, struct fml_node *fn)
     }
     return fn0;
 }
+
+void fml_node_stat (Fml fml)
+{
+    if (fml->debug & 2)
+        printf ("<<node=%d, atom=%d>>", no_nodes, no_atoms);
+}