Fml function strsub implemented. New test files marc[45].fml.

[egate.git] / fml / fmlsym.c

diff --git a/fml/fmlsym.c b/fml/fmlsym.c
index e54419f..f6739e9 100644 (file)
--- a/fml/fmlsym.c
+++ b/fml/fmlsym.c
@@ -2,7 +2,11 @@
  * FML interpreter. Europagate, 1995
  *
  * $Log: fmlsym.c,v $
- * Revision 1.3  1995/02/23 08:32:06  adam
+ * Revision 1.4  1995/03/02 08:06:09  adam
+ * Fml function strsub implemented. New test files marc[45].fml.
+ * New test options in fmltest.
+ *
+ * Revision 1.3  1995/02/23  08:32:06  adam
  * Changed header.
  *
  * Revision 1.1.1.1  1995/02/06  13:48:10  adam
@@ -16,19 +20,48 @@
 
 #include "fmlp.h"
 
+#define SYM_CHUNK 128
+
 struct fml_sym {
     struct fml_sym_info info;
     struct fml_sym *next;
     int level;
     char *name;
+    struct fml_sym *level_link;
 };
 
 struct fml_sym_tab {
     int level;
     int hash;
     struct fml_sym **array;
+    struct fml_sym *level_link_0;
+    struct fml_sym *level_link_n;
+    struct fml_sym *free_list;
 };
 
+static struct fml_sym *sym_alloc (struct fml_sym_tab *tab) 
+{
+    struct fml_sym *p = tab->free_list;
+    if (!p)
+    {
+        int i;
+
+       tab->free_list = p = malloc (sizeof(*p) * SYM_CHUNK);
+       assert (p);
+       for (i = 0; i<SYM_CHUNK-1; i++)
+            p[i].next = p+i+1;
+        p[i].next = NULL;
+    }
+    tab->free_list = p->next;
+    return p;
+}
+
+static void sym_release (struct fml_sym_tab *tab, struct fml_sym *p)
+{
+    p->next = tab->free_list;
+    tab->free_list = p;
+}
+
 struct fml_sym_tab *fml_sym_open (void)
 {
     struct fml_sym_tab *tab;
@@ -38,7 +71,10 @@ struct fml_sym_tab *fml_sym_open (void)
     if (!tab)
         return NULL;
     tab->level = 1;
-    tab->hash = 101;
+    tab->level_link_0 = NULL;
+    tab->level_link_n = NULL;
+    tab->free_list = NULL;
+    tab->hash = 41;
     tab->array = malloc (sizeof(*tab->array) * tab->hash);
     if (!tab->array)
     {
@@ -90,7 +126,7 @@ void fml_sym_pop (struct fml_sym_tab *tab, void (*ph)(struct fml_sym_info *i))
                     (*ph)(&fs->info);
                 *fsp = (*fsp)->next;
                 free (fs->name);
-                free (fs);
+                sym_release (tab, fs);
             }
             else
                 fsp = &(*fsp)->next;
@@ -120,17 +156,23 @@ static struct fml_sym_info *sym_add (struct fml_sym_tab *tab,
         return NULL;
     strcpy (cp, s);
 
-    sym = malloc (sizeof (*sym));
-    if (!sym)
-    {
-        free (cp);
-        return NULL;
-    }
+    sym = sym_alloc (tab);
+
     sym_entry = tab->array + fml_sym_hash (s, tab->hash);
     sym->name = cp;
     sym->next = *sym_entry;
     *sym_entry = sym;
     sym->level = level;
+    if (level)
+    {
+       sym->level_link = tab->level_link_n;
+       tab->level_link_n = sym;
+    }
+    else
+    {
+       sym->level_link = tab->level_link_0;
+       tab->level_link_0 = sym;
+    }
     return &sym->info;
 }