From 4b1acd6273d494a08c414a0d60c3a639310872d6 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (l)" <j.wuttke@fz-juelich.de>
Date: Wed, 11 Nov 2015 09:24:11 +0100
Subject: [PATCH] rm unused NReg, lastresult
---
pub/lib/opr.cpp | 5 ++---
pub/lib/reg.cpp | 6 ++++--
pub/lib/reg.hpp | 19 ++++++-------------
3 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/pub/lib/opr.cpp b/pub/lib/opr.cpp
index fa0b5ea0..23d9e2c9 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 0244c698..8bca41a8 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 08822fa6..24e3b12d 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 );
};
--
GitLab