Changeset: fead2b95d64c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fead2b95d64c
Added Files:
clients/odbc/samples/arraytest.c
gdk/gdk.h
gdk/gdk_calc.c
gdk/gdk_sample.c
monetdb5/extras/jaql/30_jaql.mal
monetdb5/extras/jaql/Makefile.ag
monetdb5/extras/jaql/Tests/All
monetdb5/extras/jaql/Tests/expand00.mal
monetdb5/extras/jaql/Tests/expand00.stable.err
monetdb5/extras/jaql/Tests/expand00.stable.out
monetdb5/extras/jaql/Tests/expand01.mal
monetdb5/extras/jaql/Tests/expand01.stable.err
monetdb5/extras/jaql/Tests/expand01.stable.out
monetdb5/extras/jaql/Tests/filter00.mal
monetdb5/extras/jaql/Tests/filter00.stable.err
monetdb5/extras/jaql/Tests/filter00.stable.out
monetdb5/extras/jaql/Tests/filter01.mal
monetdb5/extras/jaql/Tests/filter01.stable.err
monetdb5/extras/jaql/Tests/filter01.stable.out
monetdb5/extras/jaql/Tests/func00.mal
monetdb5/extras/jaql/Tests/func00.stable.err
monetdb5/extras/jaql/Tests/func00.stable.out
monetdb5/extras/jaql/Tests/func01.mal
monetdb5/extras/jaql/Tests/func01.stable.err
monetdb5/extras/jaql/Tests/func01.stable.out
monetdb5/extras/jaql/Tests/group00.mal
monetdb5/extras/jaql/Tests/group00.stable.err
monetdb5/extras/jaql/Tests/group00.stable.out
monetdb5/extras/jaql/Tests/group01.mal
monetdb5/extras/jaql/Tests/group01.stable.err
monetdb5/extras/jaql/Tests/group01.stable.out
monetdb5/extras/jaql/Tests/join00.mal
monetdb5/extras/jaql/Tests/join00.stable.err
monetdb5/extras/jaql/Tests/join00.stable.out
monetdb5/extras/jaql/Tests/join01.mal
monetdb5/extras/jaql/Tests/join01.stable.err
monetdb5/extras/jaql/Tests/join01.stable.out
monetdb5/extras/jaql/Tests/join02.mal
monetdb5/extras/jaql/Tests/join02.stable.err
monetdb5/extras/jaql/Tests/join02.stable.out
monetdb5/extras/jaql/Tests/json00.mal
monetdb5/extras/jaql/Tests/json00.stable.err
monetdb5/extras/jaql/Tests/json00.stable.out
monetdb5/extras/jaql/Tests/json01.mal
monetdb5/extras/jaql/Tests/json01.stable.err
monetdb5/extras/jaql/Tests/json01.stable.out
monetdb5/extras/jaql/Tests/json02.mal
monetdb5/extras/jaql/Tests/json02.stable.err
monetdb5/extras/jaql/Tests/json02.stable.out
monetdb5/extras/jaql/Tests/json03.mal
monetdb5/extras/jaql/Tests/json03.stable.err
monetdb5/extras/jaql/Tests/json03.stable.out
monetdb5/extras/jaql/Tests/json04.mal
monetdb5/extras/jaql/Tests/json04.stable.err
monetdb5/extras/jaql/Tests/json04.stable.out
monetdb5/extras/jaql/Tests/json05.mal
monetdb5/extras/jaql/Tests/json05.stable.err
monetdb5/extras/jaql/Tests/json05.stable.out
monetdb5/extras/jaql/Tests/plan00.mal
monetdb5/extras/jaql/Tests/plan00.stable.err
monetdb5/extras/jaql/Tests/plan00.stable.out
monetdb5/extras/jaql/Tests/plan01.mal
monetdb5/extras/jaql/Tests/plan01.stable.err
monetdb5/extras/jaql/Tests/plan01.stable.out
monetdb5/extras/jaql/Tests/plan02.mal
monetdb5/extras/jaql/Tests/plan02.stable.err
monetdb5/extras/jaql/Tests/plan02.stable.out
monetdb5/extras/jaql/Tests/sort00.mal
monetdb5/extras/jaql/Tests/sort00.stable.err
monetdb5/extras/jaql/Tests/sort00.stable.out
monetdb5/extras/jaql/Tests/sort01.mal
monetdb5/extras/jaql/Tests/sort01.stable.err
monetdb5/extras/jaql/Tests/sort01.stable.out
monetdb5/extras/jaql/Tests/top00.mal
monetdb5/extras/jaql/Tests/top00.stable.err
monetdb5/extras/jaql/Tests/top00.stable.out
monetdb5/extras/jaql/Tests/top01.mal
monetdb5/extras/jaql/Tests/top01.stable.err
monetdb5/extras/jaql/Tests/top01.stable.out
monetdb5/extras/jaql/Tests/transform00.mal
monetdb5/extras/jaql/Tests/transform00.stable.err
monetdb5/extras/jaql/Tests/transform00.stable.out
monetdb5/extras/jaql/Tests/transform01.mal
monetdb5/extras/jaql/Tests/transform01.stable.err
monetdb5/extras/jaql/Tests/transform01.stable.out
monetdb5/extras/jaql/Tests/transform02.mal
monetdb5/extras/jaql/Tests/transform02.stable.err
monetdb5/extras/jaql/Tests/transform02.stable.out
monetdb5/extras/jaql/Tests/variable00.mal
monetdb5/extras/jaql/Tests/variable00.stable.err
monetdb5/extras/jaql/Tests/variable00.stable.out
monetdb5/extras/jaql/jaql.c
monetdb5/extras/jaql/jaql.h
monetdb5/extras/jaql/jaql.mal
monetdb5/extras/jaql/jaqlfunc.mal
monetdb5/extras/jaql/jaqlgencode.c
monetdb5/extras/jaql/jaqlgencode.h
monetdb5/extras/jaql/jaqlscenario.c
monetdb5/extras/jaql/jaqlscenario.h
monetdb5/extras/jaql/jaqltests/Tests/All
monetdb5/extras/jaql/jaqltests/Tests/expand.jaql
monetdb5/extras/jaql/jaqltests/Tests/expand.stable.err
monetdb5/extras/jaql/jaqltests/Tests/expand.stable.out
monetdb5/extras/jaql/jaqltests/Tests/filter.jaql
monetdb5/extras/jaql/jaqltests/Tests/filter.stable.err
monetdb5/extras/jaql/jaqltests/Tests/filter.stable.out
monetdb5/extras/jaql/jaqltests/Tests/group.jaql
monetdb5/extras/jaql/jaqltests/Tests/group.stable.err
monetdb5/extras/jaql/jaqltests/Tests/group.stable.out
monetdb5/extras/jaql/jaqltests/Tests/join.jaql
monetdb5/extras/jaql/jaqltests/Tests/join.stable.err
monetdb5/extras/jaql/jaqltests/Tests/join.stable.out
monetdb5/extras/jaql/jaqltests/Tests/sort.jaql
monetdb5/extras/jaql/jaqltests/Tests/sort.stable.err
monetdb5/extras/jaql/jaqltests/Tests/sort.stable.out
monetdb5/extras/jaql/jaqltests/Tests/top.jaql
monetdb5/extras/jaql/jaqltests/Tests/top.stable.err
monetdb5/extras/jaql/jaqltests/Tests/top.stable.out
monetdb5/extras/jaql/jaqltests/Tests/transform.jaql
monetdb5/extras/jaql/jaqltests/Tests/transform.stable.err
monetdb5/extras/jaql/jaqltests/Tests/transform.stable.out
monetdb5/extras/jaql/jaqltree.h
monetdb5/extras/jaql/json.c
monetdb5/extras/jaql/json.h
monetdb5/extras/jaql/json.mal
monetdb5/extras/jaql/parser/Makefile.ag
monetdb5/extras/jaql/parser/jaql.l
monetdb5/extras/jaql/parser/jaql.y
monetdb5/modules/kernel/batcalc.c
monetdb5/modules/kernel/batcalc.mal
monetdb5/modules/kernel/batcalc.mal.sh
monetdb5/modules/kernel/calc.c
monetdb5/modules/kernel/calc.mal
monetdb5/modules/kernel/calc.mal.sh
Removed Files:
gdk/gdk.mx
monetdb5/modules/kernel/batcalc.mx
monetdb5/modules/kernel/calc.mx
monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows.64bit.oid32
sql/backends/monet5/dummy.c
Modified Files:
NT/Makefile
NT/rules.msc
buildtools/Mx/Sys.c
buildtools/autogen/autogen/codegen.py
buildtools/autogen/autogen/msc.py
buildtools/conf/rules.mk
clients/Tests/exports.stable.out
clients/mapiclient/Makefile.ag
clients/mapiclient/mclient.c
clients/mapiclient/mnc.c
clients/mapiclient/stethoscope.c
clients/mapilib/mapi.c
clients/mapilib/mapi.h
clients/odbc/driver/ODBCConvert.c
clients/odbc/driver/ODBCDbc.c
clients/odbc/driver/ODBCDbc.h
clients/odbc/driver/ODBCEnv.c
clients/odbc/driver/ODBCEnv.h
clients/odbc/driver/ODBCError.c
clients/odbc/driver/ODBCError.h
clients/odbc/driver/ODBCGlobal.h
clients/odbc/driver/ODBCStmt.c
clients/odbc/driver/ODBCStmt.h
clients/odbc/driver/ODBCUtil.c
clients/odbc/driver/ODBCUtil.h
clients/odbc/driver/SQLAllocConnect.c
clients/odbc/driver/SQLAllocEnv.c
clients/odbc/driver/SQLAllocHandle.c
clients/odbc/driver/SQLAllocStmt.c
clients/odbc/driver/SQLBindCol.c
clients/odbc/driver/SQLBindParameter.c
clients/odbc/driver/SQLBrowseConnect.c
clients/odbc/driver/SQLBulkOperations.c
clients/odbc/driver/SQLCancel.c
clients/odbc/driver/SQLCloseCursor.c
clients/odbc/driver/SQLColAttribute.c
clients/odbc/driver/SQLColAttributes.c
clients/odbc/driver/SQLColumnPrivileges.c
clients/odbc/driver/SQLConnect.c
clients/odbc/driver/SQLCopyDesc.c
clients/odbc/driver/SQLDataSources.c
clients/odbc/driver/SQLDescribeCol.c
clients/odbc/driver/SQLDescribeParam.c
clients/odbc/driver/SQLDisconnect.c
clients/odbc/driver/SQLDriverConnect.c
clients/odbc/driver/SQLEndTran.c
clients/odbc/driver/SQLError.c
clients/odbc/driver/SQLExecDirect.c
clients/odbc/driver/SQLExecute.c
clients/odbc/driver/SQLExtendedFetch.c
clients/odbc/driver/SQLFetch.c
clients/odbc/driver/SQLFetchScroll.c
clients/odbc/driver/SQLForeignKeys.c
clients/odbc/driver/SQLFreeConnect.c
clients/odbc/driver/SQLFreeEnv.c
clients/odbc/driver/SQLFreeHandle.c
clients/odbc/driver/SQLFreeStmt.c
clients/odbc/driver/SQLGetConnectAttr.c
clients/odbc/driver/SQLGetConnectOption.c
clients/odbc/driver/SQLGetCursorName.c
clients/odbc/driver/SQLGetData.c
clients/odbc/driver/SQLGetDescField.c
clients/odbc/driver/SQLGetDescRec.c
clients/odbc/driver/SQLGetDiagField.c
clients/odbc/driver/SQLGetDiagRec.c
clients/odbc/driver/SQLGetEnvAttr.c
clients/odbc/driver/SQLGetFunctions.c
clients/odbc/driver/SQLGetInfo.c
clients/odbc/driver/SQLGetStmtAttr.c
clients/odbc/driver/SQLGetStmtOption.c
clients/odbc/driver/SQLGetTypeInfo.c
clients/odbc/driver/SQLMoreResults.c
clients/odbc/driver/SQLNativeSql.c
clients/odbc/driver/SQLNumParams.c
clients/odbc/driver/SQLNumResultCols.c
clients/odbc/driver/SQLParamData.c
clients/odbc/driver/SQLParamOptions.c
clients/odbc/driver/SQLPrepare.c
clients/odbc/driver/SQLPrimaryKeys.c
clients/odbc/driver/SQLProcedureColumns.c
clients/odbc/driver/SQLProcedures.c
clients/odbc/driver/SQLPutData.c
clients/odbc/driver/SQLRowCount.c
clients/odbc/driver/SQLSetConnectAttr.c
clients/odbc/driver/SQLSetConnectOption.c
clients/odbc/driver/SQLSetCursorName.c
clients/odbc/driver/SQLSetDescField.c
clients/odbc/driver/SQLSetDescRec.c
clients/odbc/driver/SQLSetEnvAttr.c
clients/odbc/driver/SQLSetParam.c
clients/odbc/driver/SQLSetPos.c
clients/odbc/driver/SQLSetScrollOptions.c
clients/odbc/driver/SQLSetStmtAttr.c
clients/odbc/driver/SQLSetStmtOption.c
clients/odbc/driver/SQLSpecialColumns.c
clients/odbc/driver/SQLStatistics.c
clients/odbc/driver/SQLTablePrivileges.c
clients/odbc/driver/SQLTables.c
clients/odbc/driver/SQLTransact.c
clients/odbc/samples/Makefile.ag
clients/python/monetdb/mapi2.py
common/stream/stream.c
configure.ag
gdk/ChangeLog
gdk/Makefile.ag
gdk/gdk_atoms.mx
gdk/gdk_batop.mx
gdk/gdk_ssort.mx
gdk/gdk_utils.mx
java/SQLSTATEs
monetdb5/extras/Makefile.ag
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/mal/Tests/tst007.stable.out
monetdb5/mal/Tests/tst058.stable.out
monetdb5/mal/Tests/tst130.mal
monetdb5/mal/Tests/tst130.stable.out
monetdb5/mal/Tests/tst1505.mal
monetdb5/mal/Tests/tst1505.stable.out
monetdb5/mal/Tests/tst225.mal
monetdb5/mal/Tests/tst225.stable.out
monetdb5/mal/Tests/tst901a.mal
monetdb5/mal/Tests/tst901a.stable.out
monetdb5/mal/Tests/tst903.mal
monetdb5/mal/Tests/tst903.stable.out
monetdb5/mal/mal_instruction.mx
monetdb5/mal/mal_interpreter.mx
monetdb5/mal/mal_listing.c
monetdb5/mal/mal_parser.mx
monetdb5/mal/mal_resolve.c
monetdb5/modules/kernel/Makefile.ag
monetdb5/modules/kernel/algebra.mx
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
monetdb5/modules/mal/mat.mx
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/sample.c
monetdb5/modules/mal/sample.h
monetdb5/optimizer/Tests/AEexample.stable.out
monetdb5/optimizer/Tests/All
monetdb5/optimizer/Tests/CXexample.stable.out
monetdb5/optimizer/Tests/GCexample.stable.out
monetdb5/optimizer/Tests/Mexample.stable.out
monetdb5/optimizer/Tests/PHexample.stable.out
monetdb5/optimizer/Tests/cst01.stable.out
monetdb5/optimizer/Tests/inline02.stable.out
monetdb5/optimizer/Tests/inline03.stable.out
monetdb5/optimizer/Tests/inline04.stable.out
monetdb5/optimizer/Tests/inline06.stable.out
monetdb5/optimizer/Tests/inline07.stable.out
monetdb5/optimizer/Tests/inline10.stable.out
monetdb5/optimizer/Tests/mat00.stable.out
monetdb5/optimizer/Tests/mat01.mal
monetdb5/optimizer/Tests/mat01.stable.out
monetdb5/optimizer/Tests/remap.stable.out
monetdb5/optimizer/Tests/roberto1.stable.out
monetdb5/optimizer/Tests/tst4001.stable.out
monetdb5/optimizer/Tests/tst4005.stable.out
monetdb5/optimizer/Tests/tst4600.stable.out
monetdb5/optimizer/Tests/tst4601.stable.out
monetdb5/optimizer/Tests/tst4631.stable.out
monetdb5/optimizer/Tests/tst4730.stable.out
monetdb5/optimizer/Tests/tst4800.stable.out
monetdb5/optimizer/Tests/tst4820.stable.out
monetdb5/optimizer/Tests/tst4900.stable.out
monetdb5/optimizer/opt_centipede.mx
monetdb5/optimizer/opt_groups.mx
monetdb5/optimizer/opt_octopus.mx
monetdb5/optimizer/opt_pipes.c
monetdb5/scheduler/srvpool.c
monetdb5/tests/BugReports/Tests/no.163.mal
monetdb5/tests/BugReports/Tests/no.163.stable.out
monetdb5/tests/BugTracker/Tests/batcast.SF-1730987.mal
monetdb5/tests/BugTracker/Tests/batcast.SF-1730987.stable.out
monetdb5/tests/gdkTests/Tests/casts.mal
monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows
monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows.64bit.oid64
monetdb5/tests/gdkTests/Tests/casts.stable.out.oid64
monetdb5/tests/suite_06/Tests/test_01.mal
monetdb5/tests/suite_06/Tests/test_01.stable.out
sql/backends/monet5/UDF/udf.c
sql/backends/monet5/UDF/udf.h
sql/backends/monet5/datacell/basket.c
sql/backends/monet5/datacell/datacell.c
sql/backends/monet5/datacell/emitter.c
sql/backends/monet5/sql.mx
sql/backends/monet5/sql_emptyset.c
sql/backends/monet5/sql_result.mx
sql/backends/monet5/vaults/fits.c
sql/server/rel_dump.c
sql/server/sql_datetime.c
sql/server/sql_statement.c
sql/server/sql_statement.h
sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err
sql/test/BugDay_2005-10-06_2.9.3/Tests/div_by_zero.SF-987304.stable.err
sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
sql/test/BugTracker/Tests/string2int_conversion.SF-1356068.stable.err
sql/test/Tests/coalesce.stable.err
sql/test/Tests/session_vars.stable.err
sql/test/Tests/session_vars.stable.out
sql/test/Tests/setoptimizer.stable.err
sql/test/Tests/setoptimizer.stable.out
sql/test/Via-m/Tests/file_s12.stable.err
sql/test/bugs/Tests/crash_order_by.stable.out
testing/Mfilter.py.in
testing/Mtest.py.in
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/merovingian.c
Branch: holindex
Log Message:
Merged from default.
diffs (truncated from 74872 to 300 lines):
diff --git a/NT/Makefile b/NT/Makefile
--- a/NT/Makefile
+++ b/NT/Makefile
@@ -55,6 +55,7 @@ unistd.h:
$(ECHO) #define close _close >> unistd.h
$(ECHO) #define getpid _getpid >> unistd.h
$(ECHO) #define umask _umask >> unistd.h
+ $(ECHO) #define isatty _isatty >> unistd.h
$(ECHO) #endif >> unistd.h
$(ECHO) #endif >> unistd.h
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -171,7 +171,8 @@ RUBY_DIR = lib\ruby\gems\1.9.1
# install python, flex and bison on your systems
PYTHON = python
-YACC = bison -b y -y
+YACC = bison
+LEX = flex
ARCHIVER = lib
GENDLL =
@@ -385,6 +386,11 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) HAVE_SQL_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
+!IFDEF HAVE_JAQL
+ $(ECHO) HAVE_JAQL_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
+!ELSE
+ $(ECHO) HAVE_JAQL_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
+!ENDIF
!IFDEF HAVE_TESTING
$(ECHO) HAVE_TESTING_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
diff --git a/buildtools/Mx/Sys.c b/buildtools/Mx/Sys.c
--- a/buildtools/Mx/Sys.c
+++ b/buildtools/Mx/Sys.c
@@ -30,7 +30,6 @@
int mx_out = 1;
extern int somethingPrinted; /* used for preventing to empty display lines */
-/* VARARGS */
void
ofile_printf(const char *format, ...)
{
diff --git a/buildtools/autogen/autogen/codegen.py
b/buildtools/autogen/autogen/codegen.py
--- a/buildtools/autogen/autogen/codegen.py
+++ b/buildtools/autogen/autogen/codegen.py
@@ -77,7 +77,7 @@ end_code_extract = { 'mx': e_mx, 'mx.in'
# direct rules
code_gen = {'y': [ '.tab.c', '.tab.h' ],
'tab.c': [ '.tab.o' ],
- 'l': [ '.yy.c' ],
+ 'l': [ '.yy.c', '.yy.h' ],
'yy.c': [ '.yy.o' ],
'mt': [ '.symbols.h', '.c' ],
'brg': [ '.c' ],
diff --git a/buildtools/autogen/autogen/msc.py
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -349,25 +349,17 @@ def msc_dep(fd, tar, deplist, msc):
of = b + '.' + de
of = msc_translate_file(of, msc)
fd.write('\t$(YACC) $(YFLAGS) $(AM_YFLAGS) "%s"\n' % of)
- fd.write("\t$(DEL) y.tab.c\n")
- fd.write('\t$(MV) y.tab.h "%s.tab.h"\n' % b)
+ fd.write("\t$(DEL) %s.tab.c\n" % b)
if ext == "tab.c":
fd.write(getsrc)
x, de = split_filename(deplist[0])
of = b + '.' + de
of = msc_translate_file(of, msc)
fd.write('\t$(YACC) $(YFLAGS) $(AM_YFLAGS) "%s"\n' % of)
- fd.write('\t$(FILTER) $(FILTERPREF)" ;" y.tab.c > "%s.tab.c"\n' % b)
- fd.write("\t$(DEL) y.tab.h\n")
+ fd.write("\t$(DEL) %s.tab.h\n" % b)
if ext == "yy.c":
fd.write(getsrc)
fd.write('\t$(LEX) $(LFLAGS) $(AM_LFLAGS) "%s.l"\n' % b)
- # either lex.<name>.c or lex.yy.c or lex.$(PARSERNAME).c gets generated
- fd.write('\tif exist lex.%s.c $(MV) lex.%s.c "%s.yy.c.tmp"\n' %
(b,b,b))
- fd.write('\tif exist lex.yy.c $(MV) lex.yy.c "%s.yy.c.tmp"\n' % b)
- fd.write('\tif exist lex.$(PARSERNAME).c $(MV) lex.$(PARSERNAME).c
"%s.yy.c.tmp"\n' % b)
- fd.write('\techo #include "$(CONFIG_H)" > "%s.yy.c"\n' % b)
- fd.write('\ttype "%s.yy.c.tmp" >> "%s.yy.c"\n' % (b, b))
if ext in ("obj", "tab.obj", "yy.obj"):
target, name = msc_find_target(tar, msc)
if name[0] == '_':
@@ -375,7 +367,7 @@ def msc_dep(fd, tar, deplist, msc):
if target == "LIB":
d, dext = split_filename(deplist[0])
if dext in ("c", "yy.c", "tab.c"):
- fd.write('\t$(CC) $(CFLAGS) $(%s_CFLAGS) $(GENDLL) -DLIB%s
-Fo"%s" -c "%s"\n' %
+ fd.write('\t$(CC) $(CFLAGS) $(%s_CFLAGS) $(GENDLL)
-D_CRT_SECURE_NO_WARNINGS -DLIB%s -Fo"%s" -c "%s"\n' %
(split_filename(msc_basename(src))[0], name, t, src))
if ext == 'res':
fd.write("\t$(RC) -fo%s %s\n" % (t, src))
diff --git a/buildtools/conf/rules.mk b/buildtools/conf/rules.mk
--- a/buildtools/conf/rules.mk
+++ b/buildtools/conf/rules.mk
@@ -22,17 +22,10 @@ MV=mv
HIDE=1
MX = $(top_builddir)/buildtools/Mx/Mx
-# in the next few rules, make sure that "$(CONFIG_H)" is included
-# first, also with bison-generated files. This is crucial
-# to prevent inconsistent (re-)definitions of macros.
%.tab.c: %.y
touch waiting.$$$$ && until ln waiting.$$$$ waiting 2>/dev/null; do
sleep 1; done && rm waiting.$$$$
$(YACC) $(YFLAGS) $(AM_YFLAGS) $< || { $(RM) waiting ; exit 1 ; }
if [ -f y.tab.c ]; then $(MV) y.tab.c $*.tab.c ; fi
- $(MV) $*.tab.c $*.tab.c.tmp
- echo '#include <'"$(CONFIG_H)"'>' > $*.tab.c
- grep -v '^#include.*[<"]'"$(CONFIG_H)"'[">]' $*.tab.c.tmp >> $*.tab.c
- $(RM) $*.tab.c.tmp
[ ! -f y.tab.h ] || $(RM) y.tab.h
$(RM) waiting
@@ -46,11 +39,13 @@ MX = $(top_builddir)/buildtools/Mx/Mx
%.yy.c: %.l
touch waiting.$$$$ && until ln waiting.$$$$ waiting 2>/dev/null; do
sleep 1; done && rm waiting.$$$$
$(LEX) $(LFLAGS) $(AM_LFLAGS) $< || { $(RM) waiting ; exit 1 ; }
- if [ -f $(LEX_OUTPUT_ROOT).c ]; then $(MV) $(LEX_OUTPUT_ROOT).c $*.yy.c
; fi
- $(MV) $*.yy.c $*.yy.c.tmp
- echo '#include <'"$(CONFIG_H)"'>' > $*.yy.c
- grep -v '^#include.*[<"]'"$(CONFIG_H)"'[">]' $*.yy.c.tmp >> $*.yy.c
- $(RM) $*.yy.c.tmp
+ [ -f $*.yy.h ] && $(RM) $*.yy.h
+ $(RM) waiting
+
+%.yy.h: %.l
+ touch waiting.$$$$ && until ln waiting.$$$$ waiting 2>/dev/null; do
sleep 1; done && rm waiting.$$$$
+ $(LEX) $(LFLAGS) $(AM_LFLAGS) $< || { $(RM) waiting ; exit 1 ; }
+ [ -f $*.yy.c ] && $(RM) $*.yy.c
$(RM) waiting
%.def: %.syms
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -26,9 +26,74 @@ BAT *BATappend(BAT *b, BAT *c, bit force
atomDesc BATatoms[];
BAT *BATattach(int tt, const char *heapfile);
BAT *BATbandjoin(BAT *l, BAT *r, ptr mnus, ptr plus, bit li, bit hi);
+BAT *BATcalcabsolute(BAT *b, int accum);
+BAT *BATcalcadd(BAT *b1, BAT *b2, int tp, int accum, int abort_on_error);
+BAT *BATcalcaddcst(BAT *b, const ValRecord *v, int tp, int accum, int
abort_on_error);
+BAT *BATcalcand(BAT *b1, BAT *b2, int accum);
+BAT *BATcalcandcst(BAT *b, const ValRecord *v, int accum);
+int BATcalcavg(BAT *b, dbl *avg, BUN *vals);
+BAT *BATcalcbetween(BAT *b, BAT *lo, BAT *hi);
+BAT *BATcalcbetweenbatcst(BAT *b, BAT *lo, const ValRecord *hi);
+BAT *BATcalcbetweencstbat(BAT *b, const ValRecord *lo, BAT *hi);
+BAT *BATcalcbetweencstcst(BAT *b, const ValRecord *lo, const ValRecord *hi);
+BAT *BATcalccmp(BAT *b1, BAT *b2);
+BAT *BATcalccmpcst(BAT *b, const ValRecord *v);
+BAT *BATcalccstadd(const ValRecord *v, BAT *b, int tp, int accum, int
abort_on_error);
+BAT *BATcalccstand(const ValRecord *v, BAT *b, int accum);
+BAT *BATcalccstcmp(const ValRecord *v, BAT *b);
+BAT *BATcalccstdiv(const ValRecord *v, BAT *b, int tp, int accum, int
abort_on_error);
+BAT *BATcalccsteq(const ValRecord *v, BAT *b);
+BAT *BATcalccstge(const ValRecord *v, BAT *b);
+BAT *BATcalccstgt(const ValRecord *v, BAT *b);
+BAT *BATcalccstle(const ValRecord *v, BAT *b);
+BAT *BATcalccstlsh(const ValRecord *v, BAT *b, int abort_on_error);
+BAT *BATcalccstlt(const ValRecord *v, BAT *b);
+BAT *BATcalccstmod(const ValRecord *v, BAT *b, int tp, int accum, int
abort_on_error);
+BAT *BATcalccstmul(const ValRecord *v, BAT *b, int tp, int accum, int
abort_on_error);
+BAT *BATcalccstne(const ValRecord *v, BAT *b);
+BAT *BATcalccstor(const ValRecord *v, BAT *b, int accum);
+BAT *BATcalccstrsh(const ValRecord *v, BAT *b, int abort_on_error);
+BAT *BATcalccstsub(const ValRecord *v, BAT *b, int tp, int accum, int
abort_on_error);
+BAT *BATcalccstxor(const ValRecord *v, BAT *b, int accum);
+BAT *BATcalcdecr(BAT *b, int accum, int abort_on_error);
+BAT *BATcalcdiv(BAT *b1, BAT *b2, int tp, int accum, int abort_on_error);
+BAT *BATcalcdivcst(BAT *b, const ValRecord *v, int tp, int accum, int
abort_on_error);
+BAT *BATcalceq(BAT *b1, BAT *b2);
+BAT *BATcalceqcst(BAT *b, const ValRecord *v);
+BAT *BATcalcge(BAT *b1, BAT *b2);
+BAT *BATcalcgecst(BAT *b, const ValRecord *v);
+BAT *BATcalcgt(BAT *b1, BAT *b2);
+BAT *BATcalcgtcst(BAT *b, const ValRecord *v);
+BAT *BATcalcincr(BAT *b, int accum, int abort_on_error);
+BAT *BATcalcisnil(BAT *b);
+BAT *BATcalciszero(BAT *b);
+BAT *BATcalcle(BAT *b1, BAT *b2);
+BAT *BATcalclecst(BAT *b, const ValRecord *v);
+BAT *BATcalclsh(BAT *b1, BAT *b2, int accum, int abort_on_error);
+BAT *BATcalclshcst(BAT *b, const ValRecord *v, int accum, int abort_on_error);
+BAT *BATcalclt(BAT *b1, BAT *b2);
+BAT *BATcalcltcst(BAT *b, const ValRecord *v);
+BAT *BATcalcmod(BAT *b1, BAT *b2, int tp, int accum, int abort_on_error);
+BAT *BATcalcmodcst(BAT *b, const ValRecord *v, int tp, int accum, int
abort_on_error);
+BAT *BATcalcmul(BAT *b1, BAT *b2, int tp, int accum, int abort_on_error);
+BAT *BATcalcmulcst(BAT *b, const ValRecord *v, int tp, int accum, int
abort_on_error);
+BAT *BATcalcne(BAT *b1, BAT *b2);
+BAT *BATcalcnecst(BAT *b, const ValRecord *v);
+BAT *BATcalcnegate(BAT *b, int accum);
+BAT *BATcalcnot(BAT *b, int accum);
+BAT *BATcalcor(BAT *b1, BAT *b2, int accum);
+BAT *BATcalcorcst(BAT *b, const ValRecord *v, int accum);
+BAT *BATcalcrsh(BAT *b1, BAT *b2, int accum, int abort_on_error);
+BAT *BATcalcrshcst(BAT *b, const ValRecord *v, int accum, int abort_on_error);
+BAT *BATcalcsign(BAT *b);
+BAT *BATcalcsub(BAT *b1, BAT *b2, int tp, int accum, int abort_on_error);
+BAT *BATcalcsubcst(BAT *b, const ValRecord *v, int tp, int accum, int
abort_on_error);
+BAT *BATcalcxor(BAT *b1, BAT *b2, int accum);
+BAT *BATcalcxorcst(BAT *b, const ValRecord *v, int accum);
BAT *BATclear(BAT *b);
BAT *BATcommit(BAT *b);
BAT *BATconst(BAT *l, int tt, ptr val);
+BAT *BATconvert(BAT *b, int tp, int abort_on_error);
BAT *BATcopy(BAT *b, int ht, int tt, int writeable);
BUN BATcount(BAT *b);
BUN BATcount_no_nil(BAT *b);
@@ -278,6 +343,34 @@ int VALformat(char **buf, ValPtr res);
void *VALget(ValPtr v);
ValPtr VALinit(ValPtr d, int tpe, ptr s);
ValPtr VALset(ValPtr v, int t, ptr p);
+int VARcalcabsolute(ValPtr ret, const ValRecord *v);
+int VARcalcadd(ValPtr ret, const ValRecord *lft, const ValRecord *rgt, int
abort_on_error);
+int VARcalcand(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
+int VARcalcbetween(ValPtr ret, const ValRecord *v, const ValRecord *lo, const
ValRecord *hi);
+int VARcalccmp(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
+int VARcalcdecr(ValPtr ret, const ValRecord *v, int abort_on_error);
+int VARcalcdiv(ValPtr ret, const ValRecord *lft, const ValRecord *rgt, int
abort_on_error);
+int VARcalceq(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
+int VARcalcge(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
+int VARcalcgt(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
+int VARcalcincr(ValPtr ret, const ValRecord *v, int abort_on_error);
+int VARcalcisnil(ValPtr ret, const ValRecord *v);
+int VARcalcisnotnil(ValPtr ret, const ValRecord *v);
+int VARcalciszero(ValPtr ret, const ValRecord *v);
+int VARcalcle(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
+int VARcalclsh(ValPtr ret, const ValRecord *lft, const ValRecord *rgt, int
abort_on_error);
+int VARcalclt(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
+int VARcalcmod(ValPtr ret, const ValRecord *lft, const ValRecord *rgt, int
abort_on_error);
+int VARcalcmul(ValPtr ret, const ValRecord *lft, const ValRecord *rgt, int
abort_on_error);
+int VARcalcne(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
+int VARcalcnegate(ValPtr ret, const ValRecord *v);
+int VARcalcnot(ValPtr ret, const ValRecord *v);
+int VARcalcor(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
+int VARcalcrsh(ValPtr ret, const ValRecord *lft, const ValRecord *rgt, int
abort_on_error);
+int VARcalcsign(ValPtr ret, const ValRecord *v);
+int VARcalcsub(ValPtr ret, const ValRecord *lft, const ValRecord *rgt, int
abort_on_error);
+int VARcalcxor(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
+int VARconvert(ValPtr ret, const ValRecord *v, int abort_on_error);
void VIEWbounds(BAT *b, BAT *view, BUN l, BUN h);
BAT *VIEWcombine(BAT *b);
BAT *VIEWcreate(BAT *h, BAT *t);
@@ -531,10 +624,6 @@ str ALGcount_bat(wrd *result, int *bid);
str ALGcount_nil(wrd *result, int *bid, bit *ignore_nils);
str ALGcount_no_nil(wrd *result, int *bid);
str ALGcross(int *result, int *lid, int *rid);
-str ALGderiveCount(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str ALGderivePath(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str ALGderivePath(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str ALGderiveSum(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ALGexist(bit *ret, int *bid, ptr val);
str ALGexistBUN(bit *ret, int *bid, ptr val, ptr tval);
str ALGfetch(ptr ret, int *bid, lng *pos);
@@ -1010,806 +1099,12 @@ str BOXrelease(Client cntxt, MalBlkPtr m
str BOXreleaseAll(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str BOXtake(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str BOXtoString(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CALCBAT2bat(bat *res, int *bid);
-str CALCbat2BAT(int *res, bat *bid);
-str CALCbat2batid(int *ret, int *bid);
-str CALCbat2str(str *ret, bat *val);
-str CALCbatid2bat(int *bid, int *ret);
-str CALCbinaryADDbtebte(bte *res, bte *a, bte *b);
-str CALCbinaryADDbtedbl(dbl *res, bte *a, dbl *b);
-str CALCbinaryADDbteflt(flt *res, bte *a, flt *b);
-str CALCbinaryADDbteint(int *res, bte *a, int *b);
-str CALCbinaryADDbtelng(lng *res, bte *a, lng *b);
-str CALCbinaryADDbtesht(sht *res, bte *a, sht *b);
-str CALCbinaryADDbtewrd(wrd *res, bte *a, wrd *b);
-str CALCbinaryADDdblbte(dbl *res, dbl *a, bte *b);
-str CALCbinaryADDdbldbl(dbl *res, dbl *a, dbl *b);
-str CALCbinaryADDdblflt(dbl *res, dbl *a, flt *b);
-str CALCbinaryADDdblint(dbl *res, dbl *a, int *b);
-str CALCbinaryADDdbllng(dbl *res, dbl *a, lng *b);
-str CALCbinaryADDdblsht(dbl *res, dbl *a, sht *b);
-str CALCbinaryADDdblwrd(dbl *res, dbl *a, wrd *b);
-str CALCbinaryADDfltbte(flt *res, flt *a, bte *b);
-str CALCbinaryADDfltdbl(dbl *res, flt *a, dbl *b);
-str CALCbinaryADDfltflt(flt *res, flt *a, flt *b);
-str CALCbinaryADDfltint(flt *res, flt *a, int *b);
-str CALCbinaryADDfltlng(flt *res, flt *a, lng *b);
-str CALCbinaryADDfltsht(flt *res, flt *a, sht *b);
-str CALCbinaryADDfltwrd(flt *res, flt *a, wrd *b);
-str CALCbinaryADDintbte(int *res, int *a, bte *b);
-str CALCbinaryADDintdbl(dbl *res, int *a, dbl *b);
-str CALCbinaryADDintflt(flt *res, int *a, flt *b);
-str CALCbinaryADDintint(int *res, int *a, int *b);
-str CALCbinaryADDintlng(lng *res, int *a, lng *b);
-str CALCbinaryADDintsht(int *res, int *a, sht *b);
-str CALCbinaryADDintwrd(wrd *res, int *a, wrd *b);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
