--- a/src/pt-misc.cc	Fri May 16 02:42:54 1997 +0000
+++ b/src/pt-misc.cc	Fri May 16 03:30:14 1997 +0000
@@ -28,301 +28,15 @@
 #include <config.h>
 #endif
 
-#include <iostream.h>
-#include <strstream.h>
-
-#ifdef HAVE_UNISTD_H
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#include <unistd.h>
-#endif
-
-#include "str-vec.h"
-
-#include "defun.h"
-#include "error.h"
-#include "input.h"
-#include "oct-obj.h"
-#include "oct-lvalue.h"
-#include "ov-usr-fcn.h"
-#include "ov.h"
-#include "pager.h"
-#include "pt-cmd.h"
-#include "pt-const.h"
-#include "pt-exp.h"
-#include "pt-id.h"
-#include "pt-indir.h"
-#include "pt-misc.h"
-#include "pt-pr-code.h"
-#include "pt-walk.h"
-#include "toplev.h"
-#include "utils.h"
-#include "variables.h"
-
-// Nonzero means we're breaking out of a loop or function body.
-extern int breaking;
-
-// Nonzero means we're jumping to the end of a loop.
-extern int continuing;
-
-// Nonzero means we're returning from a function.
-extern int returning;
-
-// If TRUE, turn off printing of results in functions (as if a
-// semicolon has been appended to each statement).
-static bool Vsilent_functions;
-
-// A list of commands to be executed.
-
-tree_statement::~tree_statement (void)
-{
-  delete cmd;
-  delete expr;
-}
-
-int
-tree_statement::line (void)
-{
-  return cmd ? cmd->line () : (expr ? expr->line () : -1);
-}
-
-int
-tree_statement::column (void)
-{
-  return cmd ? cmd->column () : (expr ? expr->column () : -1);
-}
-
-void
-tree_statement::maybe_echo_code (bool in_function_body)
-{
-  if (in_function_body
-      && (Vecho_executing_commands & ECHO_FUNCTIONS))
-    {
-      tree_print_code tpc (octave_stdout, Vps4);
-
-      accept (tpc);
-    }
-}
-
-octave_value_list
-tree_statement::eval (bool silent, int nargout, bool in_function_body)
-{
-  octave_value_list retval;
-
-  bool pf = silent ? false : print_flag;
-
-  if (cmd || expr)
-    {
-      maybe_echo_code (in_function_body);
-
-      if (cmd)
-	cmd->eval ();
-      else
-	{
-	  expr->set_print_flag (pf);
-
-	  // XXX FIXME XXX -- maybe all of this should be packaged in
-	  // one virtual function that returns a flag saying whether
-	  // or not the expression will take care of binding ans and
-	  // printing the result.
-
-	  bool do_bind_ans = false;
-
-	  if (expr->is_identifier ())
-	    {
-	      bool script_file_executed = false;
-
-	      tree_identifier *id = static_cast<tree_identifier *> (expr);
-
-	      id->do_lookup (script_file_executed, false);
-
-	      do_bind_ans = id->is_function ();
-	    }
-	  else
-	    do_bind_ans = (! (expr->is_indirect_ref ()
-			      || expr->is_assignment_expression ()));
-
-	  retval = expr->rvalue (nargout);
-
-	  if (do_bind_ans && ! (error_state || retval.empty ()))
-	    bind_ans (retval(0), pf);
-	}
-    }
-
-  return retval;
-}
-
-void
-tree_statement::accept (tree_walker& tw)
-{
-  tw.visit_statement (*this);
-}
-
-octave_value_list
-tree_statement_list::eval (bool silent, int nargout)
-{
-  octave_value_list retval;
-
-  if (error_state)
-    return retval;
-
-  for (Pix p = first (); p != 0; next (p))
-    {
-      tree_statement *elt = this->operator () (p);
-
-      if (elt)
-	{
-	  bool silent_flag =
-	    silent ? true : (function_body ? Vsilent_functions : false);
+#include <SLList.h>
 
-	  retval = elt->eval (silent_flag, nargout, function_body);
-
-	  if (error_state)
-	    break;
-
-	  if (breaking || continuing)
-	    break;
-
-	  if (returning)
-	    break;
-	}
-      else
-	error ("invalid statement found in statement list!");
-    }
-
-  return retval;
-}
-
-void
-tree_statement_list::accept (tree_walker& tw)
-{
-  tw.visit_statement_list (*this);
-}
-
-tree_argument_list::~tree_argument_list (void)
-{
-  while (! empty ())
-    {
-      tree_expression *t = remove_front ();
-      delete t;
-    }
-}
-
-bool
-tree_argument_list::all_elements_are_constant (void) const
-{
-  for (Pix p = first (); p != 0; next (p))
-    {
-      tree_expression *elt = this->operator () (p);
-
-      if (! elt->is_constant ())
-	return false;
-    }
-
-  return true;
-}
-
-octave_value_list
-tree_argument_list::convert_to_const_vector (void)
-{
-  int len = length ();
-
-  // XXX FIXME XXX -- would be nice to know in advance how largs args
-  // needs to be even when we have a list containing an all_va_args
-  // token.
-
-  octave_value_list args;
-  args.resize (len);
-
-  Pix p = first ();
-  int j = 0;
-  for (int k = 0; k < len; k++)
-    {
-      tree_expression *elt = this->operator () (p);
-
-      if (elt)
-	{
-	  octave_value tmp = elt->rvalue ();
-
-	  if (error_state)
-	    {
-	      ::error ("evaluating argument list element number %d", k);
-	      args = octave_value_list ();
-	      break;
-	    }
-	  else
-	    {
-	      if (tmp.is_all_va_args ())
-		{
-		  if (curr_function)
-		    {
-		      octave_value_list tva;
-		      tva = curr_function->octave_all_va_args ();
-		      int n = tva.length ();
-		      for (int i = 0; i < n; i++)
-			args(j++) = tva(i);
-		    }
-		  else
-		    {
-		      ::error ("all_va_args is only valid inside functions");
-		      args = octave_value_list ();
-		      break;
-		    }
-		}
-	      else
-		args(j++) = tmp;
-	    }
-	  next (p);
-	}
-      else
-	{
-	  args(j++) = octave_value ();
-	  break;
-	}
-    }
-
-  args.resize (j);
-
-  return args;
-}
-
-string_vector
-tree_argument_list::get_arg_names (void) const
-{
-  int len = length ();
-
-  string_vector retval (len);
-
-  int k = 0;
-
-  for (Pix p = first (); p; next (p))
-    {
-      tree_expression *elt = this->operator () (p);
-
-      strstream str_buf;
-
-      tree_print_code pc_buf (str_buf);
-
-      elt->accept (pc_buf);
-
-      str_buf << ends;
-
-      const char *s = str_buf.str ();
-
-      retval(k++) = s;
-
-      delete [] s;
-    }
-
-  return retval;
-}
-
-void
-tree_argument_list::accept (tree_walker& tw)
-{
-  tw.visit_argument_list (*this);
-}
+#include "error.h"
+#include "ov.h"
+#include "oct-lvalue.h"
+#include "pt-id.h"
+#include "pt-idx.h"
+#include "pt-misc.h"
+#include "pt-walk.h"
 
 // Parameter lists.
 
