Mercurial > octave

diff src/tc-rep.cc @ 636:fae2bd91c027

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1994-08-23 18:39:50 by jwe]
author jwe
date Tue, 23 Aug 1994 18:39:50 +0000
parents 9aef0a53eee7
children 36ba0576bd1b
line wrap: on
line diff
--- a/src/tc-rep.cc	Tue Aug 23 17:57:20 1994 +0000
+++ b/src/tc-rep.cc	Tue Aug 23 18:39:50 1994 +0000
@@ -904,8 +904,6 @@
 	  retval = matrix->elem (0, 0);
 	else
 	  gripe_invalid_conversion ("real matrix", "real scalar");
-
-	retval = octave_NaN;
       }
       break;
 
@@ -1053,7 +1051,7 @@
 Complex
 TC_REP::complex_value (int force_string_conversion) const
 {
-  Complex retval;
+  Complex retval (octave_NaN, octave_NaN);
 
   switch (type_tag)
     {
@@ -1077,8 +1075,6 @@
 	  }
 	else
 	  gripe_invalid_conversion ("real matrix", "real scalar");
-
-	retval = octave_NaN;
       }
       break;
 
@@ -1185,8 +1181,13 @@
 char *
 TC_REP::string_value (void) const
 {
-  assert (type_tag == string_constant);
-  return string;
+  if (type_tag == string_constant)
+    return string;
+  else
+    {
+      gripe_invalid_conversion (type_as_string (), "string");
+      return 0;
+    }
 }
 
 Range