Header files ccl.h/cclp.h are gone! They have been merged an

[egate.git] / ccl / cclfind.c

diff --git a/ccl/cclfind.c b/ccl/cclfind.c
index 3288f87..d0a7ca8 100644 (file)
--- a/ccl/cclfind.c
+++ b/ccl/cclfind.c
@@ -2,7 +2,12 @@
  * Europagate, 1995
  *
  * $Log: cclfind.c,v $
- * Revision 1.6  1995/02/14 16:20:55  adam
+ * Revision 1.7  1995/02/14 19:55:10  adam
+ * Header files ccl.h/cclp.h are gone! They have been merged an
+ * moved to ../include/ccl.h.
+ * Node kind(s) in ccl_rpn_node have changed names.
+ *
+ * Revision 1.6  1995/02/14  16:20:55  adam
  * Qualifiers are read from a file now.
  *
  * Revision 1.5  1995/02/14  14:12:41  adam
@@ -27,7 +32,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include "cclp.h"
+#include <ccl.h>
 
 static struct ccl_token *look_token;
 static int ccl_error;
@@ -93,13 +98,13 @@ void ccl_rpn_delete (struct ccl_rpn_node *rpn)
         return;
     switch (rpn->kind)
     {
-    case AND:
-    case OR:
-    case NOT:
+    case CCL_RPN_AND:
+    case CCL_RPN_OR:
+    case CCL_RPN_NOT:
         ccl_rpn_delete (rpn->u.p[0]);
         ccl_rpn_delete (rpn->u.p[1]);
         break;
-    case TERM:
+    case CCL_RPN_TERM:
         free (rpn->u.t.term);
         for (attr = rpn->u.t.attr_list; attr; attr = attr1)
         {
@@ -107,10 +112,10 @@ void ccl_rpn_delete (struct ccl_rpn_node *rpn)
             free (attr);
         }
         break;
-    case SET:
+    case CCL_RPN_SET:
         free (rpn->u.setname);
         break;
-    case PROX:
+    case CCL_RPN_PROX:
         ccl_rpn_delete (rpn->u.p[0]);
         ccl_rpn_delete (rpn->u.p[1]);
         break;
@@ -165,7 +170,7 @@ static struct ccl_rpn_node *search_term (struct ccl_rpn_attr **qa)
         len += 1+lookahead->len;
        lookahead = lookahead->next;
     }
-    p = mk_node (TERM);
+    p = mk_node (CCL_RPN_TERM);
     p->u.t.term = malloc (len);
     assert (p->u.t.term);
     p->u.t.attr_list = NULL;
@@ -357,7 +362,7 @@ static struct ccl_rpn_node *qualifiers (struct ccl_token *la,
                     struct ccl_rpn_node *p2;
                     
                     p2 = search_term (ap);
-                    p = mk_node (AND);
+                    p = mk_node (CCL_RPN_AND);
                     p->u.p[0] = p1;
                     add_attr (p1, CCL_BIB1_REL, 4);
                     p->u.p[1] = p2;
@@ -410,7 +415,7 @@ static struct ccl_rpn_node *search_terms (struct ccl_rpn_attr **qa)
                 ccl_rpn_delete (p1);
                 return NULL;
             }
-           pn = mk_node (PROX);
+           pn = mk_node (CCL_RPN_PROX);
            pn->u.p[0] = p1;
            pn->u.p[1] = p2;
            p1 = pn;
@@ -463,7 +468,7 @@ static struct ccl_rpn_node *search_elements (struct ccl_rpn_attr **qa)
             ccl_error = CCL_ERR_SETNAME_EXPECTED;
             return NULL;
         }
-       p1 = mk_node (SET);
+       p1 = mk_node (CCL_RPN_SET);
        p1->u.setname = copy_token_name (look_token);
        ADVANCE;
        return p1;
@@ -494,7 +499,7 @@ static struct ccl_rpn_node *find_spec (struct ccl_rpn_attr **qa)
                 ccl_rpn_delete (p1);
                 return NULL;
             }
-           pn = mk_node (AND);
+           pn = mk_node (CCL_RPN_AND);
            pn->u.p[0] = p1;
            pn->u.p[1] = p2;
            p1 = pn;
@@ -507,7 +512,7 @@ static struct ccl_rpn_node *find_spec (struct ccl_rpn_attr **qa)
                 ccl_rpn_delete (p1);
                 return NULL;
             }
-           pn = mk_node (OR);
+           pn = mk_node (CCL_RPN_OR);
            pn->u.p[0] = p1;
            pn->u.p[1] = p2;
            p1 = pn;
@@ -520,7 +525,7 @@ static struct ccl_rpn_node *find_spec (struct ccl_rpn_attr **qa)
                 ccl_rpn_delete (p1);
                 return NULL;
             }
-           pn = mk_node (NOT);
+           pn = mk_node (CCL_RPN_NOT);
            pn->u.p[0] = p1;
            pn->u.p[1] = p2;
            p1 = pn;