Mercurial > octave-nkf

changeset 5280:25c12c80ccc3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2005-04-14 19:19:45 by jwe]
author jwe
date Thu, 14 Apr 2005 19:19:46 +0000
parents bd32f770c09a
children f3266e7dbb99
files src/ChangeLog src/ov.h src/pt-mat.cc src/strfns.cc
diffstat 4 files changed, 96 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Tue Apr 12 21:55:31 2005 +0000
+++ b/src/ChangeLog	Thu Apr 14 19:19:46 2005 +0000
@@ -1,3 +1,22 @@
+2005-04-14  John W. Eaton  <jwe@octave.org>
+
+	* pt-mat.cc (Vwarn_string_concat): New static variable.
+	(symbols_of_pt_mat): DEFVAR it.
+	(warn_string_concat): New function.
+	(maybe_warn_string_concat): New function.
+	(tree_matrix::rvalue): If all args are single quoted strings,
+	create a single quoted string object.  If all args are strings
+	(any type), create a double quoted string object.  If a mixture of
+	string types, maybe warn.
+	(class tm_row_const, class tm_row_const_rep, class tm_const):
+	Note whether all values are double or single quoted strings.
+
+	* ov.h (octave_value::is_dq_string): New function.
+
+2005-04-13  John W. Eaton  <jwe@octave.org>
+
+	* strfns.cc (Fchar): Create sq_string objects here.
+
 2005-04-12  John W. Eaton  <jwe@octave.org>
 
 	* file-io.cc (Ffprintf, Fprintf, Fsprintf):
--- a/src/ov.h	Tue Apr 12 21:55:31 2005 +0000
+++ b/src/ov.h	Thu Apr 14 19:19:46 2005 +0000
@@ -431,6 +431,9 @@
   virtual bool is_sq_string (void) const
     { return rep->is_sq_string (); }
 
+  bool is_dq_string (void) const
+    { return rep->is_string () && ! rep->is_sq_string (); }
+
   virtual bool is_range (void) const
     { return rep->is_range (); }
 
--- a/src/pt-mat.cc	Tue Apr 12 21:55:31 2005 +0000
+++ b/src/pt-mat.cc	Thu Apr 14 19:19:46 2005 +0000
@@ -44,6 +44,9 @@
 // The character to fill with when creating string arrays.
 char Vstring_fill_char = ' ';
 
+// Warn if concatenating double and single quoted strings.
+char Vwarn_string_concat = true;
+
 // General matrices.  This list type is much more work to handle than
 // constant matrices, but it allows us to construct matrices from
 // other matrices, variables, and functions.
@@ -61,14 +64,13 @@
   public:
 
     tm_row_const_rep (void)
-      : count (1), dv (),
-	all_str (false), some_str (false), is_cmplx (false),
-	all_mt (true), ok (false) { }
+      : count (1), dv (), all_str (false),
+	all_sq_str (false), all_dq_str (false),
+	some_str (false), is_cmplx (false), all_mt (true), ok (false) { }
 
     tm_row_const_rep (const tree_argument_list& row)
-      : count (1), dv (),
-	all_str (false), some_str (false), is_cmplx (false),
-	all_mt (true), ok (false)
+      : count (1), dv (), all_str (false), all_sq_str (false),
+	some_str (false), is_cmplx (false), all_mt (true), ok (false)
     { init (row); }
 
     ~tm_row_const_rep (void) { }
@@ -78,6 +80,8 @@
     dim_vector dv;
 
     bool all_str;
+    bool all_sq_str;
+    bool all_dq_str;
     bool some_str;
     bool is_cmplx;
     bool all_mt;
@@ -149,6 +153,8 @@
   dim_vector dims (void) { return rep->dv; }
 
   bool all_strings_p (void) const { return rep->all_str; }
+  bool all_sq_strings_p (void) const { return rep->all_sq_str; }
+  bool all_dq_strings_p (void) const { return rep->all_dq_str; }
   bool some_strings_p (void) const { return rep->some_str; }
   bool complex_p (void) const { return rep->is_cmplx; }
   bool all_empty_p (void) const { return rep->all_mt; }
@@ -240,6 +246,12 @@
   if (all_str && ! val.is_string ())
     all_str = false;
 
+  if (all_sq_str && ! val.is_sq_string ())
+    all_sq_str = false;
+
+  if (all_dq_str && ! val.is_dq_string ())
+    all_dq_str = false;
+
   if (! some_str && val.is_string ())
     some_str = true;
 
