[Monetdb-pf-checkins] pathfinder/runtime5 xquery_scenario.mx, 1.7, 1.8

[Stefan Manegold]

Update of /cvsroot/monetdb/pathfinder/runtime5
In directory sc8-pr-cvs16:/tmp/cvs-serv2515

Modified Files:
        xquery_scenario.mx 
Log Message:

after recent changes, src/modules/atoms/streams.mx needs to include 
<stream_socket.h>;

however, when doing so, the ENGINE defined in src/mal/mal_scenario.mx conflicts 
with
the ENGINE defined in /usr/include/openssl/ossl_typ.h:154;

hence, we prefix READER PARSER OPTIMIZE SCHEDULER ENGINE INITCLIENT EXITCLIENT
defined in src/mal/mal_scenario.mx with MAL_SCENARIO_ .


Index: xquery_scenario.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime5/xquery_scenario.mx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- xquery_scenario.mx  16 Apr 2007 12:06:33 -0000      1.7
+++ xquery_scenario.mx  17 Apr 2007 17:11:49 -0000      1.8
@@ -132,9 +132,9 @@
 str
 XQUERYinitClient(Client c)
 {
-       if (c->state[PARSER] == NULL) {
+       if (c->state[MAL_SCENARIO_PARSER] == NULL) {
                Xbackend  xb = newXbackend(c);
-               c->state[PARSER] = (void*)xb;
+               c->state[MAL_SCENARIO_PARSER] = (void*)xb;
        }
 
        c->yycur = 0;           /* make sure we don't reuse the used input */
@@ -145,9 +145,9 @@
 str
 XQUERYexitClient(Client c)
 {
-       if (c->state[PARSER]) {
-               GDKfree(c->state[PARSER]); /* TODO destroyXbackend */
-               c->state[PARSER] = NULL;
+       if (c->state[MAL_SCENARIO_PARSER]) {
+               GDKfree(c->state[MAL_SCENARIO_PARSER]); /* TODO destroyXbackend 
*/
+               c->state[MAL_SCENARIO_PARSER] = NULL;
        }
        return MAL_SUCCEED;
 }
@@ -157,7 +157,7 @@
 {
        int go = TRUE;
        int more = TRUE;
-       Xbackend be = ((Xbackend) c->state[PARSER]);
+       Xbackend be = ((Xbackend) c->state[MAL_SCENARIO_PARSER]);
        bstream *in = c->fdin;
        int language = -1;
        int blocked = isa_block_stream(in->s);
@@ -231,7 +231,7 @@
        stream_printf(c->fdout,"#start the xquery parser\n");
 #endif
 
-       xb = (Xbackend) c->state[PARSER];
+       xb = (Xbackend) c->state[MAL_SCENARIO_PARSER];
        if(xb == NULL || c->curprg->def== NULL) 
                return createException(MAL, "xquery.parser","No context 
available\n");
 
@@ -276,7 +276,7 @@
 #ifdef _XQUERY_SCENARIO_DEBUG
        stream_printf(c->fdout,"#start the xquery engine\n");
 #endif
-       xb= (Xbackend) c->state[PARSER];
+       xb= (Xbackend) c->state[MAL_SCENARIO_PARSER];
        if (xb == NULL || c->curprg->def== NULL|| c->curprg->def->errors)
                return MAL_SUCCEED;
 


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-pf-checkins mailing list
Monetdb-pf-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins