Mercurial > octave
diff src/symtab.cc @ 5780:cbf717bf8150
[project @ 2006-04-27 20:02:30 by jwe]
author | jwe |
---|---|
date | Thu, 27 Apr 2006 20:03:48 +0000 |
parents | ace8d8d26933 |
children | 1138ced03f14 |
line wrap: on
line diff
--- a/src/symtab.cc Thu Apr 27 19:30:14 2006 +0000 +++ b/src/symtab.cc Thu Apr 27 20:03:48 2006 +0000 @@ -82,8 +82,6 @@ retval = "built-in mapper function"; else if (is_user_function ()) retval = "user-defined function"; - else if (is_builtin_constant ()) - retval = "built-in constant"; else if (is_builtin_variable ()) retval = "built-in variable"; else if (is_builtin_function ()) @@ -132,9 +130,7 @@ defn->accept (tpc); } } - else if (is_user_variable () - || is_builtin_variable () - || is_builtin_constant ()) + else if (is_user_variable () || is_builtin_variable ()) { if (pr_type_info && ! quiet) os << name << " is a " << type_as_string () << "\n"; @@ -228,21 +224,6 @@ } bool -symbol_record::define_builtin_const (const octave_value& v) -{ - bool retval = false; - - if (! read_only_error ("redefine")) - { - definition->define (v, symbol_record::BUILTIN_CONSTANT); - - retval = true; - } - - return retval; -} - -bool symbol_record::define (octave_function *f, unsigned int sym_type) { bool retval = false; @@ -368,7 +349,7 @@ } } - if (is_function () || is_constant ()) + if (is_function ()) clear (); if (! is_defined ()) @@ -680,7 +661,7 @@ { if (is_read_only ()) { - if (is_variable () || is_constant ()) + if (is_variable ()) ::error ("can't %s read-only constant `%s'", action, nm.c_str ()); else if (is_function ()) ::error ("can't %s read-only function `%s'", action, nm.c_str ());