Changeset: 554321ac288e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=554321ac288e
Modified Files:
sql/backends/monet5/sql_gencode.mx
Branch: Apr2011
Log Message:
white space
diffs (truncated from 723 to 300 lines):
diff --git a/sql/backends/monet5/sql_gencode.mx
b/sql/backends/monet5/sql_gencode.mx
--- a/sql/backends/monet5/sql_gencode.mx
+++ b/sql/backends/monet5/sql_gencode.mx
@@ -107,7 +107,7 @@
}
static int
-argumentZero(MalBlkPtr mb, int tpe)
+argumentZero(MalBlkPtr mb, int tpe)
{
ValRecord cst;
@@ -138,7 +138,7 @@
The dump_header produces a sequence of instructions for
the front-end to prepare presentation of a result table.
@c
-void
+static void
dump_header(mvc *sql, MalBlkPtr mb, stmt *s, list *l)
{
node *n;
@@ -213,7 +213,7 @@
The dump_cols produces a sequence of instructions for
the front-end to prepare presentation of a result table (bat).
@c
-int
+static int
dump_cols(mvc *sql, MalBlkPtr mb, list *l, int result_set)
{
node *n;
@@ -238,14 +238,14 @@
Some utility routines to generate code
The equality operator in MAL is '==' instead of '='.
@c
-str
+static str
convertMultiplexMod(str mod, str op)
{
if (strcmp(op, "=") == 0)
return "calc";
return mod;
}
-str
+static str
convertMultiplexFcn(str op)
{
if (strcmp(op, "=") == 0)
@@ -253,7 +253,7 @@
return op;
}
-str
+static str
convertOperator(str op)
{
if (strcmp(op, "=") == 0)
@@ -261,8 +261,8 @@
return op;
}
-int
-range_join_convertable(stmt *s, stmt **base, stmt **L, stmt **H)
+static int
+range_join_convertable(stmt *s, stmt **base, stmt **L, stmt **H)
{
int ls = 0, hs = 0;
stmt *l = NULL, *h = NULL;
@@ -270,11 +270,11 @@
int tt = tail_type(s->op2)->type->localtype;
if (tt > TYPE_lng)
- return 0;
+ return 0;
if (s->op2->type == st_binop) {
bl = s->op2->op1;
l = s->op2->op2;
- } else if (s->op2->type == st_Nop &&
+ } else if (s->op2->type == st_Nop &&
list_length(s->op2->op1->op4.lval) == 2) {
bl = s->op2->op1->op4.lval->h->data;
l = s->op2->op1->op4.lval->t->data;
@@ -283,7 +283,7 @@
bh = s->op3->op1;
h = s->op3->op2;
}
- else if (s->op3->type == st_Nop &&
+ else if (s->op3->type == st_Nop &&
list_length(s->op3->op1->op4.lval) == 2) {
bh = s->op3->op1->op4.lval->h->data;
h = s->op3->op1->op4.lval->t->data;
@@ -291,10 +291,10 @@
if ((ls = (l &&
strcmp(s->op2->op4.funcval->func->base.name, "sql_sub")==0 &&
- l->nrcols == 0) ||
+ l->nrcols == 0) ||
(hs = (h &&
- strcmp(s->op3->op4.funcval->func->base.name, "sql_add")==0 &&
+ strcmp(s->op3->op4.funcval->func->base.name, "sql_add")==0 &&
h->nrcols == 0))) && (ls || hs) && bl == bh) {
*base = bl;
*L = l;
@@ -323,7 +323,7 @@
}
static int
-_dump_2( MalBlkPtr mb, char *mod, char *name, int o1, int o2)
+_dump_2( MalBlkPtr mb, char *mod, char *name, int o1, int o2)
{
InstrPtr q;
@@ -342,7 +342,7 @@
s->nr = _dump_2(mb, mod, name, o1, o2);
}
-InstrPtr
+static InstrPtr
multiplex2(MalBlkPtr mb, char *mod, char *name /* should be eaten */, int o1,
int o2, int rtype)
{
InstrPtr q;
@@ -357,7 +357,7 @@
return q;
}
-InstrPtr
+static InstrPtr
dump_crossproduct(MalBlkPtr mb, int l, int r)
{
int z;
@@ -387,7 +387,7 @@
return q;
}
-InstrPtr
+static InstrPtr
multiplexN(MalBlkPtr mb, char *mod, char *name)
{
InstrPtr q = NULL;
@@ -397,7 +397,7 @@
return q;
}
-int
+static int
dump_joinN(backend *sql, MalBlkPtr mb, stmt *s)
{
char *mod = sql_func_mod(s->op4.funcval->func);
@@ -475,7 +475,7 @@
return k;
}
-InstrPtr
+static InstrPtr
pushSchema(MalBlkPtr mb, InstrPtr q, sql_table *t)
{
if (t->s)
@@ -490,16 +490,16 @@
InstrPtr q = NULL;
char *db_alias = NULL;
- node* n = l->h;
+ node* n = l->h;
int i = 0;
n = n->next;
-
+
/*create the mserver reconnect*/
q = newStmt1(mb,mapiRef,reconnectRef);
setVarUDFtype(mb,getArg(q,0));
setVarType(mb, getArg(q, 0), TYPE_int);
-
+
while (n) {
if (i == 1)
q = pushInt(mb, q, *(int *) n->data);
@@ -515,24 +515,24 @@
n = n->next;
i++;
}
-
+
return db_alias;
}
-void
+static void
disconnect(MalBlkPtr mb, list *l)
{
InstrPtr q = NULL;
- node* n = l->h;
+ node* n = l->h;
-
+
/*create the mserver disconnect*/
q = newStmt1(mb,mapiRef,disconnectRef);
setVarUDFtype(mb,getArg(q,0));
setVarType(mb, getArg(q, 0), TYPE_int);
-
+
if (list_length(l) == 2) {
(void) pushStr(mb, q, (char *) n->next->data);
}
@@ -543,7 +543,7 @@
The big code generation switch.
@c
#define SMALLBUFSIZ 64
-static int
+static int
_dumpstmt(backend *sql, MalBlkPtr mb, stmt *s)
{
InstrPtr q = NULL;
@@ -569,7 +569,7 @@
case st_connection: {
if (list_length(s->op4.lval) < 3)
disconnect(mb, s->op4.lval);
- else
+ else
reconnect(mb, s->op4.lval);
s->nr = 1;
} break;
@@ -577,6 +577,7 @@
if (s->op1) {
if (VAR_GLOBAL(s->flag)) { /* globals */
int tt = tail_type(s)->type->localtype;
+
q = newStmt1(mb, sqlRef, "getVariable");
q = pushArgument(mb, q, sql->mvc_var);
q = pushStr(mb, q,
s->op1->op4.aval->data.val.sval);
@@ -658,7 +659,7 @@
q = newStmt2(mb, sqlRef, bindRef);
setVarType(mb, getArg(q, 0), newBatType(ht, tt));
setVarUDFtype(mb,getArg(q,0));
- q = pushArgument(mb, q, sql->mvc_var);
+ q = pushArgument(mb, q, sql->mvc_var);
q = pushSchema(mb, q, s->op4.cval->t);
q = pushStr(mb, q, s->op4.cval->t->base.name);
q = pushStr(mb, q, s->op4.cval->base.name);
@@ -672,7 +673,7 @@
q = newStmt2(mb, sqlRef, binddbatRef);
setVarType(mb, getArg(q,0), newBatType(ht,TYPE_oid));
setVarUDFtype(mb,getArg(q,0));
- q = pushArgument(mb, q, sql->mvc_var);
+ q = pushArgument(mb, q, sql->mvc_var);
q = pushSchema(mb, q, s->op4.tval);
q = pushStr(mb, q, s->op4.tval->base.name);
q = pushInt(mb, q, s->flag);
@@ -687,7 +688,7 @@
tt = tail_type(s)->type->localtype;
setVarType(mb, getArg(q, 0), newBatType(ht, tt));
setVarUDFtype(mb,getArg(q,0));
- q = pushArgument(mb, q, sql->mvc_var);
+ q = pushArgument(mb, q, sql->mvc_var);
q = pushSchema(mb, q, s->op4.idxval->t);
q = pushStr(mb, q, s->op4.idxval->t->base.name);
q = pushStr(mb, q, s->op4.idxval->base.name);
@@ -730,7 +731,7 @@
l = l1->nr;
/* first insert single value into a bat */
assert(s->nrcols);
- if (s->nrcols == 0) {
+ if (s->nrcols == 0) {
int k;
int ht = TYPE_oid;
int tt = tail_type(s->op1)->type->localtype;
@@ -753,7 +754,7 @@
flag >>= 2;
if (flag)
- name = "utopn_max";
+ name = "utopn_max";
if (!utopn)
name = name+1;
@@ -761,7 +762,7 @@
q = pushArgument(mb,q, offset);
q = pushArgument(mb,q, len);
topn = getDestVar(q);
-
+
q = newStmt(mb, "pqueue", name);
if (la)
q = pushArgument(mb, q, la);
@@ -769,8 +770,8 @@
q = pushArgument(mb, q, topn);
l = getDestVar(q);
- /* since both arguments of algebra.slice are
- inclusive correct the LIMIT value by
+ /* since both arguments of algebra.slice are
+ inclusive correct the LIMIT value by
substracting 1 */
if (s->op2->op4.aval->data.val.wval) {
q = newStmt1(mb, calcRef, "-");
@@ -790,8 +791,8 @@
q = pushArgument(mb, q, len);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
