Mercurial > hg > octave-nkf

changeset 2830:10a8198b1733

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1997-03-26 00:12:41 by jwe]
author jwe
date Wed, 26 Mar 1997 00:13:00 +0000
parents 6655bdca97fb
children 19c45d29f177
files liboctave/Array-flags.cc liboctave/Array-flags.h liboctave/Array-idx.h liboctave/Array2-idx.h liboctave/ChangeLog liboctave/idx-vector.cc liboctave/idx-vector.h src/ChangeLog src/octave.cc src/ov.cc src/ov.h
diffstat 11 files changed, 27 insertions(+), 53 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/Array-flags.cc
+++ b/liboctave/Array-flags.cc
@@ -32,7 +32,6 @@
 
 int liboctave_dfi_flag = 0;
 int liboctave_pcv_flag = 0;
-int liboctave_pzo_flag = 0;
 int liboctave_rre_flag = 0;
 
 #endif
--- a/liboctave/Array-flags.h
+++ b/liboctave/Array-flags.h
@@ -23,7 +23,6 @@
 #if defined (OCTAVE_SOURCE)
 extern int liboctave_dfi_flag;
 extern int liboctave_pcv_flag;
-extern int liboctave_pzo_flag;
 extern int liboctave_rre_flag;
 #endif
 
--- a/liboctave/Array-idx.h
+++ b/liboctave/Array-idx.h
@@ -78,7 +78,7 @@
 
   int len = length ();
 
