diff --git a/pub/lib/opr.cpp b/pub/lib/opr.cpp index fa0b5ea083aa33155d29da73a029c1c066947a98..23d9e2c924f1eec7c5186dc555373cd4923db951 100644 --- a/pub/lib/opr.cpp +++ b/pub/lib/opr.cpp @@ -314,9 +314,8 @@ void NOperate::Integral() fout->V.push_back( sout ); NOlm::mem_store( fout, fiter.k() ); } -// TODO: restore $_ -// if ( !savable ) -// NReg::lastresult = res; +// if ( !savable ) +// NReg::lastresult = res; } } diff --git a/pub/lib/reg.cpp b/pub/lib/reg.cpp index 0244c6987480983624aa1a83d1f70689265957ea..8bca41a80e23fda381c4e04ffe3e6c4cd0b314ab 100644 --- a/pub/lib/reg.cpp +++ b/pub/lib/reg.cpp @@ -14,7 +14,7 @@ //************************************************************************************************** -//* class CRegRef +//* CIdf //************************************************************************************************** //! Constructor. Set from expression string. @@ -25,8 +25,10 @@ CIdf::CIdf( const string s ) throw S("BUG: empty identifier"); } -double NReg::lastresult; +//************************************************************************************************** +//* SRegistry +//************************************************************************************************** PObj SRegistry::find( string key ) const { diff --git a/pub/lib/reg.hpp b/pub/lib/reg.hpp index 08822fa6e45f70df3cc9c5771bd0f5a9280431f3..24e3b12d06bf77b55e5bef62b1e275ca3d70634a 100644 --- a/pub/lib/reg.hpp +++ b/pub/lib/reg.hpp @@ -1,7 +1,7 @@ //************************************************************************************************** -//* FRIDA: fast reliable interactive data analysis -//* (C) Joachim Wuttke 1990-, v2(C++) 2001- -//* http://apps.jcns.fz-juelich.de/frida +//* FRIDA: fast reliable interactive data analysis +//* (C) Joachim Wuttke 1990-, v2(C++) 2001- +//* http://apps.jcns.fz-juelich.de/frida //************************************************************************************************** //! \file reg.hpp @@ -18,13 +18,6 @@ class CIdf { CIdf( const string s ); }; -//! Direct access to registers ($-variables). - -namespace NReg { - extern double lastresult; -} - - //! The registry. class SRegistry { @@ -42,10 +35,10 @@ public: PObj find( string key ) const; PObj find_or_fail( string key ) const; - - + + void display_functions() const; - + void register_scalar( string key, PObj val ); bool undef( string key ); };