--- a/src/pt-cmd.cc	Fri May 16 02:42:54 1997 +0000
+++ b/src/pt-cmd.cc	Fri May 16 03:30:14 1997 +0000
@@ -28,705 +28,8 @@
 #include <config.h>
 #endif
 
-#include <iostream.h>
-
-// Nonzero means we're breaking out of a loop or function body.
-int breaking = 0;
-
-// Nonzero means we're jumping to the end of a loop.
-int continuing = 0;
-
-// Nonzero means we're returning from a function.  Global because it
-// is also needed in tree-expr.cc.
-int returning = 0;
-
-#include "error.h"
-#include "gripes.h"
-#include "oct-map.h"
-#include "oct-lvalue.h"
 #include "pt-cmd.h"
-#include "symtab.h"
-#include "ov.h"
-#include "pt-exp.h"
-#include "pt-id.h"
-#include "pt-indir.h"
-#include "pt-misc.h"
 #include "pt-walk.h"
-#include "unwind-prot.h"
-#include "variables.h"
-
-// Decide if it's time to quit a for or while loop.
-static inline bool
-quit_loop_now (void)
-{
-  // Maybe handle `continue N' someday...
-
-  if (continuing)
-    continuing--;
-
-  bool quit = (error_state || returning || breaking || continuing);
-
-  if (breaking)
-    breaking--;
-
-  return quit;
-}
-
-// Base class for declaration commands (global, static).
-
-tree_decl_command::~tree_decl_command (void)
-{
-  delete init_list;
-}
-
-void
-tree_decl_command::accept (tree_walker& tw)
-{
-  tw.visit_decl_command (*this);
-}
-
-// Global.
-
-static void
-do_global_init (tree_decl_elt& elt, bool skip_initializer)
-{
-  tree_identifier *id = elt.ident ();
-
-  if (id)
-    {
-      id->link_to_global ();
-
-      tree_expression *expr = elt.expression ();
-
-      if (expr)
-	{
-	  octave_value init_val = expr->rvalue ();
-
-	  octave_lvalue ult = id->lvalue ();
-
-	  ult.assign (octave_value::asn_eq, init_val);
-	}
-    }
-}
-
-void
-tree_global_command::eval (void)
-{
-  if (init_list)
-    {
-      init_list->eval (do_global_init, initialized);
-
-      initialized = true;
-    }
-
-  if (error_state > 0)
-    ::error ("evaluating global command near line %d, column %d",
-	     line (), column ());
-}
-
-// Static.
-
-static void
-do_static_init (tree_decl_elt& elt, bool)
-{
-  tree_identifier *id = elt.ident ();
-
-  if (id)
-    {
-      id->mark_as_static ();
-
-      tree_expression *expr = elt.expression ();
-
-      if (expr)
-	{
-	  octave_value init_val = expr->rvalue ();
-
-	  octave_lvalue ult = id->lvalue ();
-
-	  ult.assign (octave_value::asn_eq, init_val);
-	}
-    }
-}
-
-void
-tree_static_command::eval (void)
-{
-  // Static variables only need to be marked and initialized once.
-
-  if (init_list && ! initialized)
-    {
-      init_list->eval (do_static_init, initialized);
-
-      initialized = true;
-
-      if (error_state > 0)
-	::error ("evaluating static command near line %d, column %d",
-		 line (), column ());
-    }
-}
-
-// While.
-
-tree_while_command::~tree_while_command (void)
-{
-  delete expr;
-  delete list;
-}
-
-void
-tree_while_command::eval (void)
-{
-  if (error_state)
-    return;
-
-  if (! expr)
-    panic_impossible ();
-
-  for (;;)
-    {
-      if (expr->is_logically_true ("while"))
-	{
-	  if (list)
-	    {
-	      list->eval ();
-
-	      if (error_state)
-		{
-		  eval_error ();
-		  return;
-		}
-	    }
-
-	  if (quit_loop_now ())
-	    break;
-	}
-      else
-	break;
-    }
-}
-
-void
-tree_while_command::eval_error (void)
-{
-  if (error_state > 0)
-    ::error ("evaluating while command near line %d, column %d",
-	     line (), column ());
-}
-
-void
-tree_while_command::accept (tree_walker& tw)
-{
-  tw.visit_while_command (*this);
-}
-
-// For.
-
-tree_simple_for_command::~tree_simple_for_command (void)
-{
-  delete expr;
-  delete list;
-}
-
-inline void
-tree_simple_for_command::do_for_loop_once (octave_lvalue& ult,
-					   const octave_value& rhs,
-					   bool& quit)
-{
-  quit = false;
-
-  ult.assign (octave_value::asn_eq, rhs);
-
-  if (! error_state)
-    {
-      if (list)
-	{
-	  list->eval ();
-
-	  if (error_state)
-	    eval_error ();
-	}
-    }
-  else
-    eval_error ();
-
-  quit = quit_loop_now ();
-}
-
-#define DO_LOOP(arg) \
-  do \
-    { \
-      for (int i = 0; i < steps; i++) \
-	{ \
-	  octave_value val (arg); \
- \
-	  bool quit = false; \
- \
-	  do_for_loop_once (ult, val, quit); \
- \
-	  if (quit) \
-	    break; \
-	} \
-    } \
-  while (0)
-
-void
-tree_simple_for_command::eval (void)
-{
-  if (error_state)
-    return;
-
-  octave_value rhs = expr->rvalue ();
-
-  if (error_state || rhs.is_undefined ())
-    {
-      eval_error ();
-      return;
-    }
-
-  octave_lvalue ult = lhs->lvalue ();
-
-  if (error_state)
-    {
-      eval_error ();
-      return;
-    }
-
-  if (rhs.is_scalar_type ())
-    {
-      bool quit = false;
-
-      do_for_loop_once (ult, rhs, quit);
-    }
-  else if (rhs.is_matrix_type ())
-    {
-      Matrix m_tmp;
-      ComplexMatrix cm_tmp;
-
-      int nr;
-      int steps;
-
-      if (rhs.is_real_matrix ())
-	{
-	  m_tmp = rhs.matrix_value ();
-	  nr = m_tmp.rows ();
-	  steps = m_tmp.columns ();
-	}
-      else
-	{
-	  cm_tmp = rhs.complex_matrix_value ();
-	  nr = cm_tmp.rows ();
-	  steps = cm_tmp.columns ();
-	}
-
-      if (rhs.is_real_matrix ())
-	{
-	  if (nr == 1)
-	    DO_LOOP (m_tmp (0, i));
-	  else
-	    DO_LOOP (m_tmp.extract (0, i, nr-1, i));
-	}
-      else
-	{
-	  if (nr == 1)
-	    DO_LOOP (cm_tmp (0, i));
-	  else
-	    DO_LOOP (cm_tmp.extract (0, i, nr-1, i));
-	}
-    }
-  else if (rhs.is_string ())
-    {
-      gripe_string_invalid ();
-    }
-  else if (rhs.is_range ())
-    {
-      Range rng = rhs.range_value ();
-
-      int steps = rng.nelem ();
-      double b = rng.base ();
-      double increment = rng.inc ();
-
-      for (int i = 0; i < steps; i++)
-	{
-	  double tmp_val = b + i * increment;
-
-	  octave_value val (tmp_val);
-
-	  bool quit = false;
-
-	  do_for_loop_once (ult, val, quit);
-
-	  if (quit)
-	    break;
-	}
-    }
-  else if (rhs.is_map ())
-    {
-      Octave_map tmp_val (rhs.map_value ());
-
-      for (Pix p = tmp_val.first (); p != 0; tmp_val.next (p))
-	{
-	  octave_value val = tmp_val.contents (p);
-
-	  bool quit = false;
-
-	  do_for_loop_once (ult, val, quit);
-
-	  if (quit)
-	    break;
-	}
-    }
-  else
-    {
-      ::error ("invalid type in for loop expression near line %d, column %d",
-	       line (), column ());
-    }
-}
-
-void
-tree_simple_for_command::eval_error (void)
-{
-  if (error_state > 0)
-    ::error ("evaluating for command near line %d, column %d",
-	     line (), column ());
-}
-
-void
-tree_simple_for_command::accept (tree_walker& tw)
-{
-  tw.visit_simple_for_command (*this);
-}
-
-tree_complex_for_command::~tree_complex_for_command (void)
-{
-  delete expr;
-  delete list;
-}
-
-void
-tree_complex_for_command::do_for_loop_once (octave_lvalue &val_ref,
-					    octave_lvalue &key_ref,
-					    const octave_value& val,
-					    const octave_value& key,
-					    bool& quit)
-{
-  quit = false;
-
-  val_ref.assign (octave_value::asn_eq, val);
-  key_ref.assign (octave_value::asn_eq, key);
-
-  if (! error_state)
-    {
-      if (list)
-	{
-	  list->eval ();
-
-	  if (error_state)
-	    eval_error ();
-	}
-    }
-  else
-    eval_error ();
-
-  quit = quit_loop_now ();
-}
-
-void
-tree_complex_for_command::eval (void)
-{
-  if (error_state)
-    return;
-
-  octave_value rhs = expr->rvalue ();
-
-  if (error_state || rhs.is_undefined ())
-    {
-      eval_error ();
-      return;
-    }
-
-  if (rhs.is_map ())
-    {
-      // Cycle through structure elements.  First element of id_list
-      // is set to value and the second is set to the name of the
-      // structure element.
-
-      Pix p = lhs->first ();
-      tree_expression *elt = lhs->operator () (p);
-      octave_lvalue val_ref = elt->lvalue ();
-
-      lhs->next (p);
-      elt = lhs->operator () (p);
-      octave_lvalue key_ref = elt->lvalue ();
-
-      Octave_map tmp_val (rhs.map_value ());
-
-      for (p = tmp_val.first (); p != 0; tmp_val.next (p))
-	{
-	  octave_value key = tmp_val.key (p);
-	  octave_value val = tmp_val.contents (p);
-
-	  bool quit = false;
-
-	  do_for_loop_once (key_ref, val_ref, key, val, quit);
-
-	  if (quit)
-	    break;
-	}
-    }
-  else
-    error ("in statement `for [X, Y] = VAL', VAL must be a structure");
-}
-
-void
-tree_complex_for_command::eval_error (void)
-{
-  if (error_state > 0)
-    ::error ("evaluating for command near line %d, column %d",
-	     line (), column ());
-}
-
-void
-tree_complex_for_command::accept (tree_walker& tw)
-{
-  tw.visit_complex_for_command (*this);
-}
-
-// If.
-
-tree_if_command::~tree_if_command (void)
-{
-  delete list;
-}
-
-void
-tree_if_command::eval (void)
-{
-  if (list)
-    list->eval ();
-
-  if (error_state > 0)
-    ::error ("evaluating if command near line %d, column %d",
-	     line (), column ());
-}
-
-void
-tree_if_command::accept (tree_walker& tw)
-{
-  tw.visit_if_command (*this);
-}
-
-// Switch.
-
-tree_switch_command::~tree_switch_command (void)
-{
-  delete expr;
-  delete list;
-}
-
-void
-tree_switch_command::eval (void)
-{
-  if (expr)
-    {
-      octave_value val = expr->rvalue ();
-
-      if (! error_state)
-	{
-	  if (list)
-	    list->eval (val);
-
-	  if (error_state)
-	    eval_error ();
-	}
-      else
-	eval_error ();
-    }
-  else
-    ::error ("missing value in switch command near line %d, column %d",
-	     line (), column ());
-}
-
-void
-tree_switch_command::eval_error (void)
-{
-  ::error ("evaluating switch command near line %d, column %d",
-	   line (), column ());
-}
-
-void
-tree_switch_command::accept (tree_walker& tw)
-{
-  tw.visit_switch_command (*this);
-}
-
-// Simple exception handling.
-
-tree_try_catch_command::~tree_try_catch_command (void)
-{
-  delete try_code;
-  delete catch_code;
-}
-
-static void
-do_catch_code (void *ptr)
-{
-  tree_statement_list *list = static_cast<tree_statement_list *> (ptr);
-
-  // Set up for letting the user print any messages from errors that
-  // occurred in the body of the try_catch statement.
-
-  buffer_error_messages = 0;
-  bind_global_error_variable ();
-  add_unwind_protect (clear_global_error_variable, 0);
-
-  // Similarly, if we have seen a return or break statement, allow all
-  // the catch code to run before returning or handling the break.
-  // We don't have to worry about continue statements because they can
-  // only occur in loops.
-
-  unwind_protect_int (returning);
-  returning = 0;
-
-  unwind_protect_int (breaking);
-  breaking = 0;
-
-  if (list)
-    list->eval ();
-
-  // This is the one for breaking.  (The unwind_protects are popped
-  // off the stack in the reverse of the order they are pushed on).
-
-  // XXX FIXME XXX -- inside a try-catch, should break work like
-  // a return, or just jump to the end of the try_catch block?
-  // The following code makes it just jump to the end of the block.
-
-  run_unwind_protect ();
-  if (breaking)
-    breaking--;
-
-  // This is the one for returning.
-
-  if (returning)
-    discard_unwind_protect ();
-  else
-    run_unwind_protect ();
-
-  run_unwind_protect ();
-}
-
-void
-tree_try_catch_command::eval (void)
-{
-  begin_unwind_frame ("tree_try_catch::eval");
-
-  add_unwind_protect (do_catch_code, catch_code);
-
-  if (catch_code)
-    {
-      unwind_protect_int (buffer_error_messages);
-      buffer_error_messages = 1;
-    }
-
-  if (try_code)
-    try_code->eval ();
-
-  if (catch_code && error_state)
-    {
-      error_state = 0;
-      run_unwind_frame ("tree_try_catch::eval");
-    }
-  else
-    {
-      error_state = 0;
-      discard_unwind_frame ("tree_try_catch::eval");
-    }
-}
-
-void
-tree_try_catch_command::accept (tree_walker& tw)
-{
-  tw.visit_try_catch_command (*this);
-}
-
-// Simple exception handling.
-
-tree_unwind_protect_command::~tree_unwind_protect_command (void)
-{
-  delete unwind_protect_code;
-  delete cleanup_code;
-}
-
-static void
-do_unwind_protect_cleanup_code (void *ptr)
-{
-  tree_statement_list *list = static_cast<tree_statement_list *> (ptr);
-
-  // We want to run the cleanup code without error_state being set,
-  // but we need to restore its value, so that any errors encountered
-  // in the first part of the unwind_protect are not completely
-  // ignored.
-
-  unwind_protect_int (error_state);
-  error_state = 0;
-
-  // Similarly, if we have seen a return or break statement, allow all
-  // the cleanup code to run before returning or handling the break.
-  // We don't have to worry about continue statements because they can
-  // only occur in loops.
-
-  unwind_protect_int (returning);
-  returning = 0;
-
-  unwind_protect_int (breaking);
-  breaking = 0;
-
-  if (list)
-    list->eval ();
-
-  // This is the one for breaking.  (The unwind_protects are popped
-  // off the stack in the reverse of the order they are pushed on).
-
-  // XXX FIXME XXX -- inside an unwind_protect, should break work like
-  // a return, or just jump to the end of the unwind_protect block?
-  // The following code makes it just jump to the end of the block.
-
-  run_unwind_protect ();
-  if (breaking)
-    breaking--;
-
-  // This is the one for returning.
-
-  if (returning)
-    discard_unwind_protect ();
-  else
-    run_unwind_protect ();
-
-  // We don't want to ignore errors that occur in the cleanup code, so
-  // if an error is encountered there, leave error_state alone.
-  // Otherwise, set it back to what it was before.
-
-  if (error_state)
-    discard_unwind_protect ();
-  else
-    run_unwind_protect ();
-}
-
-void
-tree_unwind_protect_command::eval (void)
-{
-  add_unwind_protect (do_unwind_protect_cleanup_code, cleanup_code);
-
-  if (unwind_protect_code)
-    unwind_protect_code->eval ();
-
-  run_unwind_protect ();
-}
-
-void
-tree_unwind_protect_command::accept (tree_walker& tw)
-{
-  tw.visit_unwind_protect_command (*this);
-}
 
 // No-op.
 
@@ -736,51 +39,6 @@
   tw.visit_no_op_command (*this);
 }
 
-// Break.
-
-void
-tree_break_command::eval (void)
-{
-  if (! error_state)
-    breaking = 1;
-}
-
-void
-tree_break_command::accept (tree_walker& tw)
-{
-  tw.visit_break_command (*this);
-}
-
-// Continue.
-
-void
-tree_continue_command::eval (void)
-{
-  if (! error_state)
-    continuing = 1;
-}
-
-void
-tree_continue_command::accept (tree_walker& tw)
-{
-  tw.visit_continue_command (*this);
-}
-
-// Return.
-
-void
-tree_return_command::eval (void)
-{
-  if (! error_state)
-    returning = 1;
-}
-
-void
-tree_return_command::accept (tree_walker& tw)
-{
-  tw.visit_return_command (*this);
-}
-
 /*
 ;;; Local Variables: ***
 ;;; mode: C++ ***