changeset 1211:ee2c6a67abe9

[project @ 1995-04-06 01:12:06 by jwe]
author jwe
date Thu, 06 Apr 1995 01:13:07 +0000
parents dc7a13bed722
children 7b9d52071a0c
files src/pt-exp-base.cc src/symtab.cc
diffstat 2 files changed, 3 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/pt-exp-base.cc	Tue Apr 04 19:25:21 1995 +0000
+++ b/src/pt-exp-base.cc	Thu Apr 06 01:13:07 1995 +0000
@@ -120,18 +120,12 @@
   int pad_after = 0;
   if (user_pref.print_answer_id_name)
     {
-      if (print_as_scalar (tc))
+      if (print_as_scalar (tc) || print_as_structure (tc))
 	{
 	  ostrstream output_buf;
 	  output_buf << name << " = " << ends;
 	  maybe_page_output (output_buf);
 	}
-      else if (print_as_structure (tc))
-	{
-	  ostrstream output_buf;
-	  output_buf << name << " = {\n" << ends;
-	  maybe_page_output (output_buf);
-	}
       else
 	{
 	  pad_after = 1;
@@ -1935,8 +1929,7 @@
 	}
     }
 
-  if (! error_state && print && retval.is_defined ()
-      && user_pref.print_answer_id_name) 
+  if (! error_state && print && retval.is_defined ())
     print_constant (retval, lhs->name ());
 
   return retval;
@@ -2070,7 +2063,7 @@
 		  maybe_page_output (output_buf);
 		}
 
-	      if (print && user_pref.print_answer_id_name)
+	      if (print)
 		print_constant (results(i), lhs_expr->name (), 0);
 
 	      pad_after++;
--- a/src/symtab.cc	Tue Apr 04 19:25:21 1995 +0000
+++ b/src/symtab.cc	Thu Apr 06 01:13:07 1995 +0000
@@ -401,7 +401,6 @@
     {
 // Would be nice to be able to avoid this cast.  XXX FIXME XXX
       definition->define ((tree_constant *) saved_def);
-      delete t;
       return 0;
     }