Mercurial > octave-libtiff

changeset 26659:8fbda39ca075

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate "automatic" type from symbol info class * syminfo.h, syminfo.cc (symbol_info::m_is_automatic): Delete data member and all uses. (symbol_info::symbol_info): Eliminate is_automatic and is_complex args. Change all uses. (symbol_info::is_automatic): Delete.
author John W. Eaton <jwe@octave.org>
date Sat, 26 Jan 2019 15:34:26 +0000
parents fc7d72df08fa
children e4909f142491
files libinterp/corefcn/call-stack.cc libinterp/corefcn/syminfo.cc libinterp/corefcn/syminfo.h
diffstat 3 files changed, 14 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/call-stack.cc	Sat Jan 26 15:36:16 2019 +0000
+++ b/libinterp/corefcn/call-stack.cc	Sat Jan 26 15:34:26 2019 +0000
@@ -106,8 +106,8 @@
 
         if (value.is_defined ())
           {
-            symbol_info syminf (sr.name (), value, sr.is_automatic (),
-                                value.iscomplex (), sr.is_formal (),
+            symbol_info syminf (sr.name (), value,
+                                sr.is_formal (),
                                 sr.is_global (), sr.is_persistent ());
 
             symbol_stats.append (syminf);
@@ -802,8 +802,8 @@
               if (verbose)
                 {
                   octave::symbol_info
-                    syminf (sr.name (), value, sr.is_automatic (),
-                            value.iscomplex (), sr.is_formal (),
+                    syminf (sr.name (), value,
+                            sr.is_formal (),
                             sr.is_global (), sr.is_persistent ());
 
                   symbol_stats.append (syminf);
--- a/libinterp/corefcn/syminfo.cc	Sat Jan 26 15:36:16 2019 +0000
+++ b/libinterp/corefcn/syminfo.cc	Sat Jan 26 15:34:26 2019 +0000
@@ -105,14 +105,13 @@
               {
               case 'a':
                 {
-                  char tmp[6];
+                  char tmp[5];
 
-                  tmp[0] = (m_is_automatic ? 'a' : ' ');
-                  tmp[1] = (m_is_complex ? 'c' : ' ');
-                  tmp[2] = (m_is_formal ? 'f' : ' ');
-                  tmp[3] = (m_is_global ? 'g' : ' ');
-                  tmp[4] = (m_is_persistent ? 'p' : ' ');
-                  tmp[5] = 0;
+                  tmp[0] = (m_is_complex ? 'c' : ' ');
+                  tmp[1] = (m_is_formal ? 'f' : ' ');
+                  tmp[2] = (m_is_global ? 'g' : ' ');
+                  tmp[3] = (m_is_persistent ? 'p' : ' ');
+                  tmp[4] = 0;
 
                   os << tmp;
                 }
--- a/libinterp/corefcn/syminfo.h	Sat Jan 26 15:36:16 2019 +0000
+++ b/libinterp/corefcn/syminfo.h	Sat Jan 26 15:34:26 2019 +0000
@@ -52,19 +52,16 @@
   public:
 
     symbol_info (const std::string& name, const octave_value& value,
-                 bool is_automatic, bool is_complex, bool is_formal,
-                 bool is_global, bool is_persistent)
-      : m_name (name), m_value (value), m_is_automatic (is_automatic),
-        m_is_complex (is_complex), m_is_formal (is_formal),
-        m_is_global (is_global), m_is_persistent (is_persistent)
+                 bool is_formal, bool is_global, bool is_persistent)
+      : m_name (name), m_value (value), m_is_complex (value.iscomplex ()),
+        m_is_formal (is_formal), m_is_global (is_global),
+        m_is_persistent (is_persistent)
     { }
 
     std::string name (void) const { return m_name; }
 
     octave_value value (void) const { return m_value; }
 
-    bool is_automatic (void) const { return m_is_automatic; }
-
     bool is_complex (void) const { return m_is_complex; }
 
     bool is_formal (void) const { return m_is_formal; }
@@ -79,7 +76,6 @@
 
     std::string m_name;
     octave_value m_value;
-    bool m_is_automatic;
     bool m_is_complex;
     bool m_is_formal;
     bool m_is_global;