Changeset: 31f16a066076 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=31f16a066076
Modified Files:
monetdb5/modules/mal/mal_init.mx
Branch: sciql
Log Message:
Merge with default branch.
diffs (66 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -512,13 +512,13 @@
enable_strict=$dft_strict)
dnl Set compiler switches.
dnl The idea/goal is to be as strict as possible, i.e., enable preferably
-dnl *all* warnings and make them errors. This should help keeping the code
+dnl *all* warnings and make them errors. This should help keep the code
dnl as clean and portable as possible.
dnl It turned out, though, that this, especially turning all warnings into
-dnl errors is a bit too ambitious for configure/autoconf. Hence, we set
+dnl errors, is a bit too ambitious for configure/autoconf. Hence, we set
dnl the standard CFLAGS to what configure/autoconf can cope with
dnl (basically everything except "-Werror"). For "-Werror" and some
-dnl switches that disable selected warnings that haven't been sorted out,
+dnl switches that disable selected warnings that haven't been sorted out
dnl yet, we set X_CFLAGS, which are added to the standard
dnl CFLAGS once configure/autoconf are done with their job,
dnl i.e., at the end of this configure[.ag] script.
diff --git a/monetdb5/mal/mal_function.mx b/monetdb5/mal/mal_function.mx
--- a/monetdb5/mal/mal_function.mx
+++ b/monetdb5/mal/mal_function.mx
@@ -911,6 +911,11 @@
/* define variables */
for(k=0; k<p->retc; k++){
l= getArg(p,k);
+ if (isVarInit(mb, l) && decl[l] == 0) {
+ /* first time we see this variable and it is
already
+ * initialized: assume it exists globally */
+ decl[l] = blks[0];
+ }
setVarInit(mb,l);
if( decl[l] == 0){
/* variable has not been defined yet */
@@ -923,18 +928,6 @@
mnstr_printf(GDKout,"defined %s in block %d\n",
getVarName(mb,l),decl[l]);
#endif
- } else
- if( !isVarInit(mb,l) ){
- /* is the block still active ? */
- for( i=0; i<= top; i++)
- if( blks[i] == decl[l] )
- break;
- if( i> top || blks[i]!= decl[l] ){
- showScriptException(mb,pc,TYPE,
- "'%s' assigned outside
scope",
- getVarName(mb,l));
- mb->errors++;
- }
}
if( blockCntrl(p) || blockStart(p) )
setVarUsed(mb, l);
diff --git a/monetdb5/modules/mal/mal_init.mx b/monetdb5/modules/mal/mal_init.mx
--- a/monetdb5/modules/mal/mal_init.mx
+++ b/monetdb5/modules/mal/mal_init.mx
@@ -102,7 +102,7 @@
include array; # extremely experimental
include mat; # experimental
-include histogram; # experimental
+# include histogram; # experimental
include bpm; # experimental
include inspect;
include manual;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
