Update of /cvsroot/monetdb/pathfinder/compiler/algebra
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1002/algebra
Modified Files:
builtins.c
Log Message:
- relocate duplicate pftijah fun_call() defines to algebra.h
U builtins.c
Index: builtins.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/builtins.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- builtins.c 10 Apr 2008 13:38:38 -0000 1.85
+++ builtins.c 11 Apr 2008 07:02:34 -0000 1.86
@@ -4626,56 +4626,9 @@
/* #4. PFTIJAH SPECIFIC FUNCTIONS */
/* ----------------------------------------------------- */
-/*
- * PFTIJAH defines. I decided not make a seperate include file for
- * pftijah so ensure that these defines are exactly the same as in
- * ../mil/milgen.brg
- */
-
-#define MYNODEKIND aat_pnode
-#define DOCMGMTTYPE aat_docmgmt
-
-#define PFT_FUN(F) (strncmp(F,"pftijah_",8)==0)
-
-#define PFT_QUERY_N_XX "pftijah_query_n_xx"
-#define PFT_QUERY_N_SX "pftijah_query_n_sx"
-#define PFT_QUERY_N_XO "pftijah_query_n_xo"
-#define PFT_QUERY_N_SO "pftijah_query_n_so"
-#define PFT_QUERY_I_XX "pftijah_query_i_xx"
-#define PFT_QUERY_I_SX "pftijah_query_i_sx"
-#define PFT_QUERY_I_XO "pftijah_query_i_xo"
-#define PFT_QUERY_I_SO "pftijah_query_i_so"
-
-#define PTF_QUERY_NODES(N) (N[14]=='n')
-#define PTF_QUERY_STARTNODES(N) (N[16]=='s')
-#define PTF_QUERY_OPTIONS(N) (N[17]=='o')
-
-#define PFT_FUN_QUERY(F) (strncmp(F,"pftijah_query_",14)==0)
-
-#define PFT_MANAGE_FTI_C_XX "pftijah_manage_fti_c_xx"
-#define PFT_MANAGE_FTI_C_CX "pftijah_manage_fti_c_cx"
-#define PFT_MANAGE_FTI_C_XO "pftijah_manage_fti_c_xo"
-#define PFT_MANAGE_FTI_C_CO "pftijah_manage_fti_c_co"
-#define PFT_MANAGE_FTI_E_CX "pftijah_manage_fti_e_cx"
-#define PFT_MANAGE_FTI_E_CO "pftijah_manage_fti_e_co"
-#define PFT_MANAGE_FTI_R_XX "pftijah_manage_fti_r_xx"
-#define PFT_MANAGE_FTI_R_XO "pftijah_manage_fti_r_xo"
-
-#define PFT_FUN_MANAGE(F) (strncmp(F,"pftijah_manage_",15)==0)
-#define PFT_FUN_MANAGE_KIND(F) (F[19])
-#define PFT_FUN_MANAGE_COLL(F) (F[21] == 'c')
-#define PFT_FUN_MANAGE_OPT(F) (F[22] == 'o')
-
-#define PFT_SCORE "pftijah_score"
-#define PFT_NODES "pftijah_nodes"
-#define PFT_INFO "pftijah_info"
-#define PFT_TOKENIZE "pftijah_tokenize"
-#define PFT_RESSIZE "pftijah_ressize"
-
PFalg_schema_t pft_empty_schema(PFalg_simple_type_t item_t) {
PFalg_schema_t schema;
schema.count = 3;
- // INCOMPLETE, what about freeing this space
schema.items = PFmalloc (3 * sizeof (PFalg_schema_t));
schema.items[0].name = att_iter;
@@ -4694,7 +4647,8 @@
.frag = PFla_empty_set () };
}
-struct PFla_pair_t pft_query_param1(struct PFla_pair_t *p1,PFalg_simple_type_t
itemType) {
+struct PFla_pair_t pft_query_param1(
+ struct PFla_pair_t *p1,PFalg_simple_type_t itemType) {
return (struct PFla_pair_t) {
.rel = fun_param(
p1->rel,
@@ -4703,7 +4657,9 @@
.frag = PFla_empty_set () };
}
-struct PFla_pair_t pft_query_param2(struct PFla_pair_t *p1,
PFalg_simple_type_t itemType1, struct PFla_pair_t *p2, PFalg_simple_type_t
itemType2) {
+struct PFla_pair_t pft_query_param2(
+ struct PFla_pair_t *p1, PFalg_simple_type_t itemType1,
+ struct PFla_pair_t *p2, PFalg_simple_type_t itemType2) {
return (struct PFla_pair_t) {
.rel = fun_param(
p1->rel,
@@ -4715,7 +4671,10 @@
.frag = PFla_empty_set () };
}
-struct PFla_pair_t pft_query_param3(struct PFla_pair_t *p1,
PFalg_simple_type_t itemType1, struct PFla_pair_t *p2, PFalg_simple_type_t
itemType2, struct PFla_pair_t *p3, PFalg_simple_type_t itemType3) {
+struct PFla_pair_t pft_query_param3(
+ struct PFla_pair_t *p1, PFalg_simple_type_t itemType1,
+ struct PFla_pair_t *p2, PFalg_simple_type_t itemType2,
+ struct PFla_pair_t *p3, PFalg_simple_type_t itemType3) {
return (struct PFla_pair_t) {
.rel = fun_param(
p1->rel,
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
