From 36884ebc8c02e20e19b2f7dab5ecf3c225bdddc0 Mon Sep 17 00:00:00 2001 From: Ludovic Jacomme Date: Thu, 18 Apr 2002 15:29:59 +0000 Subject: [PATCH] M.... a celui qui le lira ! --- alliance/src/vex/src/vex.h | 13 ++++++++++++- alliance/src/vex/src/vexenv.c | 12 +++++++++++- alliance/src/vex/src/vexget.c | 12 +++++++++++- alliance/src/vex/src/vexis.c | 34 ++++++++++++++++++++++++++++++++-- alliance/src/vex/src/vexsimp.c | 12 +++++++++++- 5 files changed, 77 insertions(+), 6 deletions(-) diff --git a/alliance/src/vex/src/vex.h b/alliance/src/vex/src/vex.h index a90f7db3..734a2bbd 100644 --- a/alliance/src/vex/src/vex.h +++ b/alliance/src/vex/src/vex.h @@ -288,7 +288,18 @@ # define VEX_NUM_BIT 38 # define VEX_ABS 39 -# define VEX_MAX_OPERATOR 40 +# define VEX_AF 40 +# define VEX_AG 41 +# define VEX_AX 42 +# define VEX_AU 43 +# define VEX_EF 44 +# define VEX_EG 45 +# define VEX_EX 46 +# define VEX_EU 47 +# define VEX_EQUIV 48 +# define VEX_IMPLY 49 + +# define VEX_MAX_OPERATOR 50 /*------------------------------------------------------\ | | diff --git a/alliance/src/vex/src/vexenv.c b/alliance/src/vex/src/vexenv.c index 5e420b40..17177a16 100644 --- a/alliance/src/vex/src/vexenv.c +++ b/alliance/src/vex/src/vexenv.c @@ -106,7 +106,17 @@ "INDEX_N", "OTHERS =>", "NUM_BIT", - "ABS" + "ABS", + "AF", + "AG", + "AX", + "AU", + "EF", + "EG", + "EX", + "EU", + "<=>", + "==>" }; /* A few declaration that should be in vexenv I believe, but I leave diff --git a/alliance/src/vex/src/vexget.c b/alliance/src/vex/src/vexget.c index 76b46545..159d7065 100644 --- a/alliance/src/vex/src/vexget.c +++ b/alliance/src/vex/src/vexget.c @@ -108,7 +108,17 @@ -1, /* VEX_INDEX_N */ -1, /* VEX_OTHERS */ -1, /* VEX_NUM_BIT */ - -1 /* VEX_ABS */ + -1, /* VEX_ABS */ + -1, /* AF */ + -1, /* AG */ + -1, /* AX */ + -1, /* AU */ + -1, /* EF */ + -1, /* EG */ + -1, /* EX */ + -1, /* EU */ + -1, /* EQUIV */ + -1 /* IMPLY */ }; short VexTypeScalar[ VEX_MAX_TYPE ] = diff --git a/alliance/src/vex/src/vexis.c b/alliance/src/vex/src/vexis.c index e5534ffa..e12fc3e4 100644 --- a/alliance/src/vex/src/vexis.c +++ b/alliance/src/vex/src/vexis.c @@ -106,7 +106,17 @@ 3, /* VEX_INDEX_N */ 0, /* VEX_OTHERS */ 2, /* VEX_NUM_BIT */ - 0 /* VEX_ABS */ + 0, /* VEX_ABS */ + 0, /* AF */ + 0, /* AG */ + 0, /* AX */ + 2, /* AU */ + 1, /* EF */ + 1, /* EG */ + 1, /* EX */ + 2, /* EU */ + 2, /* EQUIV */ + 2 /* IMPLY */ }; short VexOperArith[ VEX_MAX_OPERATOR ] = @@ -150,7 +160,17 @@ 0, /* VEX_INDEX_N */ 1, /* VEX_OTHERS */ 0, /* VEX_NUM_BIT */ - 1 /* VEX_ABS */ + 1, /* VEX_ABS */ + 0, /* AF */ + 0, /* AG */ + 0, /* AX */ + 0, /* AU */ + 0, /* EF */ + 0, /* EG */ + 0, /* EX */ + 0, /* EU */ + 0, /* EQUIV */ + 0 /* IMPLY */ }; short VexOperNegative[ VEX_MAX_OPERATOR ] = @@ -195,6 +215,16 @@ 0, /* VEX_OTHERS */ 0, /* VEX_NUM_BIT */ 0, /* VEX_ABS */ + 0, /* AF */ + 0, /* AG */ + 0, /* AX */ + 0, /* AU */ + 0, /* EF */ + 0, /* EG */ + 0, /* EX */ + 0, /* EU */ + 0, /* EQUIV */ + 0 /* IMPLY */ }; short VexTypeDivisible[ VEX_MAX_TYPE ] = diff --git a/alliance/src/vex/src/vexsimp.c b/alliance/src/vex/src/vexsimp.c index a0471495..b54f066e 100644 --- a/alliance/src/vex/src/vexsimp.c +++ b/alliance/src/vex/src/vexsimp.c @@ -125,7 +125,17 @@ loc_simpvexnop, /* VEX_INDEX_N */ loc_simpvexnop, /* VEX_OTHERS */ loc_simpvexnumbit, /* VEX_NUM_BIT */ - loc_simpvexabs /* VEX_ABS */ + loc_simpvexabs, /* VEX_ABS */ + loc_simpvexnop, /* AF */ + loc_simpvexnop, /* AG */ + loc_simpvexnop, /* AX */ + loc_simpvexnop, /* AU */ + loc_simpvexnop, /* EF */ + loc_simpvexnop, /* EG */ + loc_simpvexnop, /* EX */ + loc_simpvexnop, /* EU */ + loc_simpvexnop, /* EQUIV */ + loc_simpvexnop /* IMPLY */ }; static short SimpBool3Table[ 3 ][ 3 ] =