MonetDB: headless - Merge from tip

[mk]

Changeset: 8150fa49d422 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8150fa49d422
Modified Files:
        monetdb5/mal/mal_parser.c
Branch: headless
Log Message:

Merge from tip


diffs (39 lines):

diff --git a/gdk/gdk_inspect.c b/gdk/gdk_inspect.c
--- a/gdk/gdk_inspect.c
+++ b/gdk/gdk_inspect.c
@@ -151,9 +151,10 @@
        }
 
        for (i = 0; i <= COLLISION + 1; i++)
-               if (cnt[i]) 
+               if (cnt[i]) {
                        bp = BUNappend(bp, pre(s, local_itoa((ssize_t) 
(i?(((ssize_t)1)<<(i-1)):0))), FALSE); 
                        bv = BUNappend(bv, local_utoa((size_t) cnt[i]), FALSE);
+               }
 }
 
 static void
diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c
--- a/monetdb5/mal/mal_parser.c
+++ b/monetdb5/mal/mal_parser.c
@@ -883,8 +883,10 @@
                        setPolymorphic(curInstr,type,TRUE);
                setVarType(curBlk,varid,type);
                propList(cntxt,varid);
-       } else
+       } else {
+               varid = -1;
                parseError(cntxt,"argument expected\n");
+        }
        curInstr= pushArgument(curBlk,curInstr, varid);
        return curInstr;
 }
@@ -1124,7 +1126,7 @@
 fcnHeader(Client cntxt,int kind)
 {
        int l,type;
-       str fnme= NULL, modnme= NULL;
+       str fnme,modnme = NULL;
        char ch;
        Symbol  curPrg;
        MalBlkPtr curBlk;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list