Mercurial > octave-nkf

changeset 5038:fdfce0dec36b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2004-09-24 17:46:18 by jwe]
author jwe
date Fri, 24 Sep 2004 17:46:19 +0000
parents 70be065b8201
children 8fa98abef34a
files src/ChangeLog src/OPERATORS/op-i64-i64.cc src/OPERATORS/op-int.h src/OPERATORS/op-ui64-ui64.cc
diffstat 4 files changed, 83 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Fri Sep 24 15:01:51 2004 +0000
+++ b/src/ChangeLog	Fri Sep 24 17:46:19 2004 +0000
@@ -3,6 +3,13 @@
 	* version.h (OCTAVE_VERSION): Now 2.1.60.
 	(OCTAVE_API_VERSION): Now api-v11.
 
+	* OPERATORS/op-int.h (OCTAVE_MM_INT_OPS): Include missing matrix
+	by int matrix ops.
+	(OCTAVE_INSTALL_MM_INT_OPS): Install them.
+
+	* OPERATORS/op-i64-i64.cc: Define and install missing int64 by
+	matrix and scalar ops.
+
 2004-09-24  David Bateman  <dbateman@free.fr>
 
 	* ov-fcn-inline (Finline): Attempt better auto-detection of
--- a/src/OPERATORS/op-i64-i64.cc	Fri Sep 24 15:01:51 2004 +0000
+++ b/src/OPERATORS/op-i64-i64.cc	Fri Sep 24 17:46:19 2004 +0000
@@ -85,20 +85,36 @@
 
 OCTAVE_S_INT_UNOPS (int64)
 OCTAVE_SS_INT_CMP_OPS (ss, int64_, int64_)
+OCTAVE_SS_INT_CMP_OPS (sx, int64_, )
+OCTAVE_SS_INT_CMP_OPS (xs, , int64_)
 OCTAVE_SS_INT_BOOL_OPS (ss, int64_, int64_, octave_int64 (0), octave_int64 (0))
+OCTAVE_SS_INT_BOOL_OPS (sx, int64_, , octave_int64 (0), 0)
+OCTAVE_SS_INT_BOOL_OPS (xs, , int64_, 0, octave_int64 (0))
 
 OCTAVE_SM_INT_CMP_OPS (sm, int64_, int64_)
+OCTAVE_SM_INT_CMP_OPS (xm, , int64_)
+OCTAVE_SM_INT_CMP_OPS (smx, int64_, )
 OCTAVE_SM_INT_BOOL_OPS (sm, int64_, int64_)
+OCTAVE_SM_INT_BOOL_OPS (xm, , int64_)
+OCTAVE_SM_INT_BOOL_OPS (smx, int64_, )
 
 OCTAVE_MS_INT_CMP_OPS (ms, int64_, int64_)
+OCTAVE_MS_INT_CMP_OPS (mx, int64_, )
+OCTAVE_MS_INT_CMP_OPS (mxs, , int64_)
 OCTAVE_MS_INT_BOOL_OPS (ms, int64_, int64_)
+OCTAVE_MS_INT_BOOL_OPS (mx, int64_, )
+OCTAVE_MS_INT_BOOL_OPS (mxs, , int64_)
 OCTAVE_MS_INT_ASSIGN_OPS (ms, int64_, int64_, int64_)
 OCTAVE_MS_INT_ASSIGN_OPS (mx, int64_, , )
 OCTAVE_MS_INT_ASSIGN_OPS (mc, int64_, complex_, )
 
 OCTAVE_M_INT_UNOPS (int64)
 OCTAVE_MM_INT_CMP_OPS (mm, int64_, int64_)
+OCTAVE_MM_INT_CMP_OPS (mmx, int64_, )
+OCTAVE_MM_INT_CMP_OPS (mxm, , int64_)
 OCTAVE_MM_INT_BOOL_OPS (mm, int64_, int64_)
+OCTAVE_MM_INT_BOOL_OPS (mmx, int64_, )
+OCTAVE_MM_INT_BOOL_OPS (mxm, , int64_)
 OCTAVE_MM_INT_ASSIGN_OPS (mm, int64_, int64_, int64_)
 OCTAVE_MM_INT_ASSIGN_OPS (mmx, int64_, , )
 OCTAVE_MM_INT_ASSIGN_OPS (mmc, int64_, complex_, )
@@ -127,25 +143,43 @@
 OCTAVE_MIXED_INT_CMP_OPS (int64, uint32)
 OCTAVE_MIXED_INT_CMP_OPS (int64, uint64)
 