@@ -473,192 +187,6 @@
   tw.visit_return_list (*this);
 }
 
-// Declarations (global, static, etc.).
-
-tree_decl_elt::~tree_decl_elt (void)
-{
-  delete id;
-  delete expr;
-}
-
-void
-tree_decl_elt::accept (tree_walker& tw)
-{
-  tw.visit_decl_elt (*this);
-}
-
-// Initializer lists for declaration statements.
-
-void
-tree_decl_init_list::eval (tree_decl_elt::eval_fcn f, bool skip_init)
-{
-  for (Pix p = first (); p != 0; next (p))
-    {
-      f (*(this->operator () (p)), skip_init);
-
-      if (error_state)
-	break;
-    }
-}
-
-void
-tree_decl_init_list::accept (tree_walker& tw)
-{
-  tw.visit_decl_init_list (*this);
-}
-
-// If.
-
-tree_if_clause::~tree_if_clause (void)
-{
-  delete expr;
-  delete list;
-}
-
-int
-tree_if_clause::eval (void)
-{
-  if (is_else_clause () || expr->is_logically_true ("if"))
-    {
-      if (list)
-	list->eval ();
-
-      return 1;
-    }
-
-  return 0;
-}
-
-void
-tree_if_clause::accept (tree_walker& tw)
-{
-  tw.visit_if_clause (*this);
-}
-
-// List of if commands.
-
-void
-tree_if_command_list::eval (void)
-{
-  for (Pix p = first (); p != 0; next (p))
-    {
-      tree_if_clause *t = this->operator () (p);
-
-      if (t->eval () || error_state)
-	break;
-    }
-}
-
-void
-tree_if_command_list::accept (tree_walker& tw)
-{
-  tw.visit_if_command_list (*this);
-}
-
-// Switch.
-
-tree_switch_case::~tree_switch_case (void)
-{
-  delete label;
-  delete list;
-}
-
-bool
-tree_switch_case::label_matches (const octave_value& val)
-{
-  bool retval = false;
-
-  octave_value label_value = label->rvalue ();
-
-  if (! error_state)
-    {
-      if (label_value.is_defined ())
-	{
-	  octave_value tmp = do_binary_op (octave_value::eq,
-					   val, label_value);
-
-	  if (! error_state)
-	    {
-	      if (tmp.is_defined ())
-		retval = tmp.is_true ();
-	      else
-		eval_error ();
-	    }
-	  else
-	    eval_error ();
-	}
-      else
-	eval_error ();
-    }
-  else
-    eval_error ();
-
-  return retval;
-}
-
-int
-tree_switch_case::eval (const octave_value& val)
-{
-  int retval = 0;
-
-  if (is_default_case () || label_matches (val))
-    {
-      if (list)
-	list->eval ();
-
-      retval = 1;
-    }
-
-  return retval;
-}
-
-void
-tree_switch_case::eval_error (void)
-{
-  ::error ("evaluating switch case label");
-}
-
-void
-tree_switch_case::accept (tree_walker& tw)
-{
-  tw.visit_switch_case (*this);
-}
-
-// List of switch cases.
-
-void
-tree_switch_case_list::eval (const octave_value& val)
-{
-  for (Pix p = first (); p != 0; next (p))
-    {
-      tree_switch_case *t = this->operator () (p);
-
-      if (t->eval (val) || error_state)
-	break;
-    }
-}
-
-void
-tree_switch_case_list::accept (tree_walker& tw)
-{
-  tw.visit_switch_case_list (*this);
-}
-
-static int
-silent_functions (void)
-{
-  Vsilent_functions = check_preference ("silent_functions");
-
-  return 0;
-}
-
-void
-symbols_of_pt_misc (void)
-{
-  DEFVAR (silent_functions, 0.0, 0, silent_functions,
-    "suppress printing results in called functions");
-}
-
 /*
 ;;; Local Variables: ***
 ;;; mode: C++ ***