@@ -253,6 +265,8 @@
 tm_row_const::tm_row_const_rep::init (const tree_argument_list& row)
 {
   all_str = true;
+  all_sq_str = true;
+  all_dq_str = true;
 
   bool first_elem = true;
 
@@ -327,8 +341,8 @@
 public:
 
   tm_const (const tree_matrix& tm)
-    : dv (), all_str (false), some_str (false), is_cmplx (false),
-      all_mt (true), ok (false)
+    : dv (), all_str (false), all_sq_str (false), all_dq_str (false),
+      some_str (false), is_cmplx (false), all_mt (true), ok (false)
       { init (tm); }
 
   ~tm_const (void) { }
@@ -339,6 +353,8 @@
   dim_vector dims (void) const { return dv; }
 
   bool all_strings_p (void) const { return all_str; }
+  bool all_sq_strings_p (void) const { return all_sq_str; }
+  bool all_dq_strings_p (void) const { return all_dq_str; }
   bool some_strings_p (void) const { return some_str; }
   bool complex_p (void) const { return is_cmplx; }
   bool all_empty_p (void) const { return all_mt; }
@@ -350,6 +366,8 @@
   dim_vector dv;
 
   bool all_str;
+  bool all_sq_str;
+  bool all_dq_str;
   bool some_str;
   bool is_cmplx;
   bool all_mt;
@@ -369,6 +387,8 @@
 tm_const::init (const tree_matrix& tm)
 {
   all_str = true;
+  all_sq_str = true;
+  all_dq_str = true;
 
   bool first_elem = true;
 
@@ -388,6 +408,12 @@
 	  if (all_str && ! tmp.all_strings_p ())
 	    all_str = false;
 
+	  if (all_sq_str && ! tmp.all_sq_strings_p ())
+	    all_sq_str = false;
+
+	  if (all_dq_str && ! tmp.all_dq_strings_p ())
+	    all_dq_str = false;
+
 	  if (! some_str && tmp.some_strings_p ())
 	    some_str = true;
 
@@ -542,12 +568,21 @@
   return retval;
 }
 
+static void
+maybe_warn_string_concat (bool all_dq_strings_p, bool all_sq_strings_p)
+{
+  if (Vwarn_string_concat && ! (all_dq_strings_p || all_sq_strings_p))
+    ::warning ("concatenation of different character string types may have unintended consequences");
+}
+
 octave_value
 tree_matrix::rvalue (void)
 {
   octave_value retval;
 
   bool all_strings_p = false;
+  bool all_sq_strings_p = false;
+  bool all_dq_strings_p = false;
   bool all_empty_p = false;
   bool frc_str_conv = false;
 
@@ -557,6 +592,8 @@
     {
       dim_vector dv = tmp.dims ();
       all_strings_p = tmp.all_strings_p ();
+      all_sq_strings_p = tmp.all_sq_strings_p ();
+      all_dq_strings_p = tmp.all_dq_strings_p ();
       all_empty_p = tmp.all_empty_p ();
       frc_str_conv = tmp.some_strings_p ();
 
@@ -586,10 +623,17 @@
 
       octave_value ctmp;
       if (all_strings_p)
-	if (all_empty_p)
-	  ctmp = octave_value (charNDArray (), true);
-	else
-	  ctmp = octave_value (charNDArray (dv, Vstring_fill_char), true);
+	{
+	  char type = all_sq_strings_p ? '\'' : '"';
+
+	  maybe_warn_string_concat (all_dq_strings_p, all_sq_strings_p);
+
+	  if (all_empty_p)
+	    ctmp = octave_value (charNDArray (), true, type);
+	  else
+	    ctmp = octave_value (charNDArray (dv, Vstring_fill_char),
+				 true, type);
+	}
       else
 	{
 	  // Find the first non-empty object
@@ -658,6 +702,14 @@
 }
 
 static int
+warn_string_concat (void)
+{
+  Vwarn_string_concat = check_preference ("warn_string_concat");
+
+  return 0;
+}
+
+static int
 string_fill_char (void)
 {
   int status = 0;
@@ -718,6 +770,14 @@
 The default value is 0.\n\
 @end defvr");
 
+  DEFVAR (warn_string_concat, true, warn_string_concat,
+    "-*- texinfo -*-\n\
+@defvr {Built-in Variable} warn_string_concat\n\
+If the value of @code{warn_string_concat} is nonzero, print a\n\
+warning when concatenating a mixture of double and single quoted strings.\n\
+The default value is 1.\n\
+@end defvr");
+
 }
 
 /*
--- a/src/strfns.cc	Tue Apr 12 21:55:31 2005 +0000
+++ b/src/strfns.cc	Thu Apr 14 19:19:46 2005 +0000
@@ -68,7 +68,7 @@
   int nargin = args.length ();
 
   if (nargin == 1)
-    retval = args(0).convert_to_str (true, true);
+    retval = args(0).convert_to_str (true, true, '\'');
   else if (nargin > 1)
     {
       int n_elts = 0;
@@ -115,7 +115,7 @@
 	    }
 	}
 
-      retval = result;
+      retval = octave_value (result, '\'');
     }
   else
     print_usage ("char");