libcore|NumberValue: Added a semantic hint for hexadecimal values

skyjake · May 30, 2014 · 7e22ce6 · 7e22ce6
1 parent 6054bb0
commit 7e22ce6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/doomsday/libcore/include/de/data/numbervalue.h b/doomsday/libcore/include/de/data/numbervalue.h
@@ -48,15 +48,16 @@ class DENG2_PUBLIC NumberValue : public Value
 
     enum SemanticHint {
         Boolean = 0x1,      ///< The number is intended to be a boolean value.
+        Hex = 0x2,          ///< The number is intended to be a hexadecimal value.
         Generic = 0         ///< Generic number.
     };
     Q_DECLARE_FLAGS(SemanticHints, SemanticHint)
 
 public:
     NumberValue(Number initialValue = 0, SemanticHints semantic = Generic);
     NumberValue(dsize initialSize);
-    NumberValue(dint initialInteger);
-    NumberValue(duint initialUnsignedInteger);
+    NumberValue(dint initialInteger, SemanticHints semantic = Generic);
+    NumberValue(duint initialUnsignedInteger, SemanticHints semantic = Generic);
     NumberValue(bool initialBoolean);
 
     /**

diff --git a/doomsday/libcore/src/data/numbervalue.cpp b/doomsday/libcore/src/data/numbervalue.cpp
@@ -34,12 +34,12 @@ NumberValue::NumberValue(dsize initialSize)
     : _value(initialSize), _semantic(Generic)
 {}
 
-NumberValue::NumberValue(dint initialInteger)
-    : _value(initialInteger), _semantic(Generic)
+NumberValue::NumberValue(dint initialInteger, SemanticHints semantic)
+    : _value(initialInteger), _semantic(semantic)
 {}
 
-NumberValue::NumberValue(duint initialUnsignedInteger)
-    : _value(initialUnsignedInteger), _semantic(Generic)
+NumberValue::NumberValue(duint initialUnsignedInteger, SemanticHints semantic)
+    : _value(initialUnsignedInteger), _semantic(semantic)
 {}
 
 NumberValue::NumberValue(bool initialBoolean)
@@ -64,6 +64,10 @@ Value::Text NumberValue::asText() const
     {
         s << (isTrue()? "True" : "False");
     }
+    else if(_semantic.testFlag(Hex))
+    {
+        s << "0x" << QString::number(int(_value), 16);
+    }
     else
     {
         s << _value;

diff --git a/doomsday/libdoomsday/src/defs/dedparser.cpp b/doomsday/libdoomsday/src/defs/dedparser.cpp
@@ -635,7 +635,7 @@ DENG2_PIMPL(DEDParser)
         int value = 0;
         if(ReadFlags(&value, prefix))
         {
-            dest->set(NumberValue(value));
+            dest->set(NumberValue(value, NumberValue::Hex));
             return true;
         }
         return false;