diff src/ov-cs-list.cc @ 4591:2c9de1be042a

[project @ 2003-11-11 00:23:35 by jwe]
author jwe
date Tue, 11 Nov 2003 00:23:35 +0000
parents 55695bf73797
children cba347c642e2
line wrap: on
line diff
--- a/src/ov-cs-list.cc
+++ b/src/ov-cs-list.cc
@@ -42,196 +42,20 @@
 
 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_cs_list, "cs-list");
 
-#if 0
-
-octave_value
-octave_list::subsref (const std::string& type,
-		      const std::list<octave_value_list>& idx)
+octave_cs_list::octave_cs_list (const Cell& c)
 {
-  octave_value retval;
-
-  switch (type[0])
-    {
-    case '(':
-      {
-	octave_value_list tmp_idx = idx.front ();
-
-	if (tmp_idx.length () == 1)
-	  {
-	    idx_vector i = tmp_idx (0).index_vector ();
-
-	    retval = octave_value_list (lst.index (i));
-	  }
-	else
-	  error ("only one index allowed for lists");
-      }
-      break;
-
-    case '{':
-      {
-	octave_value_list tmp_idx = idx.front ();
-
-	if (tmp_idx.length () == 1)
-	  {
-	    idx_vector i = tmp_idx (0).index_vector ();
-
-	    octave_value_list tmp = lst.index (i);
-
-	    if (tmp.length () == 1)
-	      retval = tmp(0);
-	  }
-	else
-	  error ("only one index allowed for lists");
-      }
-      break;
-
-    case '.':
-      {
-	std::string nm = type_name ();
-	error ("%s cannot be indexed with %c", nm.c_str (), type[0]);
-      }
-      break;
-
-    default:
-      panic_impossible ();
-    }
-
-  return retval.next_subsref (type, idx);
-}
-
-octave_value
-octave_list::do_index_op (const octave_value_list& idx, int resize_ok)
-{
-  octave_value retval;
-
-  if (idx.length () == 1)
-    {
-      idx_vector i = idx (0).index_vector ();
-
-      retval = octave_value_list (lst.index (i, resize_ok));
-    }
-  else
-    error ("lists may only be indexed by a single scalar");
-
-  return retval;
-}
-
-octave_value
-octave_list::subsasgn (const std::string& type,
-		       const std::list<octave_value_list>& idx,
-		       const octave_value& rhs)
-{
-  octave_value retval;
-
-  int n = type.length ();
-
-  octave_value t_rhs = rhs;
-
-  if (n > 1)
-    {
-      switch (type[0])
-	{
-	case '(':
-	  {
-	    octave_value tmp = do_index_op (idx.front (), true);
+  int n = c.length ();
 
-	    if (! tmp.is_defined ())
-	      tmp = octave_value::empty_conv (type.substr (1), rhs);
-
-	    if (! error_state)
-	      {
-		std::list<octave_value_list> next_idx (idx);
-
-		next_idx.erase (next_idx.begin ());
-
-		t_rhs = tmp.subsasgn (type.substr (1), next_idx, rhs);
-	      }
-	  }
-	  break;
-
-	case '{':
-	case '.':
-	  {
-	    std::string nm = type_name ();
-	    error ("%s cannot be indexed with %c", nm.c_str (), type[0]);
-	  }
-	  break;
-
-	default:
-	  panic_impossible ();
-	}
-    }
-
-  if (! error_state)
-    {
-      switch (type[0])
-	{
-	case '(':
-	  {
-	    octave_value_list i = idx.front ();
-
-	    assign (i, t_rhs);
-
-	    retval = octave_value (this, count + 1);
-	  }
-	  break;
+  lst.resize (n);
 
-	case '{':
-	case '.':
-	  {
-	    std::string nm = type_name ();
-	    error ("%s cannot be indexed with %c", nm.c_str (), type[0]);
-	  }
-	  break;
-
-	default:
-	  panic_impossible ();
-	}
-    }
-
-  return retval;
+  for (int i = 0; i < n; i++)
+    lst(i) = c(i);
 }
 
 void
