# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1366145800 14400
# Node ID 8701792e16ecbd2c12dc2895c48373ee74672346
# Parent  01541f7321f78fe67870c28972c72607324d70ce
include column in workspace viewer for storage class

* workspace-model.cc (workspace_model::workspace_model): New column in
for storage class.
(workspace_model::data): Set values for storage class column.
(symbol_table::do_workspace_info): Also insert a tag in storage for
automatic, formal, hidden, and inherited storage classes.

diff -r 01541f7321f7 -r 8701792e16ec libgui/src/workspace-model.cc
--- a/libgui/src/workspace-model.cc	Tue Apr 16 16:12:18 2013 -0400
+++ b/libgui/src/workspace-model.cc	Tue Apr 16 16:56:40 2013 -0400
@@ -38,6 +38,7 @@
   _columnNames.append (tr ("Class"));
   _columnNames.append (tr ("Dimension"));
   _columnNames.append (tr ("Value"));
+  _columnNames.append (tr ("Storage Class"));
 }
 
 int
@@ -109,6 +110,24 @@
           retval = QVariant (_values[idx.row()]);
           break;
 
+        case 4:
+          {
+            QChar c = _scopes[idx.row()];
+
+            if (c == 'g')
+              retval = QVariant (tr ("global"));
+            else if (c == 'p')
+              retval = QVariant (tr ("persistent"));
+            else if (c == 'a')
+              retval = QVariant (tr ("automatic"));
+            else if (c == 'f')
+              retval = QVariant (tr ("function parameter"));
+            else if (c == 'h')
+              retval = QVariant (tr ("hidden"));
+            else if (c == 'i')
+              retval = QVariant (tr ("inherited"));
+          }
+
         default:
           break;
         }
diff -r 01541f7321f7 -r 8701792e16ec libinterp/interpfcn/symtab.cc
--- a/libinterp/interpfcn/symtab.cc	Tue Apr 16 16:12:18 2013 -0400
+++ b/libinterp/interpfcn/symtab.cc	Tue Apr 16 16:56:40 2013 -0400
@@ -1403,6 +1403,14 @@
                 storage = 'g';
               else if (sr.is_persistent ())
                 storage = 'p';
+              else if (sr.is_automatic ())
+                storage = 'a';
+              else if (sr.is_formal ())
+                storage = 'f';
+              else if (sr.is_hidden ())
+                storage = 'h';
+              else if (sr.is_inherited ())
+                storage = 'i';
 
               workspace_element elt (storage, nm, val.class_name (),
                                      val.short_disp (), dv.str ());