Changeset: 1964114405a3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1964114405a3
Modified Files:
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_listing.c
monetdb5/mal/mal_parser.c
Branch: headless
Log Message:
Get it working to the prompt;
diffs (61 lines):
diff --git a/monetdb5/mal/mal_instruction.c b/monetdb5/mal/mal_instruction.c
--- a/monetdb5/mal/mal_instruction.c
+++ b/monetdb5/mal/mal_instruction.c
@@ -1339,7 +1339,7 @@
if (v->name)
GDKfree(v->name);
if (isVarConstant(mb,varid) || isVarDisabled(mb, varid))
- VALclear(getVarValue(mb,varid));
+ VALclear( &v->value);
v->name = 0;
v->type = 0;
v->flags = 0;
diff --git a/monetdb5/mal/mal_interpreter.c b/monetdb5/mal/mal_interpreter.c
--- a/monetdb5/mal/mal_interpreter.c
+++ b/monetdb5/mal/mal_interpreter.c
@@ -657,12 +657,10 @@
break;
case PATcall:
/* patterncall(@1,continue,stk) */
- assert (pci->fcn == NULL);
ret = (str) (*pci->fcn)(cntxt,mb,stk,pci);
break;
case CMDcall:
/*commandcall(@1,continue,stk)*/
- assert (pci->fcn == NULL);
/* improve performance with 20 ms/1M calls*/
malCommandCall(stk,pci);
break;
diff --git a/monetdb5/mal/mal_listing.c b/monetdb5/mal/mal_listing.c
--- a/monetdb5/mal/mal_listing.c
+++ b/monetdb5/mal/mal_listing.c
@@ -84,7 +84,7 @@
nme = nmebuf;
} else
nme = getArgName(mb, p, i);
- snprintf(s, (len- margin-(s-base)), "%s:%s", (nme ? nme
: "nil"), tpe);
+ snprintf(s, (len- margin-(s-base)), "%s%s", (nme ? nme
: "nil"), tpe);
advance(s,base,len);
if (i != p->retc-1 && i< p->argc-1)
sprintf(s, ", ");
@@ -179,7 +179,7 @@
pstring = varGetPropStr(mb, getArg(p,i));
else pstring = 0;
advance(t,base,len);
- snprintf(t,(len-(t-base)),"%s:%s%s",getArgName(mb,p,i),tpe,
(pstring?pstring:""));
+ snprintf(t,(len-(t-base)),"%s%s%s",getArgName(mb,p,i),tpe,
(pstring?pstring:""));
advance(t,base,len);
if( i<p->argc-1) sprintf(t,",");
if(pstring) { GDKfree(pstring); pstring=0;}
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
@@ -1509,6 +1509,8 @@
{
while( currChar(cntxt)!= ')'){
switch(term(cntxt,curBlk,curInstr,0)){
+ case 0:
+ break;
case 2: return 2;
case 3: return 3;
default:
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
