Update of /cvsroot/monetdb/MonetDB5/src/modules/mal
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23107/src/modules/mal
Modified Files:
Tag: GDK-2
Makefile.ag mal_init.mx manual.mx mdb.mx tablet.mx
Log Message:
propagated changes of Monday Sep 10 2007 - Tuesday Sep 18 2007
from the development trunk to the GDK-2 branch
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/Makefile.ag,v
retrieving revision 1.102.2.4
retrieving revision 1.102.2.5
diff -u -d -r1.102.2.4 -r1.102.2.5
--- Makefile.ag 6 Sep 2007 13:52:37 -0000 1.102.2.4
+++ Makefile.ag 18 Sep 2007 12:43:24 -0000 1.102.2.5
@@ -150,7 +150,8 @@
$(MALLOC_LIBS) $(PTHREAD_LIBS) $(DL_LIBS)
}
-scripts_mal = {
+headers_mal = {
+ HEADERS = mal
DIR = pkglibdir
SOURCES = language.mx constraints.mx mal_init.mx box.mx bbp.mx \
profiler.mx const.mx batExtensions.mx algebraExtensions.mx \
Index: mal_init.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/mal_init.mx,v
retrieving revision 1.118.2.3
retrieving revision 1.118.2.4
diff -u -d -r1.118.2.3 -r1.118.2.4
--- mal_init.mx 25 Aug 2007 07:18:05 -0000 1.118.2.3
+++ mal_init.mx 18 Sep 2007 12:43:25 -0000 1.118.2.4
@@ -195,6 +195,7 @@
include opt_singleton;
include opt_strengthReduction;
include opt_statistics;
+include opt_trace;
include chopper;
Index: tablet.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/tablet.mx,v
retrieving revision 1.100.2.2
retrieving revision 1.100.2.3
diff -u -d -r1.100.2.2 -r1.100.2.3
--- tablet.mx 10 Aug 2007 17:29:07 -0000 1.100.2.2
+++ tablet.mx 18 Sep 2007 12:43:29 -0000 1.100.2.3
@@ -1941,34 +1941,6 @@
}
[EMAIL PROTECTED]
-
-PROC test_tablet() : void := {
-
- #tablet_debug(1);
-
- fp := fopen ( "format", "w+" );
- fputs( "key,\",\",str\n", fp);
- fputs( "a_io_test,\"\\n\",dbl\n", fp);
- fclose( fp );
-
- fp := fopen ( "data", "w+" );
- fputs( "test, 0.12345\n", fp);
- fputs( "second line, 9.0\n", fp);
- fclose( fp );
-
- bats := load_data(load_format("format"),"data",10);
- bats.print;
- a := bats.find("key").reverse().join( bats.find("a_io_test") );
- a.print;
- dump_data(load_format("format"), bats, "data", -1);
-
- fp := fopen ( "data", "r" );
- s := fgets( fp );
- s.print();
- fclose( fp );
-}
-
@+ Tablet report
The routines to manage the table descriptor
@c
Index: manual.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/manual.mx,v
retrieving revision 1.8
retrieving revision 1.8.6.1
diff -u -d -r1.8 -r1.8.6.1
--- manual.mx 3 Jan 2007 12:20:24 -0000 1.8
+++ manual.mx 18 Sep 2007 12:43:27 -0000 1.8.6.1
@@ -54,10 +54,10 @@
command summary():void
address MANUALcreateSummary
comment "Produces a manual with help lines grouped by module.";
[EMAIL PROTECTED]
-#command completion(text:str)
-#address MANUALcompletion
-#comment "Produces the wordcompletion table.";
+
+command completion(pat:str):bat[:int,:str]
+address MANUALcompletion
+comment "Produces the wordcompletion table.";
@{
@+ Implementation
@include prelude.mx
Index: mdb.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/mdb.mx,v
retrieving revision 1.60.2.1
retrieving revision 1.60.2.2
diff -u -d -r1.60.2.1 -r1.60.2.2
--- mdb.mx 17 Aug 2007 15:37:00 -0000 1.60.2.1
+++ mdb.mx 18 Sep 2007 12:43:28 -0000 1.60.2.2
@@ -69,6 +69,10 @@
address MDBsetTrace
comment "Turn on/off tracing of current routine";
+pattern setTrace(b:str):void
+address MDBsetVarTrace
+comment "Turn on/off tracing of a variable ";
+
pattern setCatch(b:bit):void
address MDBsetCatch
comment "Turn on/off catching exceptions";
@@ -205,6 +209,7 @@
mdb_export str MDBstop(MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
mdb_export str MDBinspect(MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
mdb_export str MDBsetTrace(MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
+mdb_export str MDBsetVarTrace(MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
mdb_export str MDBgetDebug(int *ret);
mdb_export str MDBsetDebug(int *ret, int *flg);
mdb_export str MDBsetDebugStr(int *ret, str *nme);
@@ -343,6 +348,16 @@
MDBtraceFlag(MCgetClient(), stk, (b? (int) 't':0));
return MAL_SUCCEED;
}
+str
+MDBsetVarTrace(MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
+{
+ str v;
+ v = *(str *) getArgReference(stk, p, 1);
+ mdbSetBreakRequest(MCgetClient(), mb, v, 't');
+ stk->cmd = 'c';
+ MCgetClient()->itrace = 'c';
+ return MAL_SUCCEED;
+}
str
MDBgetDebug(int *ret)
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
