Changeset 4504

Timestamp:

06/30/08 02:55:00 (5 years ago)

Author:

werner

Message:

• use unique() also when looking up identifiers from the command line
• added regression tests for split lines, values given by formulas

Location:

developers/werner/greg

Files:

• Makefile (modified) (1 diff)
• README (modified) (1 diff)
• greg.c (modified) (2 diffs)
• id.c (added)
• id.h (added)
• lang.l (modified) (2 diffs)
• tests/cont (added)
• tests/formula (added)

developers/werner/greg/Makefile

@@ -6 +6 @@
 LDLIBS=-lfl
 
-OBJS=greg.o lex.yy.o y.tab.o cpp.o
+OBJS=greg.o lex.yy.o y.tab.o cpp.o id.o
 
 .PHONY:         all dep depend clean spotless test tests

developers/werner/greg/README

@@ -15 +15 @@
 ------------
 
-- output format should be easier to read
 - value names in pcf50633.greg are often unsuitable for identifier generation
   (should align them properly with what we use in u-boot and kernel)
 - "pretty-print" is hard to read
 - unique() should use rb-trees
-- greg.c should use unique(), to accelerate lookups
 
 

developers/werner/greg/greg.c

@@ -15 +15 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
 
 #include "reg.h"
 #include "cpp.h"
+#include "id.h"
 #include "greg.h"
 
@@ -82 +82 @@
         const struct field *field;
 
+        id = unique(id);
         for (reg = regs; reg; reg = reg->next)
-                if (!strcmp(reg->id, id))
+                if (reg->id == id)
                         break;
         if (!reg) {

developers/werner/greg/lang.l

@@ -22 +22 @@
 
 #include "greg.h"
+#include "id.h"
 
 
@@ -27 +28 @@
 static int col0 = 1; /* token starts in the first column */
 
-
-static char *unique(const char *s)
-{
-        static struct node {
-                char *s;
-                struct node *left, *right;
-        } *root = NULL;
-        struct node **n = &root;
-        int cmp;
-
-        while (*n) {
-                cmp = strcmp((*n)->s, s);
-                if (!cmp)
-                        return (*n)->s;
-                n = cmp < 0 ? &(*n)->left : &(*n)->right;
-        }
-        *n = malloc(sizeof(struct node));
-        if (!*n) {
-                perror("malloc");
-                exit(1);
-        }
-        (*n)->s = strdup(s);
-        if (!(*n)->s) {
-                perror("strdup");
-                exit(1);
-        }
-        (*n)->left = (*n)->right = NULL;
-        return (*n)->s;
-}
-
 %}
 
+
 %%
+
 
 "%"[0-9]+               { yylval.num = strtoul(yytext+1, NULL, 10);