--- a/src/pt-const.h
+++ b/src/pt-const.h
@@ -28,16 +28,17 @@
 #pragma interface
 #endif
 
+#include <cstdlib>
+
 #include <iostream.h>
 
-#include <stdlib.h>
-
+#include "Range.h"
 #include "mx-base.h"
-#include "Range.h"
 
+#include "oct-obj.h"
+#include "oct-str.h"
 #include "tree-base.h"
 #include "tree-expr.h"
-#include "oct-obj.h"
 
 class idx_vector;
 class Octave_map;
@@ -83,8 +84,10 @@
 //                  ComplexRowVector
 //                  ComplexColumnVector
 // string           char* (null terminated)
-// range            double, double, dobule
+//                  Octave_str_obj
+// range            double, double, double
 //                  Range
+// map              Octave_map
 // magic colon      tree_constant::magic_colon
 // all_va_args      tree_constant::all_va_args
 
@@ -124,6 +127,9 @@
   tree_constant (const char *s) : tree_fvc ()
     { rep = new tree_constant_rep (s); rep->count = 1; }
 
+  tree_constant (const Octave_str_obj& s) : tree_fvc ()
+    { rep = new tree_constant_rep (s); rep->count = 1; }
+
   tree_constant (double base, double limit, double inc) : tree_fvc ()
     { rep = new tree_constant_rep (base, limit, inc); rep->count = 1; }
 
@@ -283,7 +289,10 @@
   ComplexMatrix complex_matrix_value (int force_string_conversion = 0) const
     { return rep->complex_matrix_value (force_string_conversion); }
 
-  char *string_value (void) const
+  Octave_str_obj all_strings (void) const
+    { return rep->all_strings (); }
+
+  const char *string_value (void) const
     { return rep->string_value (); }
 
   Range range_value (void) const