Update of /cvsroot/monetdb/pathfinder/compiler/include
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23738/include
Modified Files:
algebra.h builtins.h mil.h mil_mnemonic.h
Log Message:
Implemented translation to a MIL function of the following new tijah functions.
- tijah:terms(element*) as string*
- tijah:terms(element*,node) as string*
- tijah:tf-all(string) as integer
- tijah:tf-all(string,node) as integer
- tijah:tf(element*,string) as integer
- tijah:tf(element*,string,node) as integer
- tijah:fb-terms(element*) as string*
- tijah:fb-terms(element*,node) as string*
The main MIL functions are still empty and Henning will fill te blanks.
Index: mil_mnemonic.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/mil_mnemonic.h,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- mil_mnemonic.h 5 Oct 2009 09:38:34 -0000 1.69
+++ mil_mnemonic.h 4 Dec 2009 14:07:38 -0000 1.70
@@ -508,6 +508,14 @@
#define tj_ft_index_info(a,b,c) PFmil_tj_ft_index_info ((a),(b),(c))
+#define tj_terms(a,b,c,d) PFmil_tj_terms ((a), (b), (c), (d))
+
+#define tj_tfall(a,b,c,d) PFmil_tj_tfall ((a), (b), (c), (d))
+
+#define tj_tf(a,b,c,d,e) PFmil_tj_tf ((a), (b), (c), (d), (e))
+
+#define tj_fbterms(a,b,c,d) PFmil_tj_fbterms ((a), (b), (c), (d))
+
#endif
#ifdef HAVE_GEOXML
Index: algebra.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/algebra.h,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- algebra.h 5 Oct 2009 09:38:06 -0000 1.114
+++ algebra.h 4 Dec 2009 14:07:38 -0000 1.115
@@ -742,6 +742,15 @@
#define PFT_TOKENIZE "pftijah_tokenize"
#define PFT_RESSIZE "pftijah_ressize"
+#define PFT_TERMS "pftijah_terms"
+#define PFT_TERMS_O "pftijah_terms_o"
+#define PFT_TFALL "pftijah_tfall"
+#define PFT_TFALL_O "pftijah_tfall_o"
+#define PFT_TF "pftijah_tf"
+#define PFT_TF_O "pftijah_tf_o"
+#define PFT_FBTERMS "pftijah_fbterms"
+#define PFT_FBTERMS_O "pftijah_fbterms_o"
+
#endif /* HAVE_PFTIJAH */
#endif /* ALGEBRA_H */
Index: builtins.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/builtins.h,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- builtins.h 10 Nov 2009 09:44:59 -0000 1.66
+++ builtins.h 4 Dec 2009 14:07:38 -0000 1.67
@@ -1357,6 +1357,42 @@
bool ordering,
PFla_op_t **side_effects,
struct PFla_pair_t *args);
+
+/* the new term functions */
+
+struct PFla_pair_t PFbui_tijah_terms (const PFla_op_t *loop,
+ bool ordering,
+ PFla_op_t **side_effects,
+ struct PFla_pair_t *args);
+struct PFla_pair_t PFbui_tijah_terms_o (const PFla_op_t *loop,
+ bool ordering,
+ PFla_op_t **side_effects,
+ struct PFla_pair_t *args);
+struct PFla_pair_t PFbui_tijah_tfall (const PFla_op_t *loop,
+ bool ordering,
+ PFla_op_t **side_effects,
+ struct PFla_pair_t *args);
+struct PFla_pair_t PFbui_tijah_tfall_o (const PFla_op_t *loop,
+ bool ordering,
+ PFla_op_t **side_effects,
+ struct PFla_pair_t *args);
+struct PFla_pair_t PFbui_tijah_tf (const PFla_op_t *loop,
+ bool ordering,
+ PFla_op_t **side_effects,
+ struct PFla_pair_t *args);
+struct PFla_pair_t PFbui_tijah_tf_o (const PFla_op_t *loop,
+ bool ordering,
+ PFla_op_t **side_effects,
+ struct PFla_pair_t *args);
+struct PFla_pair_t PFbui_tijah_fbterms (const PFla_op_t *loop,
+ bool ordering,
+ PFla_op_t **side_effects,
+ struct PFla_pair_t *args);
+struct PFla_pair_t PFbui_tijah_fbterms_o (const PFla_op_t *loop,
+ bool ordering,
+ PFla_op_t **side_effects,
+ struct PFla_pair_t *args);
+
#endif
#endif /* BUITLINS_H */
Index: mil.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/mil.h,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- mil.h 21 Oct 2009 13:28:42 -0000 1.87
+++ mil.h 4 Dec 2009 14:07:38 -0000 1.88
@@ -437,6 +437,10 @@
, m_tj_ft_index_info
, m_tj_add_fti_tape
, m_tj_docmgmt_tape
+ , m_tj_terms
+ , m_tj_tfall
+ , m_tj_tf
+ , m_tj_fbterms
#endif
#ifdef HAVE_GEOXML
, m_geo_point /**< wkb create */
@@ -1122,6 +1126,15 @@
PFmil_t * PFmil_tj_ft_index_info (const PFmil_t *a, const PFmil_t *b, const
PFmil_t *c);
+
+PFmil_t * PFmil_tj_terms (const PFmil_t *a, const PFmil_t *b, const PFmil_t
*c, const PFmil_t *d);
+
+PFmil_t * PFmil_tj_tfall (const PFmil_t *a, const PFmil_t *b, const PFmil_t
*c, const PFmil_t *d);
+
+PFmil_t * PFmil_tj_tf (const PFmil_t *a, const PFmil_t *b, const PFmil_t *c,
const PFmil_t *d, const PFmil_t *e);
+
+PFmil_t * PFmil_tj_fbterms (const PFmil_t *a, const PFmil_t *b, const PFmil_t
*c, const PFmil_t *d);
+
#endif
#ifdef HAVE_GEOXML
------------------------------------------------------------------------------
Join us December 9, 2009 for the Red Hat Virtual Experience,
a free event focused on virtualization and cloud computing.
Attend in-depth sessions from your desk. Your couch. Anywhere.
http://p.sf.net/sfu/redhat-sfdev2dev
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
