Mercurial > octave-nkf
diff liboctave/mx-op-decl.h @ 8982:dc6bda6f9994
implement compound logical ops
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Sat, 14 Mar 2009 23:08:08 +0100 |
| parents | b756ce0002db |
| children | 11844593875a |
line wrap: on
line diff
--- a/liboctave/mx-op-decl.h Sat Mar 14 19:42:50 2009 +0100 +++ b/liboctave/mx-op-decl.h Sat Mar 14 23:08:08 2009 +0100 @@ -171,7 +171,9 @@ #define NDS_BOOL_OP_DECLS(ND, S, API) \ NDBOOL_OP_DECL (mx_el_and, ND, S, API); \ - NDBOOL_OP_DECL (mx_el_or, ND, S, API); + NDBOOL_OP_DECL (mx_el_or, ND, S, API); \ + NDBOOL_OP_DECL (mx_el_not_and, ND, S, API); \ + NDBOOL_OP_DECL (mx_el_not_or, ND, S, API); #define NDS_OP_DECLS(R, ND, S, API) \ NDS_BIN_OP_DECLS (R, ND, S, API) \ @@ -196,7 +198,9 @@ #define SND_BOOL_OP_DECLS(S, ND, API) \ NDBOOL_OP_DECL (mx_el_and, S, ND, API); \ - NDBOOL_OP_DECL (mx_el_or, S, ND, API); + NDBOOL_OP_DECL (mx_el_or, S, ND, API); \ + NDBOOL_OP_DECL (mx_el_and_not, S, ND, API); \ + NDBOOL_OP_DECL (mx_el_or_not, S, ND, API); #define SND_OP_DECLS(R, S, ND, API) \ SND_BIN_OP_DECLS (R, S, ND, API) \ @@ -221,7 +225,11 @@ #define NDND_BOOL_OP_DECLS(ND1, ND2, API) \ NDBOOL_OP_DECL (mx_el_and, ND1, ND2, API); \ - NDBOOL_OP_DECL (mx_el_or, ND1, ND2, API); + NDBOOL_OP_DECL (mx_el_or, ND1, ND2, API); \ + NDBOOL_OP_DECL (mx_el_and_not, ND1, ND2, API); \ + NDBOOL_OP_DECL (mx_el_or_not, ND1, ND2, API); \ + NDBOOL_OP_DECL (mx_el_not_and, ND1, ND2, API); \ + NDBOOL_OP_DECL (mx_el_not_or, ND1, ND2, API); #define NDND_OP_DECLS(R, ND1, ND2, API) \ NDND_BIN_OP_DECLS (R, ND1, ND2, API) \