Avoid use of static attribute in functions

[anna.git] / source / core / functions.cpp

diff --git a/source/core/functions.cpp b/source/core/functions.cpp
index 14ba7fc..1dd3025 100644 (file)
--- a/source/core/functions.cpp
+++ b/source/core/functions.cpp
@@ -37,9 +37,6 @@ using namespace std;
 
 #define PAGE_WIDTH_LENGTH      80
 
-ExclusiveHash <std::string> functions::st_stringExclusiveHash;
-ExclusiveHash <std::string, int> functions::st_string2intExclusiveHash;
-
 string functions::getVersion() throw() {
   static const int version = ANNA_VERSION;
   string result;
@@ -91,21 +88,15 @@ throw() {
   return string(aux);
 }
 
-string functions::asString(const unsigned long number)
-throw() {
-  return asString((U64)number);
-}
-
 string functions::asString(const S64 number)
 throw() {
   char aux [24];
-  sprintf(aux, "%lld", number);
-  /*#ifdef __anna64__
+  //sprintf(aux, "%lld", number);
+  #ifdef __anna64__
      sprintf (aux, "%ld", number);
   #else
      sprintf (aux, "%lld", number);
   #endif
-  */
   return string(aux);
 }
 
@@ -119,14 +110,12 @@ throw() {
 string functions::asString(const U64 number)
 throw() {
   char aux [16];
-  sprintf(aux, "%llu", number);
-  /*
+  //sprintf(aux, "%llu", number);
   #ifdef __anna64__
      sprintf (aux, "%lu", number);
   #else
      sprintf (aux, "%llu", number);
   #endif
-  */
   return string(aux);
 }
 
@@ -173,22 +162,15 @@ throw() {
   return string(aux);
 }
 
-string functions::asHexString(const long number)
-throw() {
-  return asHexString((S64)number);
-}
-
 string functions::asHexString(const S64 number)
 throw() {
   char aux [32];
-  sprintf(aux, "0x%llx", number);
-  /*
+  //sprintf(aux, "0x%llx", number);
   #ifdef __anna64__
      sprintf (aux, "0x%lx", number);
   #else
      sprintf (aux, "0x%llx", number);
   #endif
-  */
   return string(aux);
 }
 
@@ -320,14 +302,12 @@ throw(RuntimeException) {
 S64 functions::asInteger64(const char* str)
 throw() {
   S64 number = 0;
-  sscanf(str, "%lld", &number);
-  /*
+  //sscanf(str, "%lld", &number);
   #ifdef __anna64__
     sscanf (str, "%ld", &number);
   #else
      sscanf (str, "%lld", &number);
   #endif
-  */
   return number;
 }
 
@@ -426,8 +406,8 @@ throw() {
   int r = -1;     // r will be lg(v)
   unsigned int t, tt; // temporaries
 
-  if(tt = v >> 16) {
-    r = (t = tt >> 8) ? 24 + LogTable256[t] : 16 + LogTable256[tt];
+  if((tt = v >> 16)) {
+    r = ((t = tt >> 8)) ? 24 + LogTable256[t] : 16 + LogTable256[tt];
   } else {
     r = (t = v >> 8) ? 8 + LogTable256[t] : LogTable256[v];
   }