Update of /cvsroot/monetdb/pathfinder/compiler/include
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv11672
Modified Files:
abssyn.h builtins.h core.h core_mnemonic.h logical.h ns.h
Log Message:
undo XQuery Fulltext checkin in HEAD. Updates are now in XQFT branch
Index: ns.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/ns.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- ns.h 5 Nov 2009 16:23:59 -0000 1.20
+++ ns.h 10 Nov 2009 09:44:59 -0000 1.21
@@ -50,14 +50,14 @@
* either via an XQuery namespace declaration, e.g.
*
* declare namespace foo = "http://bar";
- *
+ *
* or a namespace declaration (xmlns) attribute, e.g.,
*
* <a xmlns:foo="http://bar";> ... </a>
*
* or by definition, see the W3C standard documents, e.g.
* W3C XQuery, 4.1 (Namespace Declarations):
- *
+ *
* "xs" |-> "http://www.w3.org/2001/XMLSchema";
*/
struct PFns_t {
@@ -72,7 +72,7 @@
/** Predefined namespace `xml' for any query */
extern PFns_t PFns_xml;
/** Predefined namespace `xs' (XML Schema) for any query */
-extern PFns_t PFns_xs;
+extern PFns_t PFns_xs;
/** Predefined namespace `xsi' (XML Schema Instance) for any query */
extern PFns_t PFns_xsi;
/** Predefined namespace `xdt' (XPath Data Types) for any query */
@@ -83,7 +83,7 @@
extern PFns_t PFns_upd;
/**
- * XQuery default function namespace (fn:..., this may be overridden
+ * XQuery default function namespace (fn:..., this may be overridden
* via `default function namespace = "..."')
* (see W3C XQuery 1.0 and XPath 2.0 Function and Operators, 1.5).
*/
@@ -95,26 +95,19 @@
*/
extern PFns_t PFns_op;
-#ifdef HAVE_PFTIJAH
-/**
- * XQuery full-text search operator namespace (fts:...)
- */
-extern PFns_t PFns_fts;
-#endif
-
/**
* Pathfinder's namespace for additional non-'fn' functions.
- */
+ */
extern PFns_t PFns_lib;
/**
* Pathfinder's namespace for additional tijah functions.
- */
+ */
extern PFns_t PFns_tijah;
/**
* Pathfinder's namespace for XRPC extension.
- */
+ */
extern PFns_t PFns_xrpc;
#ifdef HAVE_GEOXML
@@ -131,9 +124,9 @@
extern PFns_t PFns_pxmlsup;
#endif
-/**
+/**
* Pathfinder's own internal NS (pf:...).
- */
+ */
extern PFns_t PFns_pf;
/**
@@ -144,7 +137,7 @@
/** A prefix -> URI mapping table (implemented as PFarray_t */
typedef PFarray_t PFns_map_t;
-/**
+/**
* NS equality (URI-based, then prefix-based)
*/
int PFns_eq (PFns_t, PFns_t);
Index: builtins.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/builtins.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- builtins.h 5 Nov 2009 16:23:59 -0000 1.65
+++ builtins.h 10 Nov 2009 09:44:59 -0000 1.66
@@ -1298,11 +1298,6 @@
PFla_op_t **side_effects,
struct PFla_pair_t *args);
-struct PFla_pair_t PFbui_tijah_ftfun_score(const PFla_op_t *loop,
- bool ordering,
- PFla_op_t **side_effects,
- struct PFla_pair_t *args);
-
/*
* The main query functions
*/
@@ -1364,17 +1359,6 @@
struct PFla_pair_t *args);
#endif
-
-
-#ifdef HAVE_PFTIJAH
-
-struct PFla_pair_t PFbui_op_fts_str (const PFla_op_t *loop,
- bool ordering,
- PFla_op_t **side_effects,
- struct PFla_pair_t *args);
-
-#endif
-
#endif /* BUITLINS_H */
/* vim:set shiftwidth=4 expandtab: */
Index: core.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/core.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- core.h 5 Nov 2009 16:23:59 -0000 1.48
+++ core.h 10 Nov 2009 09:44:59 -0000 1.49
@@ -165,9 +165,6 @@
/* Pathfinder extension: XRPC */
, c_xrpc = 76 /**< XRPC calls: "execute at" */
-
- /* Associated For variable holders */
- , c_vars = 77 /**< variable pair (position. var + score. var)
of a for */
};
/** Core tree node type indicators */
@@ -189,7 +186,7 @@
/* semantic content for flwr subexpressions (let/for) */
struct {
- PFty_t (*quantifier) (PFty_t);
+ PFty_t (*quantifier) (PFty_t);
/**< quantifier for flwor return expression */
int fid; /**< for loop id (used in milprint_summer.c) */
} flwr;
@@ -233,13 +230,13 @@
/* initialize global variables */
void PFcore_init (void);
-/**
+/**
* Core constructor functions below.
*/
PFcnode_t *PFcore_leaf (PFctype_t);
-PFcnode_t *PFcore_wire1 (PFctype_t,
+PFcnode_t *PFcore_wire1 (PFctype_t,
const PFcnode_t *);
-PFcnode_t *PFcore_wire2 (PFctype_t,
+PFcnode_t *PFcore_wire2 (PFctype_t,
const PFcnode_t *, const PFcnode_t *);
PFcnode_t *PFcore_nil (void);
@@ -272,7 +269,6 @@
PFcnode_t *PFcore_for (const PFcnode_t *, const PFcnode_t *);
PFcnode_t *PFcore_forbind (const PFcnode_t *, const PFcnode_t *);
PFcnode_t *PFcore_forvars (const PFcnode_t *, const PFcnode_t *);
-PFcnode_t *PFcore_forvars2 (const PFcnode_t *, const PFcnode_t *, const
PFcnode_t *);
PFcnode_t *PFcore_let (const PFcnode_t *, const PFcnode_t *);
PFcnode_t *PFcore_letbind (const PFcnode_t *, const PFcnode_t *);
@@ -324,11 +320,6 @@
PFcnode_t *PFcore_some (const PFcnode_t *, const PFcnode_t *, const PFcnode_t
*);
/**
- * Full-text score variable
- */
-/*PFcnode_t *PFcore_forscore (const PFcnode_t *, const PFcnode_t *);*/
-
-/**
* Wrapper for #apply_.
*/
#define APPLY(fn,...) PFcore_apply_ ((fn), __VA_ARGS__, 0)
Index: core_mnemonic.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/core_mnemonic.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- core_mnemonic.h 5 Nov 2009 16:23:59 -0000 1.25
+++ core_mnemonic.h 10 Nov 2009 09:44:59 -0000 1.26
@@ -44,48 +44,48 @@
#include "core.h"
-#undef nil
-#undef new_var
-#undef var
-#undef num
-#undef dec
-#undef dbl
-#undef str
-#undef seqtype
-#undef seqcast
-#undef proof
-#undef subty
-#undef typeswitch
-#undef case_
-#undef cases
-#undef ifthenelse
-#undef flwr
-#undef for_
-#undef let
+#undef nil
+#undef new_var
+#undef var
+#undef num
+#undef dec
+#undef dbl
+#undef str
+#undef seqtype
+#undef seqcast
+#undef proof
+#undef subty
+#undef typeswitch
+#undef case_
+#undef cases
+#undef ifthenelse
+#undef flwr
+#undef for_
+#undef let
#undef letbind
-#undef seq
-#undef twig_seq
-#undef empty
-#undef true_
-#undef false_
+#undef seq
+#undef twig_seq
+#undef empty
+#undef true_
+#undef false_
#undef _root
#undef constr_elem
#undef constr_attr
#undef constr
#undef constr_tag
-#undef locsteps
-#undef step
-#undef kindt
-#undef namet
-#undef function
-#undef apply
-#undef ebv
-#undef error
-#undef error_loc
+#undef locsteps
+#undef step
+#undef kindt
+#undef namet
+#undef function
+#undef apply
+#undef ebv
+#undef error
+#undef error_loc
#undef fs_convert_op
#undef fn_data
#undef some
-#undef cast
+#undef cast
#define nil() PFcore_nil ()
#define new_var(v) PFcore_new_var (v)
@@ -110,7 +110,6 @@
#define for_(bind,expr) PFcore_for ((bind), (expr))
#define forbind(vars,expr) PFcore_forbind ((vars), (expr))
#define forvars(var,pos) PFcore_forvars ((var), (pos))
-#define forvars2(var,pos,score) PFcore_forvars2 ((var), (pos), (score))
#define let(e1,e2) PFcore_let ((e1), (e2))
#define letbind(e1,e2) PFcore_letbind ((e1), (e2))
#define where(e1,e2) PFcore_where ((e1), (e2))
@@ -141,13 +140,13 @@
#define arg(e1,e2) PFcore_arg((e1), (e2))
#define apply(fn,e) PFcore_apply ((fn), (e))
#define ebv(e) PFcore_ebv (e)
-
+
#define fs_convert_op_by_type(e,t) PFcore_fs_convert_op_by_type ((e), (t))
#define fs_convert_op_by_expr(e1,e2) PFcore_fs_convert_op_by_expr ((e1), (e2))
#define fn_data(e1) PFcore_fn_data (e1)
#define some(v,e1,e2) PFcore_some(v,e1,e2)
-
-#endif
+
+#endif
/* vim:set shiftwidth=4 expandtab: */
Index: abssyn.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/abssyn.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- abssyn.h 5 Nov 2009 16:23:59 -0000 1.38
+++ abssyn.h 10 Nov 2009 09:44:59 -0000 1.39
@@ -37,19 +37,19 @@
#define ABSSYN_H
/* PFqname_t */
-#include "qname.h"
+#include "qname.h"
/* PFns_map_t */
#include "ns.h"
/* PFvar_t */
-#include "variable.h"
+#include "variable.h"
/* PFsort_t */
#include "pf_xq.h"
/** no type of parse tree node will need more than
- * this many child nodes
+ * this many child nodes
*/
#define PFPNODE_MAXCHILD 2
@@ -120,7 +120,7 @@
, p_mod_imp = 62 /**< Module import */
, p_mod_ns = 63 /**< module namespace */
, p_mult = 64 /**< * (multiplication) */
- , p_named_ty = 65 /**< named type */
+ , p_named_ty = 65 /**< named type */
, p_ne = 66 /**< != (inequality) */
, p_nil = 67 /**< end-of-sequence marker */
, p_node_ty = 68 /**< node type */
@@ -192,15 +192,6 @@
/* Pathfinder extension: document management (ret type for docmgmt func.)
*/
, p_docmgmt_ty = 130 /**< "item" type `docmgmt' (funct. decls.) */
-
- /* Pathfinder extension: full-text search (ftcontains) */
- , p_ftcontains = 131 /**< keyword ftcontains for full-text search */
- , p_ftfilter = 132 /**< filters ftcontains full-text search */
- , p_ftignore = 133 /**< ignore nodes from full-text search */
- , p_ftor = 134 /**< full-text or expression */
- , p_ftand = 135 /**< full-text and expression */
- , p_ftmildnot = 136 /**< full-text Mild not experession */
- , p_ftnot = 137 /**< full-text not expression */
};
typedef enum PFptype_t PFptype_t;
@@ -300,10 +291,10 @@
(XQ Update Facility) */
PFinsertmod_t insert; /**< insertion target for "do insert"
(XQ Update Facility) */
-};
+};
-/* interfaces to parse construction routines
+/* interfaces to parse construction routines
*/
PFpnode_t *
p_leaf (PFptype_t type, PFloc_t loc);
Index: logical.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/logical.h,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- logical.h 5 Nov 2009 16:23:59 -0000 1.72
+++ logical.h 10 Nov 2009 09:44:59 -0000 1.73
@@ -172,7 +172,7 @@
, la_internal_op = 99 /**< operator used inside optimizations */
/* builtin support for XQuery functions */
, la_string_join =102 /**< fn:string-join */
-
+
, la_dummy =120 /**< dummy operator that does nothing */
};
@@ -835,9 +835,6 @@
PFla_op_t * PFla_rank (const PFla_op_t *n, PFalg_col_t a,
PFord_ordering_t s);
-/** Constructor for attaching score column. */
-PFla_op_t * attach_score (PFla_op_t *n);
-
/**
* Constructor for the row ranking operator.
* Special internal variant used during rowrank optimization.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
