From c2ae10979b8edc7adfecd1b417beaa86d2d9d10c Mon Sep 17 00:00:00 2001
From: louis <louis@rubet.fr>
Date: Sun, 1 Mar 2015 23:37:27 +0100
Subject: [PATCH] Correct merge pb

---
 src/rpn.cpp | 50 --------------------------------------------------
 1 file changed, 50 deletions(-)

diff --git a/src/rpn.cpp b/src/rpn.cpp
index 7573d42..8ff6152 100644
--- a/src/rpn.cpp
+++ b/src/rpn.cpp
@@ -346,56 +346,6 @@ void object::show(ostream& stream)
     }
 }
 
-void object::show(ostream& stream)
-{
-    switch(_type)
-    {
-    case cmd_number:
-        stream << ((number*)this)->_value;
-        break;
-    case cmd_binary:
-        {
-            cout << "# ";
-            switch(((binary*)this)->s_mode)
-            {
-                case binary::dec: cout<<std::right<<std::setw(8)<<std::dec<<((binary*)this)->_value<<" d"; break;
-                case binary::hex: cout<<std::right<<std::setw(16)<<std::hex<<((binary*)this)->_value<<" h"; break;
-                case binary::oct: cout<<std::right<<std::setw(16)<<std::oct<<((binary*)this)->_value<<" o"; break;
-                case binary::bin:
-                {
-                    string mybin;
-                    for (int i = (int)(log((floating_t)((binary*)this)->_value) / log(2.)); i>=0; i--)
-                    {
-                        if (((binary*)this)->_value & (1 << i))
-                            mybin+='1';
-                        else
-                            mybin+='0';
-                    }
-                    cout<<std::right<<std::setw(20)<<std::oct<<mybin<<" b";
-                }
-                break;
-            }
-        }
-        break;
-    case cmd_string:
-        stream << "\"" << *((ostring*)this)->_value << "\"";
-        break;
-    case cmd_program:
-        stream << "<< " << *((oprogram*)this)->_value << " >>";
-        break;
-    case cmd_symbol:
-        stream << "'" << *((symbol*)this)->_value << "'";
-        break;
-    case cmd_keyword:
-    case cmd_branch:
-        stream << *((keyword*)this)->_value;
-        break;
-    default:
-        stream << "< unknown object representation >";
-        break;
-    }
-}
-
 struct if_layout_t
 {
     if_layout_t():index_then(-1),index_else(-1),index_end(-1) { }