Changeset: e0f2dbc76212 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e0f2dbc76212
Modified Files:
MonetDB5/src/mal/mal_function.mx
Branch: Jun2010
Log Message:
cleanup spaces/tabs mess
diffs (54 lines):
diff -r 0c0858fdc97f -r e0f2dbc76212 MonetDB5/src/mal/mal_function.mx
--- a/MonetDB5/src/mal/mal_function.mx Thu May 13 15:14:35 2010 +0200
+++ b/MonetDB5/src/mal/mal_function.mx Thu May 13 16:57:58 2010 +0200
@@ -295,29 +295,29 @@
yieldseen= TRUE;
}
case RETURNsymbol:
- { InstrPtr ps= getInstrPtr(mb,0);
- int e;
+ {
+ InstrPtr ps = getInstrPtr(mb, 0);
+ int e;
if (p->barrier == RETURNsymbol)
- yieldseen = FALSE; /* always end with a
return */
- if( ps->retc != p->retc){
- showScriptException(mb,i,SYNTAX,
- "invalid return target!");
- mb->errors++;
- } else
- if(ps->typechk == TYPE_RESOLVED)
- for(e=0;e<p->retc; e++){
- if( resolveType(getArgType(mb,ps,e),getArgType(mb,p,e))
<0 ){
- str tpname=
getTypeName(getArgType(mb,p,e));
- showScriptException(mb,i,TYPE,
- "%s type mismatch at
type '%s'",
- (p->barrier==RETURNsymbol?"RETURN":"YIELD"),
tpname);
- GDKfree(tpname);
- mb->errors++;
- }
- }
- if(ps->typechk != TYPE_RESOLVED) fixed =0;
+ yieldseen = FALSE; /* always end
with a return */
+ if (ps->retc != p->retc) {
+ showScriptException(mb, i, SYNTAX,
+ "invalid return
target!");
+ mb->errors++;
+ } else if (ps->typechk == TYPE_RESOLVED)
+ for (e = 0; e < p->retc; e++) {
+ if (resolveType(getArgType(mb,
ps, e), getArgType(mb, p, e)) < 0) {
+ str tpname =
getTypeName(getArgType(mb, p, e));
+ showScriptException(mb,
i, TYPE,
+ "%s
type mismatch at type '%s'",
+
(p->barrier == RETURNsymbol ? "RETURN" : "YIELD"), tpname);
+ GDKfree(tpname);
+ mb->errors++;
+ }
+ }
+ if (ps->typechk != TYPE_RESOLVED) fixed = 0;
}
- if (btop==0)
+ if (btop == 0)
retseen = 1;
break;
case RAISEsymbol:
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
