From 85e0bf0ecf24fb2b4d037a59607cd33005949b7b Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 14 Feb 1995 19:55:10 +0000 Subject: [PATCH] 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. --- ccl/cclfind.c | 35 ++++++++++++++++++++--------------- ccl/cclptree.c | 21 +++++++++++++-------- ccl/cclqual.c | 10 +++++++--- ccl/cclsh.c | 24 +++++++----------------- ccl/ccltoken.c | 9 +++++++-- 5 files changed, 54 insertions(+), 45 deletions(-) diff --git a/ccl/cclfind.c b/ccl/cclfind.c index 3288f87..d0a7ca8 100644 --- 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 #include -#include "cclp.h" +#include 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; diff --git a/ccl/cclptree.c b/ccl/cclptree.c index aebcb10..0f533e2 100644 --- a/ccl/cclptree.c +++ b/ccl/cclptree.c @@ -2,7 +2,12 @@ * Europagate, 1995 * * $Log: cclptree.c,v $ - * Revision 1.1 1995/02/14 10:25:56 adam + * Revision 1.2 1995/02/14 19:55:11 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.1 1995/02/14 10:25:56 adam * The constructions 'qualifier rel term ...' implemented. * */ @@ -11,14 +16,14 @@ #include #include -#include "cclp.h" +#include void ccl_pr_tree (struct ccl_rpn_node *rpn) { switch (rpn->kind) { - case TERM: + case CCL_RPN_TERM: printf ("\"%s\"", rpn->u.t.term); if (rpn->u.t.attr_list) { @@ -27,31 +32,31 @@ void ccl_pr_tree (struct ccl_rpn_node *rpn) printf (" %d=%d", attr->type, attr->value); } break; - case AND: + case CCL_RPN_AND: printf ("("); ccl_pr_tree (rpn->u.p[0]); printf (") and ("); ccl_pr_tree (rpn->u.p[1]); printf (")"); break; - case OR: + case CCL_RPN_OR: printf ("("); ccl_pr_tree (rpn->u.p[0]); printf (") or ("); ccl_pr_tree (rpn->u.p[1]); printf (")"); break; - case NOT: + case CCL_RPN_NOT: printf ("("); ccl_pr_tree (rpn->u.p[0]); printf (") not ("); ccl_pr_tree (rpn->u.p[1]); printf (")"); break; - case SET: + case CCL_RPN_SET: printf ("set=%s", rpn->u.setname); break; - case PROX: + case CCL_RPN_PROX: printf ("("); ccl_pr_tree (rpn->u.p[0]); printf (") prox ("); diff --git a/ccl/cclqual.c b/ccl/cclqual.c index cb8e0a2..c28e98c 100644 --- a/ccl/cclqual.c +++ b/ccl/cclqual.c @@ -2,7 +2,12 @@ * Europagate, 1995 * * $Log: cclqual.c,v $ - * Revision 1.3 1995/02/14 16:20:56 adam + * Revision 1.4 1995/02/14 19:55:12 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.3 1995/02/14 16:20:56 adam * Qualifiers are read from a file now. * * Revision 1.2 1995/02/14 10:25:56 adam @@ -18,7 +23,7 @@ #include #include -#include "cclp.h" +#include struct ccl_qualifiers { struct ccl_qualifier *list; @@ -164,7 +169,6 @@ void ccl_qual_file (CCL_bibset bibset, FILE *inf) default: pair[0] = atoi (qual_type); } - printf ("adding %s t=%d, v=%d\n", qual_name, pair[0], pair[1]); ccl_qual_add (bibset, qual_name, 1, pair); if (!split) break; diff --git a/ccl/cclsh.c b/ccl/cclsh.c index 7f5d6b0..1e7e976 100644 --- a/ccl/cclsh.c +++ b/ccl/cclsh.c @@ -2,7 +2,12 @@ * Europagate 1995 * * $Log: cclsh.c,v $ - * Revision 1.5 1995/02/14 16:20:57 adam + * Revision 1.6 1995/02/14 19:55:13 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.5 1995/02/14 16:20:57 adam * Qualifiers are read from a file now. * * Revision 1.4 1995/02/14 14:12:42 adam @@ -23,26 +28,11 @@ #include #include -#include "ccl.h" +#include static int debug = 0; static char *prog; -static int ti_attr[] = { - CCL_BIB1_USE, 4, - CCL_BIB1_STR, CCL_BIB1_STR_WP -}; - -static int au_attr[] = { - CCL_BIB1_USE, 1, - CCL_BIB1_STR, CCL_BIB1_STR_WP -}; - -static int pd_attr[] = { - CCL_BIB1_USE, 31, - CCL_BIB1_REL, CCL_BIB1_REL_ORDER -}; - int main (int argc, char **argv) { CCL_bibset bibset; diff --git a/ccl/ccltoken.c b/ccl/ccltoken.c index adbf1f6..26b0052 100644 --- a/ccl/ccltoken.c +++ b/ccl/ccltoken.c @@ -2,7 +2,12 @@ * Europagate, 1995 * * $Log: ccltoken.c,v $ - * Revision 1.1 1995/02/13 12:35:21 adam + * Revision 1.2 1995/02/14 19:55:13 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.1 1995/02/13 12:35:21 adam * First version of CCL. Qualifiers aren't handled yet. * */ @@ -12,7 +17,7 @@ #include #include -#include "cclp.h" +#include static int strin (const char *s, const char *cset) { -- 1.7.10.4