Update of /cvsroot/monetdb/pathfinder/compiler/include
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25319/include
Modified Files:
Tag: XQuery_0-24
mil.h mil_mnemonic.h
Log Message:
Added a non-multiplex version of mil operators "and" and "startswith"
Added a new mil statement "break_" to break out of a loop in mil
U mil_mnemonic.h
Index: mil_mnemonic.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/mil_mnemonic.h,v
retrieving revision 1.57.2.1
retrieving revision 1.57.2.2
diff -u -d -r1.57.2.1 -r1.57.2.2
--- mil_mnemonic.h 5 Jun 2008 09:45:40 -0000 1.57.2.1
+++ mil_mnemonic.h 5 Jun 2008 16:29:50 -0000 1.57.2.2
@@ -67,8 +67,11 @@
#define unused() PFmil_unused ()
#define if_(a,b,c) PFmil_if ((a), (b), (c))
+
#define while_(a,b) PFmil_while ((a), (b))
+#define break_() PFmil_break ()
+
/** assignment statement, combined with variable declaration */
#define assgn(a,b) PFmil_assgn ((a),(b))
@@ -286,6 +289,9 @@
/** multiplexed comparison (equality) */
#define meq(a,b) PFmil_meq ((a), (b))
+/** and */
+#define and(a,b) PFmil_and ((a), (b))
+
/** multiplexed and */
#define mand(a,b) PFmil_mand ((a), (b))
@@ -354,6 +360,9 @@
/** Multiplexed string() function `[string](a,b,c)' */
#define mstring2(a,b,c) PFmil_mstring2 ((a), (b), (c))
+/** StartsWith() function `startsWith(a,b)' */
+#define starts_with(a,b) PFmil_starts_with ((a), (b))
+
/** Multiplexed startsWith() function `[startsWith](a,b)' */
#define mstarts_with(a,b) PFmil_mstarts_with ((a), (b))
U mil.h
Index: mil.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/mil.h,v
retrieving revision 1.67.2.1
retrieving revision 1.67.2.2
diff -u -d -r1.67.2.1 -r1.67.2.2
--- mil.h 5 Jun 2008 09:45:40 -0000 1.67.2.1
+++ mil.h 5 Jun 2008 16:29:50 -0000 1.67.2.2
@@ -148,6 +148,7 @@
, m_if /**< if-then-else blocks */
, m_while /**< while statement */
+ , m_break /**< break statement */
, m_assgn /**< assignment statement + declaration (`var ... :=') */
#if 0
@@ -289,6 +290,7 @@
, m_msearch /**< Multiplexed search() function `[search](a,b)' */
, m_mstring /**< Multiplexed string() function `[string](a,b)' */
, m_mstring2 /**< Multiplexed string() function `[string](a,b,c)' */
+ , m_starts_with /**< StartsWith() function `startsWith(a,b)' */
, m_mstarts_with /**< Multiplexed startsWith()
function `[startsWith](a,b)' */
, m_mends_with /**< Multiplexed endsWith() function `[endsWith](a,b)' */
@@ -427,7 +429,7 @@
CREATE_READ_ONLY_WS = 0
, CREATE_DOCMGM_WS = 1
, CREATE_UPDATE_WS = 2
- , CREATE_REP_UPDATE_WS = 3
+ , CREATE_RETRY_UPDATE_WS = 3
};
typedef enum PFmil_create_ws_t PFmil_create_ws_t;
@@ -498,6 +500,10 @@
/** while statement */
PFmil_t * PFmil_while (const PFmil_t *, const PFmil_t *);
+
+/** break statement */
+PFmil_t * PFmil_break ();
+
/**
* Assignment statement including declaration:
* Declare variable v and assign expression e to it.
@@ -797,6 +803,9 @@
/** Multiplexed string() function `[string](a,b,c)' */
PFmil_t * PFmil_mstring2 (const PFmil_t *, const PFmil_t *, const PFmil_t *);
+/** StartsWith() function `startsWith (a,b)' */
+PFmil_t * PFmil_starts_with (const PFmil_t *, const PFmil_t *);
+
/** Multiplexed startsWith() function `[startsWith](a,b)' */
PFmil_t * PFmil_mstarts_with (const PFmil_t *, const PFmil_t *);
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
