# HG changeset patch
# User jwe
# Date 1041622564 0
# Node ID be631c1720eac5dcb83463acb91456ffac9888c1
# Parent  e7e10ce42860883ceb32014c5a9c083e1064a5bc
[project @ 2003-01-03 19:36:04 by jwe]

diff -r e7e10ce42860 -r be631c1720ea src/ChangeLog
--- a/src/ChangeLog	Fri Jan 03 18:55:11 2003 +0000
+++ b/src/ChangeLog	Fri Jan 03 19:36:04 2003 +0000
@@ -1,5 +1,10 @@
 2003-01-03  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* pt-plot.cc (subplot::extract_plot_data): Call single_subsref,
+	not subsref.
+	* ov.h, ov.cc (single_subsref (const std::string&, const
+	octave_value_list&)): Rename from subsref.
+
 	* symtab.cc (symbol_table::rename): Explicitly convert C string to
 	std::string so type of second arg of ?: matches third.
 	(symbol_table::lookup): Likewise.
diff -r e7e10ce42860 -r be631c1720ea src/ov-base-mat.h
--- a/src/ov-base-mat.h	Fri Jan 03 18:55:11 2003 +0000
+++ b/src/ov-base-mat.h	Fri Jan 03 19:36:04 2003 +0000
@@ -69,6 +69,14 @@
   octave_value subsref (const std::string& type,
 			const std::list<octave_value_list>& idx);
 
+  octave_value_list subsref (const std::string& type,
+			     const std::list<octave_value_list>& idx,
+    			     int nargout)
+    {
+      panic_impossible ();
+      return octave_value_list ();
+    }
+
   octave_value subsasgn (const std::string& type,
 			 const std::list<octave_value_list>& idx,
 			 const octave_value& rhs);
diff -r e7e10ce42860 -r be631c1720ea src/ov-base-scalar.h
--- a/src/ov-base-scalar.h	Fri Jan 03 18:55:11 2003 +0000
+++ b/src/ov-base-scalar.h	Fri Jan 03 19:36:04 2003 +0000
@@ -62,6 +62,14 @@
   octave_value subsref (const std::string& type,
 			const std::list<octave_value_list>& idx);
 
+  octave_value_list subsref (const std::string& type,
+			     const std::list<octave_value_list>& idx,
+    			     int nargout)
+    {
+      panic_impossible ();
+      return octave_value_list ();
+    }
+
   octave_value subsasgn (const std::string& type,
 			 const std::list<octave_value_list>& idx,
 			 const octave_value& rhs);
diff -r e7e10ce42860 -r be631c1720ea src/ov-builtin.h
--- a/src/ov-builtin.h	Fri Jan 03 18:55:11 2003 +0000
+++ b/src/ov-builtin.h	Fri Jan 03 19:36:04 2003 +0000
@@ -50,6 +50,13 @@
 
   ~octave_builtin (void) { }
 
+  octave_value subsref (const std::string& type,
+			const std::list<octave_value_list>& idx)
+    {
+      panic_impossible ();
+      return octave_value ();
+    }
+
   octave_value_list subsref (const std::string& type,
 			     const std::list<octave_value_list>& idx,
 			     int nargout);
diff -r e7e10ce42860 -r be631c1720ea src/ov-cell.h
--- a/src/ov-cell.h	Fri Jan 03 18:55:11 2003 +0000
+++ b/src/ov-cell.h	Fri Jan 03 19:36:04 2003 +0000
@@ -76,6 +76,14 @@
   octave_value subsref (const std::string& type,
 			const std::list<octave_value_list>& idx);
 
+  octave_value_list subsref (const std::string& type,
+			     const std::list<octave_value_list>& idx,
+    			     int nargout)
+    {
+      panic_impossible ();
+      return octave_value_list ();
+    }
+
   octave_value subsasgn (const std::string& type,
 			 const std::list<octave_value_list>& idx,
 			 const octave_value& rhs);
diff -r e7e10ce42860 -r be631c1720ea src/ov-list.h
--- a/src/ov-list.h	Fri Jan 03 18:55:11 2003 +0000
+++ b/src/ov-list.h	Fri Jan 03 19:36:04 2003 +0000
@@ -67,6 +67,14 @@
   octave_value subsref (const std::string& type,
 			const std::list<octave_value_list>& idx);
 
