Update of /cvsroot/monetdb/pathfinder/compiler/include
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21826/compiler/include
Modified Files:
Tag: PF_ROX
mil.h mil_mnemonic.h
Log Message:
propagated changes of Thursday Jun 05 2008 - Friday Jun 06 2008
from the development trunk to the PF_ROX branch
U mil_mnemonic.h
Index: mil_mnemonic.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/mil_mnemonic.h,v
retrieving revision 1.44.2.9
retrieving revision 1.44.2.10
diff -u -d -r1.44.2.9 -r1.44.2.10
--- mil_mnemonic.h 22 May 2008 08:48:33 -0000 1.44.2.9
+++ mil_mnemonic.h 6 Jun 2008 14:25:39 -0000 1.44.2.10
@@ -71,8 +71,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))
@@ -222,7 +225,10 @@
#define ctrefine(a,b,c) PFmil_ctrefine((a),(b),(c))
/** CTderive() function */
-#define ctderive(a,b) PFmil_ctderive(a,b)
+#define ctderive(a,b) PFmil_ctderive((a),(b))
+
+/** texist() function */
+#define texist(a,b) PFmil_texist((a),(b))
/** max() operator */
#ifdef max
@@ -278,6 +284,9 @@
/** greater than */
#define gt(a,b) PFmil_gt ((a), (b))
+/** less or equal */
+#define le(a,b) PFmil_le ((a), (b))
+
/** equal */
#define eq(a,b) PFmil_eq ((a), (b))
@@ -287,6 +296,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))
@@ -355,6 +367,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.54.2.8
retrieving revision 1.54.2.9
diff -u -d -r1.54.2.8 -r1.54.2.9
--- mil.h 22 May 2008 08:48:33 -0000 1.54.2.8
+++ mil.h 6 Jun 2008 14:25:38 -0000 1.54.2.9
@@ -149,6 +149,7 @@
, m_if /**< if-then-else blocks */
, m_while /**< while statement */
+ , m_break /**< break statement */
, m_assgn /**< assignment statement + declaration (`var ... :=') */
#if 0
@@ -217,6 +218,7 @@
, m_ctrefine /**< MIL CTrefine function */
, m_ctrefine_rev /**< MIL CTrefine_rev function */
, m_ctderive /**< MIL CTderive function */
+ , m_texist /**< MIL texist function */
, m_cast /**< typecast */
, m_mcast /**< multiplexed typecast */
@@ -237,6 +239,7 @@
, m_mround_up /**< multiplexed operator round_up */
, m_gt /**< greater than */
+ , m_le /**< less or equal */
, m_eq /**< equal */
, m_meq /**< multiplexed comparison (equality) */
, m_mgt /**< multiplexed comparison (greater than) */
@@ -289,6 +292,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)' */
@@ -428,7 +432,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;
@@ -503,6 +507,10 @@
/** while statement */
PFmil_t * PFmil_while (const PFmil_t *, const PFmil_t *);
+
+/** break statement */
+PFmil_t * PFmil_break (void);
+
/**
* Assignment statement including declaration:
* Declare variable v and assign expression e to it.
@@ -653,6 +661,9 @@
/** MIL CTderive function */
PFmil_t * PFmil_ctderive (const PFmil_t *, const PFmil_t *);
+/** MIL texist function */
+PFmil_t * PFmil_texist (const PFmil_t *, const PFmil_t *);
+
/** enumerate operator, return sequence of integers */
PFmil_t * PFmil_enumerate (const PFmil_t *, const PFmil_t *);
@@ -742,6 +753,9 @@
/** greater than */
PFmil_t * PFmil_gt (const PFmil_t *, const PFmil_t *);
+/** less or equal */
+PFmil_t * PFmil_le (const PFmil_t *, const PFmil_t *);
+
/** equal */
PFmil_t * PFmil_eq (const PFmil_t *, const PFmil_t *);
@@ -799,6 +813,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
