Changeset: 3b16952ba79b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3b16952ba79b
Modified Files:
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_import.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_parser.c
Branch: default
Log Message:
indent with uncrustify
diffs (truncated from 4256 to 300 lines):
diff --git a/monetdb5/mal/mal_debugger.c b/monetdb5/mal/mal_debugger.c
--- a/monetdb5/mal/mal_debugger.c
+++ b/monetdb5/mal/mal_debugger.c
@@ -38,9 +38,10 @@
int MDBdelay; /* do not immediately react */
-#define skipBlanc(c,X)while(*(X) isspace((int)*X)){ X++; }
-#define skipNonBlanc(c,X) while(*(X) !isspace((int) *X)){ X++; }
-#define skipWord(c,X)while(*(X) isalnum((int) *X)){X++;} skipBlanc(c,X);
+#define skipBlanc(c, X)while (*(X) isspace((int) *X)) { X++; }
+#define skipNonBlanc(c, X) while (*(X) !isspace((int) *X)) { X++; }
+#define skipWord(c, X) while (*(X) isalnum((int) *X)) { X++; } \
+ skipBlanc(c, X);
static void printStackElm(stream *f, MalBlkPtr mb, ValPtr v, int index, BUN
cnt, BUN first);
static void printStackHdr(stream *f, MalBlkPtr mb, ValPtr v, int index);
@@ -65,21 +66,21 @@ isBreakpoint(Client cntxt, MalBlkPtr mb,
int i, j;
for (i = 0; i mdbTable[cntxt-idx].brkTop; i++) {
- if( mdbTable[cntxt-idx].brkBlock[i] != mb)
+ if (mdbTable[cntxt-idx].brkBlock[i] != mb)
continue;
- if( mdbTable[cntxt-idx].brkPc[i] == pc )
+ if (mdbTable[cntxt-idx].brkPc[i] == pc)
return mdbTable[cntxt-idx].brkCmd[i];
- if( mdbTable[cntxt-idx].brkMod[i] getModuleId(p)
- mdbTable[cntxt-idx].brkFcn[i] getFunctionId(p)
- strcmp(mdbTable[cntxt-idx].brkMod[i],
getModuleId(p))==0
- strcmp(mdbTable[cntxt-idx].brkFcn[i],
getFunctionId(p))==0)
+ if (mdbTable[cntxt-idx].brkMod[i] getModuleId(p)
+ mdbTable[cntxt-idx].brkFcn[i] getFunctionId(p)
+ strcmp(mdbTable[cntxt-idx].brkMod[i], getModuleId(p))
== 0
+ strcmp(mdbTable[cntxt-idx].brkFcn[i],
getFunctionId(p)) == 0)
return mdbTable[cntxt-idx].brkCmd[i];
- if( mdbTable[cntxt-idx].brkVar[i] = 0 )
- for (j = 0; j p-retc; j++)
- if (mdbTable[cntxt-idx].brkVar[i] == getArg(p,j))
- return mdbTable[cntxt-idx].brkCmd[i];
+ if (mdbTable[cntxt-idx].brkVar[i] = 0)
+ for (j = 0; j p-retc; j++)
+ if (mdbTable[cntxt-idx].brkVar[i] == getArg(p,
j))
+ return mdbTable[cntxt-idx].brkCmd[i];
}
return 0;
}
@@ -87,7 +88,7 @@ isBreakpoint(Client cntxt, MalBlkPtr mb,
/*
* Break points can be set on assignment to a specific variable,
* specific operation, or a instruction line
-*/
+ */
void
mdbSetBreakRequest(Client cntxt, MalBlkPtr mb, str request, char cmd)
{
@@ -97,12 +98,12 @@ mdbSetBreakRequest(Client cntxt, MalBlkP
Symbol sym;
/* set breakpoint on specific line */
- if( *request == '#' ){
- i= atoi(request+1);
- if( i0 || i= mb-stop)
- mnstr_printf(cntxt-fdout, breakpoint on #%d (%d) not
set\n,
- i, mb-stop);
- else {
+ if (*request == '#') {
+ i = atoi(request + 1);
+ if (i 0 || i = mb-stop)
+ mnstr_printf(cntxt-fdout, breakpoint on #%d (%d) not
set\n,
+ i, mb-stop);
+ else {
mdb-brkBlock[mdb-brkTop] = mb;
mdb-brkPc[mdb-brkTop] = i;
mdb-brkVar[mdb-brkTop] = -1;
@@ -117,27 +118,28 @@ mdbSetBreakRequest(Client cntxt, MalBlkP
}
/* check for a [module.]function request */
- fcnnme= strchr(request,'.');
- if( fcnnme){
- modnme= request;
- *fcnnme= 0;
+ fcnnme = strchr(request, '.');
+ if (fcnnme) {
+ modnme = request;
+ *fcnnme = 0;
fcnnme++;
- sym= findSymbol(cntxt-nspace, modnme,fcnnme);
- mdb-brkBlock[mdb-brkTop] = sym? sym-def: mb;
+ sym = findSymbol(cntxt-nspace, modnme, fcnnme);
+ mdb-brkBlock[mdb-brkTop] = sym ? sym-def : mb;
mdb-brkPc[mdb-brkTop] = -1;
mdb-brkVar[mdb-brkTop] = -1;
- mdb-brkMod[mdb-brkTop] = putName(modnme,strlen(modnme));
- mdb-brkFcn[mdb-brkTop] = putName(fcnnme,strlen(fcnnme));
- fcnnme--; *fcnnme= '.';
+ mdb-brkMod[mdb-brkTop] = putName(modnme, strlen(modnme));
+
