Changeset 10449

Timestamp:

04/21/11 21:39:52 (14 years ago)

Author:

tbretz

Message:

Added Print member function; fixed interpretation of hex and oct values

Location:

trunk/FACT++/src

Files:

• Converter.cc (modified) (2 diffs)
• Converter.h (modified) (1 diff)

trunk/FACT++/src/Converter.cc

@@ -220 +220 @@
 
         if (line.peek()=='x')
+        {
+            line >> c;
             line >> hex;
+        }
         else
             line >> oct;
 
+    }
+    else
+    {
         line.unget();
-    }
-
-    line.unget();
+        line >> dec;
+    }
+
 
     T val;
@@ -904 +910 @@
 
 
-
-
-
-
-
-
+void Converter::Print(std::ostream &out) const
+{
+    for (FormatList::const_iterator i=fList.begin(); i!=fList.end(); i++)
+    {
+        out << "Type=" << i->first.first->name() << "[" << i->first.second << "]  ";
+        out << "N=" << i->second.first << "  ";
+        out << "offset=" << i->second.second << endl;
+    }
+}
+
+void Converter::Print() const
+{
+    return Print(cout);
+}
+
+
+
+
+
+
+

trunk/FACT++/src/Converter.h

@@ -132 +132 @@
     }
 
+    void Print(std::ostream &out) const;
+    void Print() const;
+
     static std::vector<std::string> Regex(const std::string &expr, const std::string &line);
 };