Update of /cvsroot/monetdb/pathfinder/compiler/mil
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1002/mil
Modified Files:
milgen.brg
Log Message:
- relocate duplicate pftijah fun_call() defines to algebra.h
U milgen.brg
Index: milgen.brg
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/mil/milgen.brg,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- milgen.brg 11 Apr 2008 06:40:58 -0000 1.134
+++ milgen.brg 11 Apr 2008 07:02:36 -0000 1.135
@@ -8254,53 +8254,6 @@
}
} else if (p->sem.fun_call.kind == alg_fun_call_tijah) {
#ifdef HAVE_PFTIJAH
-
-/*
- * PFTIJAH defines. I decided not make a seperate include file for
- * pftijah so ensure that these defines are exactly the same as in
- * ../algebra/builtins.c
- */
-
-#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"
-
const char* fcname = PFqname_loc(p->sem.fun_call.qname);
PFalg_att_t fc_iter_a = p->schema.items[0].name; /* fixed */
-------------------------------------------------------------------------
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