+OCTAVE_CONCAT_FN (int64);
+
 void
 install_i64_i64_ops (void)
 {
   OCTAVE_INSTALL_S_INT_UNOPS (int64);
   OCTAVE_INSTALL_SS_INT_CMP_OPS (ss, int64_, int64_);
+  OCTAVE_INSTALL_SS_INT_CMP_OPS (sx, int64_, );
+  OCTAVE_INSTALL_SS_INT_CMP_OPS (xs, , int64_);
   OCTAVE_INSTALL_SS_INT_BOOL_OPS (ss, int64_, int64_);
+  OCTAVE_INSTALL_SS_INT_BOOL_OPS (sx, int64_, );
+  OCTAVE_INSTALL_SS_INT_BOOL_OPS (xs, , int64_);
 
   OCTAVE_INSTALL_SM_INT_CMP_OPS (sm, int64_, int64_);
+  OCTAVE_INSTALL_SM_INT_CMP_OPS (xm, , int64_);
+  OCTAVE_INSTALL_SM_INT_CMP_OPS (smx, int64_, );
   OCTAVE_INSTALL_SM_INT_BOOL_OPS (sm, int64_, int64_);
+  OCTAVE_INSTALL_SM_INT_BOOL_OPS (xm, , int64_);
+  OCTAVE_INSTALL_SM_INT_BOOL_OPS (smx, int64_, );
 
   OCTAVE_INSTALL_MS_INT_CMP_OPS (ms, int64_, int64_);
+  OCTAVE_INSTALL_MS_INT_CMP_OPS (mx, int64_, );
+  OCTAVE_INSTALL_MS_INT_CMP_OPS (mxs, , int64_);
   OCTAVE_INSTALL_MS_INT_BOOL_OPS (ms, int64_, int64_);
+  OCTAVE_INSTALL_MS_INT_BOOL_OPS (mx, int64_, );
+  OCTAVE_INSTALL_MS_INT_BOOL_OPS (mxs, , int64_);
   OCTAVE_INSTALL_MS_INT_ASSIGN_OPS (ms, int64_, int64_);
   OCTAVE_INSTALL_MS_INT_ASSIGN_OPS (mx, int64_, );
   OCTAVE_INSTALL_MS_INT_ASSIGN_OPS (mc, int64_, complex_);
 
   OCTAVE_INSTALL_M_INT_UNOPS (int64);
   OCTAVE_INSTALL_MM_INT_CMP_OPS (mm, int64_, int64_);
+  OCTAVE_INSTALL_MM_INT_CMP_OPS (mmx, int64_, );
+  OCTAVE_INSTALL_MM_INT_CMP_OPS (mxm, , int64_);
   OCTAVE_INSTALL_MM_INT_BOOL_OPS (mm, int64_, int64_);
+  OCTAVE_INSTALL_MM_INT_BOOL_OPS (mmx, int64_, );
+  OCTAVE_INSTALL_MM_INT_BOOL_OPS (mxm, , int64_);
   OCTAVE_INSTALL_MM_INT_ASSIGN_OPS (mm, int64_, int64_);
   OCTAVE_INSTALL_MM_INT_ASSIGN_OPS (mmx, int64_, );
   OCTAVE_INSTALL_MM_INT_ASSIGN_OPS (mmc, int64_, complex_);
@@ -181,6 +215,8 @@
   OCTAVE_INSTALL_MIXED_INT_CMP_OPS (int64, int32);
   OCTAVE_INSTALL_MIXED_INT_CMP_OPS (int64, uint32);
   OCTAVE_INSTALL_MIXED_INT_CMP_OPS (int64, uint64);
+
+  OCTAVE_INSTALL_CONCAT_FN (int64);
 }
 
 /*
--- a/src/OPERATORS/op-int.h	Fri Sep 24 15:01:51 2004 +0000
+++ b/src/OPERATORS/op-int.h	Fri Sep 24 17:46:19 2004 +0000
@@ -435,8 +435,10 @@
   OCTAVE_MM_INT_ARITH_OPS (TYPE, TYPE) \
   OCTAVE_MM_INT_CMP_OPS (mm, TYPE ## _, TYPE ## _) \
   OCTAVE_MM_INT_CMP_OPS (mmx, TYPE ## _, ) \
+  OCTAVE_MM_INT_CMP_OPS (mxm, , TYPE ## _) \
   OCTAVE_MM_INT_BOOL_OPS (mm, TYPE ## _, TYPE ## _) \
   OCTAVE_MM_INT_BOOL_OPS (mmx, TYPE ## _, ) \
+  OCTAVE_MM_INT_BOOL_OPS (mxm, , TYPE ## _) \
   OCTAVE_MM_INT_ASSIGN_OPS (mm, TYPE ## _, TYPE ## _, TYPE ## _) \
   OCTAVE_MM_INT_ASSIGN_OPS (mmx, TYPE ## _, , ) \
   OCTAVE_MM_CONV(TYPE ## _, complex_)
@@ -629,8 +631,10 @@
   OCTAVE_INSTALL_MM_INT_ARITH_OPS (TYPE, TYPE) \
   OCTAVE_INSTALL_MM_INT_CMP_OPS (mm, TYPE ## _, TYPE ## _) \
   OCTAVE_INSTALL_MM_INT_CMP_OPS (mmx, TYPE ## _, ) \
+  OCTAVE_INSTALL_MM_INT_CMP_OPS (mxm, , TYPE ## _) \
   OCTAVE_INSTALL_MM_INT_BOOL_OPS (mm, TYPE ## _, TYPE ## _) \
   OCTAVE_INSTALL_MM_INT_BOOL_OPS (mmx, TYPE ## _, ) \
+  OCTAVE_INSTALL_MM_INT_BOOL_OPS (mxm, , TYPE ## _) \
   OCTAVE_INSTALL_MM_INT_ASSIGN_OPS (mm, TYPE ## _, TYPE ## _) \
   OCTAVE_INSTALL_MM_INT_ASSIGN_OPS (mmx, TYPE ## _, ) \
   INSTALL_WIDENOP (octave_ ## TYPE ## _matrix, octave_complex_matrix, TYPE ## _m_complex_m_conv) \
--- a/src/OPERATORS/op-ui64-ui64.cc	Fri Sep 24 15:01:51 2004 +0000
+++ b/src/OPERATORS/op-ui64-ui64.cc	Fri Sep 24 17:46:19 2004 +0000
@@ -85,20 +85,36 @@
 
 OCTAVE_S_INT_UNOPS (uint64)
 OCTAVE_SS_INT_CMP_OPS (ss, uint64_, uint64_)
+OCTAVE_SS_INT_CMP_OPS (sx, uint64_, )
+OCTAVE_SS_INT_CMP_OPS (xs, , uint64_)
 OCTAVE_SS_INT_BOOL_OPS (ss, uint64_, uint64_, octave_uint64 (0), octave_uint64 (0))
+OCTAVE_SS_INT_BOOL_OPS (sx, uint64_, , octave_uint64 (0), 0)
+OCTAVE_SS_INT_BOOL_OPS (xs, , uint64_, 0, octave_uint64 (0))
 
 OCTAVE_SM_INT_CMP_OPS (sm, uint64_, uint64_)
+OCTAVE_SM_INT_CMP_OPS (xm, , uint64_)
+OCTAVE_SM_INT_CMP_OPS (smx, uint64_, )
 OCTAVE_SM_INT_BOOL_OPS (sm, uint64_, uint64_)
+OCTAVE_SM_INT_BOOL_OPS (xm, , uint64_)
+OCTAVE_SM_INT_BOOL_OPS (smx, uint64_, )
 
 OCTAVE_MS_INT_CMP_OPS (ms, uint64_, uint64_)
+OCTAVE_MS_INT_CMP_OPS (mx, uint64_, )
+OCTAVE_MS_INT_CMP_OPS (mxs, , uint64_)
 OCTAVE_MS_INT_BOOL_OPS (ms, uint64_, uint64_)
+OCTAVE_MS_INT_BOOL_OPS (mx, uint64_, )
+OCTAVE_MS_INT_BOOL_OPS (mxs, , uint64_)
 OCTAVE_MS_INT_ASSIGN_OPS (ms, uint64_, uint64_, uint64_)
 OCTAVE_MS_INT_ASSIGN_OPS (mx, uint64_, , )
 OCTAVE_MS_INT_ASSIGN_OPS (mc, uint64_, complex_, )
 
 OCTAVE_M_INT_UNOPS (uint64)
 OCTAVE_MM_INT_CMP_OPS (mm, uint64_, uint64_)
+OCTAVE_MM_INT_CMP_OPS (mmx, uint64_, )
+OCTAVE_MM_INT_CMP_OPS (mxm, , uint64_)
 OCTAVE_MM_INT_BOOL_OPS (mm, uint64_, uint64_)
+OCTAVE_MM_INT_BOOL_OPS (mmx, uint64_, )
+OCTAVE_MM_INT_BOOL_OPS (mxm, , uint64_)
 OCTAVE_MM_INT_ASSIGN_OPS (mm, uint64_, uint64_, uint64_)
 OCTAVE_MM_INT_ASSIGN_OPS (mmx, uint64_, , )
 OCTAVE_MM_INT_ASSIGN_OPS (mmc, uint64_, complex_, )
@@ -127,25 +143,43 @@
 OCTAVE_MIXED_INT_CMP_OPS (uint64, uint32)
 OCTAVE_MIXED_INT_CMP_OPS (uint64, int64)
 
+OCTAVE_CONCAT_FN (uint64)
+
 void
 install_ui64_ui64_ops (void)
 {
   OCTAVE_INSTALL_S_INT_UNOPS (uint64);
   OCTAVE_INSTALL_SS_INT_CMP_OPS (ss, uint64_, uint64_);
+  OCTAVE_INSTALL_SS_INT_CMP_OPS (sx, uint64_, );
+  OCTAVE_INSTALL_SS_INT_CMP_OPS (xs, , uint64_);
   OCTAVE_INSTALL_SS_INT_BOOL_OPS (ss, uint64_, uint64_);
+  OCTAVE_INSTALL_SS_INT_BOOL_OPS (sx, uint64_, );
+  OCTAVE_INSTALL_SS_INT_BOOL_OPS (xs, , uint64_);
 
   OCTAVE_INSTALL_SM_INT_CMP_OPS (sm, uint64_, uint64_);
+  OCTAVE_INSTALL_SM_INT_CMP_OPS (xm, , uint64_);
+  OCTAVE_INSTALL_SM_INT_CMP_OPS (smx, uint64_, );
   OCTAVE_INSTALL_SM_INT_BOOL_OPS (sm, uint64_, uint64_);
+  OCTAVE_INSTALL_SM_INT_BOOL_OPS (xm, , uint64_);
+  OCTAVE_INSTALL_SM_INT_BOOL_OPS (smx, uint64_, );
 
   OCTAVE_INSTALL_MS_INT_CMP_OPS (ms, uint64_, uint64_);
+  OCTAVE_INSTALL_MS_INT_CMP_OPS (mx, uint64_, );
+  OCTAVE_INSTALL_MS_INT_CMP_OPS (mxs, , uint64_);
   OCTAVE_INSTALL_MS_INT_BOOL_OPS (ms, uint64_, uint64_);
+  OCTAVE_INSTALL_MS_INT_BOOL_OPS (mx, uint64_, );
+  OCTAVE_INSTALL_MS_INT_BOOL_OPS (mxs, , uint64_);
   OCTAVE_INSTALL_MS_INT_ASSIGN_OPS (ms, uint64_, uint64_);
   OCTAVE_INSTALL_MS_INT_ASSIGN_OPS (mx, uint64_, );
   OCTAVE_INSTALL_MS_INT_ASSIGN_OPS (mc, uint64_, complex_);
 
   OCTAVE_INSTALL_M_INT_UNOPS (uint64);
   OCTAVE_INSTALL_MM_INT_CMP_OPS (mm, uint64_, uint64_);
+  OCTAVE_INSTALL_MM_INT_CMP_OPS (mmx, uint64_, );
+  OCTAVE_INSTALL_MM_INT_CMP_OPS (mxm, , uint64_);
   OCTAVE_INSTALL_MM_INT_BOOL_OPS (mm, uint64_, uint64_);
+  OCTAVE_INSTALL_MM_INT_BOOL_OPS (mmx, uint64_, );
+  OCTAVE_INSTALL_MM_INT_BOOL_OPS (mxm, , uint64_);
   OCTAVE_INSTALL_MM_INT_ASSIGN_OPS (mm, uint64_, uint64_);
   OCTAVE_INSTALL_MM_INT_ASSIGN_OPS (mmx, uint64_, );
   OCTAVE_INSTALL_MM_INT_ASSIGN_OPS (mmc, uint64_, complex_);
@@ -181,6 +215,8 @@
   OCTAVE_INSTALL_MIXED_INT_CMP_OPS (uint64, int32);
   OCTAVE_INSTALL_MIXED_INT_CMP_OPS (uint64, uint32);
   OCTAVE_INSTALL_MIXED_INT_CMP_OPS (uint64, int64);
+
+  OCTAVE_INSTALL_CONCAT_FN (uint64);
 }
 
 /*