+  octave_value_list subsref (const std::string& type,
+			     const std::list<octave_value_list>& idx,
+    			     int nargout)
+    {
+      panic_impossible ();
+      return octave_value_list ();
+    }
+
   octave_value do_index_op (const octave_value_list& idx, int resize_ok);
 
   octave_value subsasgn (const std::string& type,
diff -r e7e10ce42860 -r be631c1720ea src/ov-mapper.h
--- a/src/ov-mapper.h	Fri Jan 03 18:55:11 2003 +0000
+++ b/src/ov-mapper.h	Fri Jan 03 19:36:04 2003 +0000
@@ -66,6 +66,13 @@
 
   octave_function *function_value (bool) { return this; }
 
+  octave_value subsref (const std::string& type,
+			const std::list<octave_value_list>& idx)
+    {
+      panic_impossible ();
+      return octave_value ();
+    }
+
   octave_value_list subsref (const std::string& type,
 			     const std::list<octave_value_list>& idx,
 			     int nargout);
diff -r e7e10ce42860 -r be631c1720ea src/ov-range.h
--- a/src/ov-range.h	Fri Jan 03 18:55:11 2003 +0000
+++ b/src/ov-range.h	Fri Jan 03 19:36:04 2003 +0000
@@ -88,6 +88,14 @@
   octave_value subsref (const std::string& type,
 			const std::list<octave_value_list>& idx);
 
+  octave_value_list subsref (const std::string& type,
+			     const std::list<octave_value_list>& idx,
+    			     int nargout)
+    {
+      panic_impossible ();
+      return octave_value_list ();
+    }
+
   octave_value do_index_op (const octave_value_list& idx, int resize_ok);
 
   octave_value do_index_op (const octave_value_list& idx)
diff -r e7e10ce42860 -r be631c1720ea src/ov-struct.h
--- a/src/ov-struct.h	Fri Jan 03 18:55:11 2003 +0000
+++ b/src/ov-struct.h	Fri Jan 03 19:36:04 2003 +0000
@@ -72,6 +72,14 @@
   octave_value subsref (const std::string& type,
 			const std::list<octave_value_list>& idx);
 
+  octave_value_list subsref (const std::string& type,
+			     const std::list<octave_value_list>& idx,
+    			     int nargout)
+    {
+      panic_impossible ();
+      return octave_value_list ();
+    }
+
   static octave_value numeric_conv (const octave_value_list& val,
 				    const std::string& type);
 
diff -r e7e10ce42860 -r be631c1720ea src/ov-usr-fcn.h
--- a/src/ov-usr-fcn.h	Fri Jan 03 18:55:11 2003 +0000
+++ b/src/ov-usr-fcn.h	Fri Jan 03 19:36:04 2003 +0000
@@ -143,6 +143,13 @@
 	}
     }
 
+  octave_value subsref (const std::string& type,
+			const std::list<octave_value_list>& idx)
+    {
+      panic_impossible ();
+      return octave_value ();
+    }
+
   octave_value_list subsref (const std::string& type,
 			     const std::list<octave_value_list>& idx,
 			     int nargout);
diff -r e7e10ce42860 -r be631c1720ea src/ov.cc
--- a/src/ov.cc	Fri Jan 03 18:55:11 2003 +0000
+++ b/src/ov.cc	Fri Jan 03 19:36:04 2003 +0000
@@ -612,7 +612,8 @@
 }
 
 octave_value
-octave_value::subsref (const std::string& type, const octave_value_list& idx)
+octave_value::single_subsref (const std::string& type,
+			      const octave_value_list& idx)
 {
   std::list<octave_value_list> i;
 
diff -r e7e10ce42860 -r be631c1720ea src/ov.h
--- a/src/ov.h	Fri Jan 03 18:55:11 2003 +0000
+++ b/src/ov.h	Fri Jan 03 19:36:04 2003 +0000
@@ -250,12 +250,13 @@
   virtual octave_value *try_narrowing_conversion (void)
     { return rep->try_narrowing_conversion (); }
 
+  octave_value single_subsref (const std::string& type,
+			       const octave_value_list& idx);
+
   virtual octave_value subsref (const std::string& type,
 				const std::list<octave_value_list>& idx)
     { return rep->subsref (type, idx); }
 
-  octave_value subsref (const std::string& type, const octave_value_list& idx);
-
   virtual octave_value_list subsref (const std::string& type,
 				     const std::list<octave_value_list>& idx,
     				     int nargout);
diff -r e7e10ce42860 -r be631c1720ea src/pt-plot.cc
--- a/src/pt-plot.cc	Fri Jan 03 18:55:11 2003 +0000
+++ b/src/pt-plot.cc	Fri Jan 03 19:36:04 2003 +0000
@@ -661,7 +661,7 @@
       args(1) = val;
       args(0) = octave_value::magic_colon_t;
 
-      retval = data.subsref ("(", args);
+      retval = data.single_subsref ("(", args);
 
       if (error_state)
 	return octave_value ();