-octave_list::assign (const octave_value_list& idx, const octave_value& rhs)
-{
-  if (idx.length () == 1)
-    {
-      int i = idx(0).int_value (true);
-
-      if (! error_state)
-	{
-	  int n = lst.length ();
-
-	  if (i > 0)
-	    {
-	      if (Vwarn_resize_on_range_error && i > n)
-		warning ("list index = %d out of range", i);
-
-	      lst(i-1) = rhs;
-	    }
-	  else
-	    error ("list index = %d out of range", i);
-	}
-      else
-	error ("list index must be an integer");
-    }
-  else
-    error ("lists may only be indexed by a single scalar");
-}
-
-void
-octave_list::print (std::ostream& os, bool) const
-{
-  print_raw (os);
-}
-
-#endif
-
-void
 octave_cs_list::print_raw (std::ostream& os, bool) const
 {
-  unwind_protect::begin_frame ("octave_list_print");
+  unwind_protect::begin_frame ("octave_cs_list_print");
 
   int n = lst.length ();
 
@@ -265,208 +89,9 @@
 
   newline (os);
 
-  unwind_protect::run_frame ("octave_list_print");
-}
-
-#if 0
-
-bool
-octave_list::print_name_tag (std::ostream& os, const std::string& name) const
-{
-  indent (os);
-  if (lst.length () == 0)
-    os << name << " = ";
-  else
-    {
-      os << name << " =";
-      newline (os);
-    }
-  return false;
-}
-
-DEFUN (list, args, ,
-  "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} list (@var{a1}, @var{a2}, @dots{})\n\
-Create a new list with elements given by the arguments @var{a1},\n\
-@var{a2}, @dots{}.\n\
-@end deftypefn")
-{
-  return octave_value (args);
-}
-
-DEFUN (nth, args, ,
-  "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} nth (@var{list}, @var{n})\n\
-Return the @var{n}-th element of @var{list}.\n\
-@end deftypefn")
-{
-  octave_value retval;
-
-  if (args.length () == 2)
-    {
-      octave_value_list lst = args(0).list_value ();
-
-      if (! error_state)
-	{
-	  int n = args(1).int_value (true);
-
-	  if (! error_state)
-	    {
-	      if (n > 0 && n <= lst.length ())
-		retval = lst(n-1);
-	      else
-		error ("nth: index = %d out of range", n);
-	    }
-	  else
-	    error ("nth: second argument must be an integer");
-	}
-      else
-	error ("nth: first argument must be a list");
-    }
-  else
-    print_usage ("nth");
-
-  return retval;
+  unwind_protect::run_frame ("octave_cs_list_print");
 }
 
-DEFUN (append, args, ,
-  "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} append (@var{list}, @var{a1}, @var{a2}, @dots{})\n\
-Return a new list created by appending @var{a1}, @var{a1}, @dots{}, to\n\
-@var{list}.  If any of the arguments to be appended is a list, its\n\
-elements are appended individually.  For example,\n\
-\n\
-@example\n\
-x = list (1, 2);\n\
-y = list (3, 4);\n\
-append (x, y);\n\
-@end example\n\
-\n\
-@noindent\n\
-results in the list containing the four elements @samp{(1 2 3 4)}, not\n\
-a list containing the three elements @samp{(1 2 (3 4))}.\n\
-@end deftypefn")
-{
-  octave_value retval;
-
-  int nargin = args.length ();
-
-  if (nargin > 1)
-    {
-      octave_value_list tmp = args(0).list_value ();
-
-      if (! error_state)
-	{
-	  for (int i = 1; i < nargin; i++)
-	    {
-	      octave_value ov = args(i);
-
-	      if (ov.is_list ())
-		tmp.append (ov.list_value ());
-	      else
-		tmp.append (ov);
-	    }
-
-	  retval = tmp;
-	}
-    }
-  else
-    print_usage ("append");
-
-  return retval;
-}
-
-DEFUN (reverse, args, ,
-  "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} reverse (@var{list})\n\
-Return a new list created by reversing the elements of @var{list}.\n\
-@end deftypefn")
-{
-  octave_value retval;
-
-  int nargin = args.length ();
-
-  if (nargin == 1)
-    {
-      octave_value_list tmp = args(0).list_value ();
-
-      if (! error_state)
-	  retval = tmp.reverse ();
-    }
-  else
-    print_usage ("reverse");
-
-  return retval;
-}
-
-DEFUN (splice, args, ,
-  "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} splice (@var{list_1}, @var{offset}, @var{length}, @var{list_2})\n\
-Replace @var{length} elements of @var{list_1} beginning at\n\
-@var{offset} with the contents of @var{list_2} (if any).  If\n\
-@var{length} is omitted, all elements from @var{offset} to the end of\n\
-@var{list_1} are replaced.  As a special case, if @var{offset} is one\n\
-greater than the length of @var{list_1} and @var{length} is 0, splice\n\
-is equivalent to @code{append (@var{list_1}, @var{list_2})}.\n\
-@end deftypefn") 
-{
-  octave_value retval;
-
-  int nargin = args.length ();
-
-  if (nargin > 1 && nargin < 5)
-    {
-      octave_value_list list_1 = args(0).list_value ();
-
-      if (! error_state)
-	{
-	  int offset = args(1).int_value (true);
-
-	  if (! error_state)
-	    {
-	      offset--;
-
-	      int length = 0;
-
-	      octave_value_list list_2;
-
-	      if (nargin < 3)
-		length = list_1.length () - offset;
-	      else
-		{
-		  length = args(2).int_value (true);
-
-		  if (! error_state)
-		    {
-		      if (nargin == 4)
-			{
-			  list_2 = args(3).list_value ();
-
-			  if (error_state)
-			    error ("splice: fourth argument must be a list");
-			}
-		    }
-		  else
-		    error ("splice: LENGTH must be an integer");
-		}
-
-	      if (! error_state)
-		retval = list_1.splice (offset, length, list_2);
-	    }
-	  else
-	    error ("splice: OFFSET must be an integer");
-	}
-      else
-	error ("splice: first argument must be a list");      
-    }
-  else
-    print_usage ("splice");
-
-  return retval;
-}
-
-#endif
-
 /*
 ;;; Local Variables: ***
 ;;; mode: C++ ***