Mercurial > hg > octave-nkf

changeset 390:0f4129889b57

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1994-03-17 21:47:39 by jwe]
author jwe
date Thu, 17 Mar 1994 21:47:43 +0000
parents 4cb0c5015dc3
children 71bcc230ecd3
files src/arith-ops.cc src/g-builtins.cc
diffstat 2 files changed, 14 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/arith-ops.cc
+++ b/src/arith-ops.cc
@@ -2,7 +2,7 @@
 // Used by the tree class.                    
 /*
 
-Copyright (C) 1992, 1993 John W. Eaton
+Copyright (C) 1992, 1993, 1994 John W. Eaton
 
 This file is part of Octave.
 
@@ -2097,7 +2097,7 @@
     case tree::el_leftdiv:
       result_type = RT_complex;
       if (m_add_conform (a, b, 1))
-	complex_result = quotient (a, b);
+	complex_result = quotient (b, a);
       break;
     case tree::leftdiv:
       return xleftdiv (a, b);
--- a/src/g-builtins.cc
+++ b/src/g-builtins.cc
@@ -459,12 +459,19 @@
 
   char *msg = "unspecified_error";
 
-  if (nargin == 2
-      && args != NULL_TREE_CONST
-      && args[1].is_defined ()
-      && args[1].is_string_type ())
+  if (nargin == 2 && args != NULL_TREE_CONST && args[1].is_defined ())
     {
-      msg = args[1].string_value ();
+      if (args[1].is_string_type ())
+	{
+	  msg = args[1].string_value ();
+
+	  if (msg == (char *) NULL || *msg == '\0')
+	    return retval;
+	}
+      else if (args[1].is_empty ())
+	{
+	  return retval;
+	}
     }
 
   error (msg);