Update of /cvsroot/monetdb/pathfinder/compiler/algebra
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv10631/algebra
Modified Files:
builtins.c core2alg.brg logical.c
Log Message:
-- Apply Anands whitespace fixes.
Index: core2alg.brg
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/core2alg.brg,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- core2alg.brg 10 Nov 2009 09:45:09 -0000 1.93
+++ core2alg.brg 10 Nov 2009 16:16:53 -0000 1.94
@@ -1272,7 +1272,7 @@
var_map = project (rowid,
proj (col_outer, col_iter),
proj (col_inner, col_inner));
-
+
/* save old environment */
old_env = ENV;
@@ -1679,7 +1679,7 @@
proj (col_inner, col_inner));
/* store the variable map to retrieve the old iter values */
then_map = var_map;
-
+
/* save old environment */
old_env = ENV;
@@ -1730,7 +1730,7 @@
proj (col_inner, col_inner));
/* store the variable map to retrieve the old iter values */
else_map = var_map;
-
+
/* update the environment for translation of e3 */
ENV = PFarray (sizeof (PFla_env_t), 50);
@@ -3616,7 +3616,7 @@
/* use this key as inner loop relation */
in_loop = project (number, proj (col_iter1, col_inner));
/* evaluate for all nodes a self step that filters the correct
- kind and name */
+ kind and name */
filter = project (
step_join (
PFla_set_to_la (e.frag),
Index: logical.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/logical.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- logical.c 10 Nov 2009 09:45:09 -0000 1.130
+++ logical.c 10 Nov 2009 16:16:53 -0000 1.131
@@ -605,7 +605,7 @@
/* indicate what kind of internal operator we are working on */
ret->sem.eqjoin_opt.kind = la_cross;
-
+
/* copy schema from argument 2, check for duplicate column names
and discard if present */
for (j = 0; j < n2->schema.count; j++) {
@@ -800,7 +800,7 @@
i--;
}
}
-
+
/* copy schema from projection list 'rproj' */
/* discard join columns - they are already added */
for (i = 1; i < PFarray_last (rproj); i++) {
Index: builtins.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/builtins.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- builtins.c 10 Nov 2009 09:45:09 -0000 1.132
+++ builtins.c 10 Nov 2009 16:16:53 -0000 1.133
@@ -370,9 +370,9 @@
/* 2.1. fn:node-name */
/* ----------------- */
-/* The fn:node-name function returns an expanded for
+/* The fn:node-name function returns an expanded for
* node kinds that can have names.
- * Among them obviously elements and attributes.
+ * Among them obviously elements and attributes.
*/
static struct PFla_pair_t
@@ -430,15 +430,15 @@
struct PFla_pair_t *args)
{
(void) loop; (void) ordering; (void) side_effects;
-
+
PFla_op_t *attributes = NULL;
PFalg_step_spec_t self_attr_spec;
self_attr_spec.axis = alg_self;
self_attr_spec.kind = node_kind_attr;
-
+
/* just find every attribute */
- self_attr_spec.qname = PFqname (PFns_wild, NULL);
-
+ self_attr_spec.qname = PFqname (PFns_wild, NULL);
+
attributes = attach (
project (
PFla_step_join_simple (
@@ -466,15 +466,15 @@
struct PFla_pair_t *args)
{
(void) loop; (void) ordering; (void) side_effects;
-
+
PFla_op_t *elements = NULL;
PFalg_step_spec_t self_elem_spec;
self_elem_spec.axis = alg_self;
- self_elem_spec.kind = node_kind_elem;
-
+ self_elem_spec.kind = node_kind_elem;
+
/* just find every element */
self_elem_spec.qname = PFqname (PFns_wild, NULL);
-
+
elements = attach (
project (
PFla_step_join_simple (
@@ -487,7 +487,7 @@
proj (col_iter, col_iter),
proj (col_item, col_res)),
col_pos, lit_int(1));
-
+
return (struct PFla_pair_t) {
.rel = elements,
.frag = args[0].frag
@@ -509,7 +509,7 @@
ordering,
side_effects,
args).rel);
-
+
return (struct PFla_pair_t) {
.rel = union_,
.frag = args[0].frag
@@ -528,7 +528,7 @@
}
/* node-name for elements */
-struct PFla_pair_t
+struct PFla_pair_t
PFfn_bui_node_name_elem (const PFla_op_t *loop,
bool ordering,
PFla_op_t **side_effects,
@@ -2387,7 +2387,7 @@
/**
* Algebra implementation for
* geoxml:intersection(xs:string, xs:string) : xs:string </code>
- * stolen from fn:concat
+ * stolen from fn:concat
*/
struct PFla_pair_t
PFbui_geoxml_intersection (const PFla_op_t *loop,
@@ -4256,12 +4256,12 @@
PFla_op_t *node_scj,
*sel;
PFalg_step_spec_t anc_node_spec;
-
+
anc_node_spec.axis = alg_anc_s;
anc_node_spec.kind = node_kind_node;
/* missing QName */
anc_node_spec.qname = PFqname (PFns_wild, NULL);
-
+
/* do an ancestor-or-self::node() step
with exact position values */
node_scj = rownum (
@@ -4277,7 +4277,7 @@
proj (col_iter, col_iter),
proj (col_item, col_res))),
col_pos, sortby (col_item), col_iter);
-
+
/* select the first ancestor */
sel = project (
select_ (
@@ -4290,7 +4290,7 @@
col_res),
proj (col_iter, col_iter),
proj (col_item, col_item));
-
+
/* add the position values */
return (struct PFla_pair_t) {
.rel = attach (sel, col_pos, lit_nat (1)),
@@ -5869,7 +5869,7 @@
return (struct PFla_pair_t) {
.rel = res,
- .frag = (ty & aat_node)
+ .frag = (ty & aat_node)
? PFla_set (frag_extract (res, 2))
: PFla_empty_set () };
}
@@ -6505,7 +6505,7 @@
/**
* Build in function fn:put(node, xs:string) as empty-sequence()
*/
-struct PFla_pair_t
+struct PFla_pair_t
PFbui_fn_put (const PFla_op_t *loop,
bool ordering,
PFla_op_t **side_effects,
@@ -6521,7 +6521,7 @@
/**
* Build in function pf:documents() as element()*
*/
-struct PFla_pair_t
+struct PFla_pair_t
PFbui_pf_documents (const PFla_op_t *loop,
bool ordering,
PFla_op_t **side_effects,
@@ -6772,7 +6772,7 @@
proj (col_iter1, col_iter),
proj (col_item1, col_item)),
col_iter,
- col_iter1),
+ col_iter1),
la_dj_attr,
col_item1,
col_res,
@@ -6867,7 +6867,7 @@
.rel = fun_param(
p1->rel,
nil(),
- ipi_schema(itemType)),
+ ipi_schema(itemType)),
.frag = PFla_empty_set () };
}
@@ -6881,8 +6881,8 @@
fun_param(
p2->rel,
nil(),
- ipi_schema(itemType2)),
- ipi_schema(itemType1)),
+ ipi_schema(itemType2)),
+ ipi_schema(itemType1)),
.frag = PFla_empty_set () };
}
@@ -6899,9 +6899,9 @@
fun_param(
p3->rel,
nil(),
- ipi_schema(itemType3)),
- ipi_schema(itemType2)),
- ipi_schema(itemType1)),
+ ipi_schema(itemType3)),
+ ipi_schema(itemType2)),
+ ipi_schema(itemType1)),
.frag = PFla_empty_set () };
}
@@ -6923,7 +6923,7 @@
.rel = fun_call(
loop,
p_fun_param.rel,
- ((PFT_FUN_FTFUN(query_name)) ?
+ ((PFT_FUN_FTFUN(query_name)) ?
ipis_schema(funcall_t) : ipi_schema(funcall_t) ),
alg_fun_call_tijah,
PFqname (PFns_wild, query_name),
------------------------------------------------------------------------------
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