-  int n = idx.freeze (len, "vector", liboctave_pzo_flag);
+  int n = idx.freeze (len, "vector");
 
   if (idx)
     {
@@ -188,8 +188,7 @@
   int lhs_len = lhs.length ();
   int rhs_len = rhs.length ();
 
-  int n = idx.freeze (lhs_len, "vector", liboctave_pzo_flag,
-		      liboctave_rre_flag);
+  int n = idx.freeze (lhs_len, "vector", liboctave_rre_flag);
 
   if (n != 0)
     {
--- a/liboctave/Array2-idx.h
+++ b/liboctave/Array2-idx.h
@@ -108,7 +108,7 @@
       // This code is only for indexing matrices.  The vector
       // cases are handled above.
 
-      idx.freeze (nr * nc, "matrix", liboctave_pzo_flag);
+      idx.freeze (nr * nc, "matrix");
 
       if (idx)
 	{
@@ -158,8 +158,8 @@
   int nr = d1;
   int nc = d2;
 
-  int n = idx_i.freeze (nr, "row", liboctave_pzo_flag);
-  int m = idx_j.freeze (nc, "column", liboctave_pzo_flag);
+  int n = idx_i.freeze (nr, "row");
+  int m = idx_j.freeze (nc, "column");
 
   if (idx_i && idx_j)
     {
@@ -377,11 +377,9 @@
       idx_vector idx_i = tmp[0];
       idx_vector idx_j = tmp[1];
 
-      int n = idx_i.freeze (lhs_nr, "row", liboctave_pzo_flag,
-			    liboctave_rre_flag);
+      int n = idx_i.freeze (lhs_nr, "row", liboctave_rre_flag);
 
-      int m = idx_j.freeze (lhs_nc, "column", liboctave_pzo_flag,
-			    liboctave_rre_flag);
+      int m = idx_j.freeze (lhs_nc, "column", liboctave_rre_flag);
 
       int idx_i_is_colon = idx_i.is_colon ();
       int idx_j_is_colon = idx_j.is_colon ();
@@ -457,8 +455,7 @@
 
 	  int lhs_len = lhs.length ();
 
-	  int n = idx.freeze (lhs_len, 0, liboctave_pzo_flag,
-			      liboctave_rre_flag);
+	  int n = idx.freeze (lhs_len, 0, liboctave_rre_flag);
 
 	  if (idx)
 	    {
@@ -542,8 +539,7 @@
 
 	  idx_vector idx = tmp[0];
 
-	  idx.freeze (lhs_nc, "vector", liboctave_pzo_flag,
-		      liboctave_rre_flag);
+	  idx.freeze (lhs_nc, "vector", liboctave_rre_flag);
 
 	  if (idx)
 	    {
@@ -568,8 +564,7 @@
 
 	  idx_vector idx = tmp[0];
 
-	  idx.freeze (lhs_nr, "vector", liboctave_pzo_flag,
-		      liboctave_rre_flag);
+	  idx.freeze (lhs_nr, "vector", liboctave_rre_flag);
 
 	  if (idx)
 	    {
@@ -593,8 +588,7 @@
 	  idx_vector *tmp = lhs.get_idx ();
 	  idx_vector idx = tmp[0];
 
-	  int len = idx.freeze (lhs_nr * lhs_nc, "matrix",
-				liboctave_pzo_flag);
+	  int len = idx.freeze (lhs_nr * lhs_nc, "matrix");
 
 	  if (idx)
 	    {
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,5 +1,11 @@
 Tue Mar 25 17:37:25 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* idx-vector.h (idx_vector::idx_vector_rep::freeze,
+	idx_vector::freeze): Delete prefer_zero_one arg.
+	* Array-idx.h, Array2-idx.h: Change all callers.
+
+	* Array-flags.h, Array-flags.cc (liboctave_pzo_flag): Delete.
+
 	* mx-op-defs.h: New file for operator definitions.
 	* mx-cdm-cm.h, mx-cdm-cs.h, mx-cdm-dm.h, mx-cdm-m.h, mx-cdm-s.h,
 	mx-cm-cdm.h, mx-cm-dm.h, mx-cm-m.h, mx-cm-s.h, mx-cs-cdm.h,
--- a/liboctave/idx-vector.cc
+++ b/liboctave/idx-vector.cc
@@ -552,8 +552,7 @@
 }
 
 int
-IDX_VEC_REP::freeze (int z_len, const char *tag,
-		     int prefer_zero_one, int resize_ok)
+IDX_VEC_REP::freeze (int z_len, const char *tag, int resize_ok)
 {
   if (frozen)
     {
--- a/liboctave/idx-vector.h
+++ b/liboctave/idx-vector.h
@@ -106,8 +106,7 @@
 
     void shorten (int n); // Unsafe.  Avoid at all cost.
 
-    int freeze (int z_len, const char *tag, int prefer_zero_one,
-		int resize_ok);
+    int freeze (int z_len, const char *tag, int resize_ok);
 
     // i/o
 
@@ -246,9 +245,8 @@
 
 // i/o
 
-  int freeze (int z_len, const char *tag, int prefer_zero_one = 0,
-	      int resize_ok = 0)
-    { return rep->freeze (z_len, tag, prefer_zero_one, resize_ok); }
+  int freeze (int z_len, const char *tag, int resize_ok = 0)
+    { return rep->freeze (z_len, tag, resize_ok); }
 
   ostream& print (ostream& os) const { return rep->print (os); }
 
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 Tue Mar 25 17:17:17 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* octave.cc (maximum_braindamage): Don't bind prefer_zero_one_indexing.
+	* ov.h: Don't declare Vprefer_zero_one_indexing.
+	* ov.cc: Don't define Vprefer_zero_one_indexing.
+	(prefer_zero_one_indexing): Delete.
+	(symbols_of_value): Delete DEFVAR for prefer_zero_one_indexing.
+
 	* ov.h, ov.cc, ov-base.h, ov-base.cc: Add constructors and
 	extractors for bool and boolMatrix types. 
 	
--- a/src/octave.cc
+++ b/src/octave.cc
@@ -383,7 +383,6 @@
   bind_builtin_variable ("ok_to_lose_imaginary_part", 1.0);
   bind_builtin_variable ("page_screen_output", 0.0);
   bind_builtin_variable ("prefer_column_vectors", 0.0);
-  bind_builtin_variable ("prefer_zero_one_indexing", 1.0);
   bind_builtin_variable ("print_empty_dimensions", 0.0);
   bind_builtin_variable ("treat_neg_dim_as_zero", 1.0);
   bind_builtin_variable ("warn_function_name_clash", 0.0);
--- a/src/ov.cc
+++ b/src/ov.cc
@@ -89,12 +89,6 @@
 // TRUE.
 bool Vprefer_column_vectors;
 
-// If TRUE, prefer logical (zore-one) indexing over normal indexing
-// when there is a conflice.  For example, given a = [2, 3], the
-// expression  a ([1, 1]) would return [2 3] (instead of [2 2], which
-// would be returned if prefer_zero_one_indxing were FALSE).
-bool Vprefer_zero_one_indexing;
-
 // If TRUE, print the name along with the value.
 bool Vprint_answer_id_name;
 
@@ -841,16 +835,6 @@
 }
 
 static int
-prefer_zero_one_indexing (void)
-{
-  Vprefer_zero_one_indexing = check_preference ("prefer_zero_one_indexing");
-
-  liboctave_pzo_flag = Vprefer_zero_one_indexing;
-
-  return 0;
-}
-
-static int
 print_answer_id_name (void)
 {
   Vprint_answer_id_name = check_preference ("print_answer_id_name");
@@ -917,9 +901,6 @@
   DEFVAR (prefer_column_vectors, 1.0, 0, prefer_column_vectors,
     "prefer column/row vectors");
 
-  DEFVAR (prefer_zero_one_indexing, 0.0, 0, prefer_zero_one_indexing,
-    "when there is a conflict, prefer zero-one style indexing");
-
   DEFVAR (print_answer_id_name, 1.0, 0, print_answer_id_name,
     "set output style to print `var_name = ...'");
 
--- a/src/ov.h
+++ b/src/ov.h
@@ -450,12 +450,6 @@
 // TRUE.
 extern bool Vprefer_column_vectors;
 
-// If TRUE, prefer logical (zore-one) indexing over normal indexing
-// when there is a conflice.  For example, given a = [2, 3], the
-// expression  a ([1, 1]) would return [2 3] (instead of [2 2], which
-// would be returned if prefer_zero_one_indxing were FALSE).
-extern bool Vprefer_zero_one_indexing;
-
 // If TRUE, print the name along with the value.
 extern bool Vprint_answer_id_name;