Put brackets around ipv6 addresses in `inet6 present`

[factor.git] / vm / tagged.hpp

diff --git a/vm/tagged.hpp b/vm/tagged.hpp
old mode 100755 (executable)
new mode 100644 (file)
index ca20855..0af2130
--- a/vm/tagged.hpp
+++ b/vm/tagged.hpp
@@ -1,13 +1,58 @@
-namespace factor
-{
+namespace factor {
 
-template <typename TYPE> cell tag(TYPE *value)
-{
-       return RETAG(value,tag_for(TYPE::type_number));
+template <typename Type> cell tag(Type* value) {
+  return RETAG(value, Type::type_number);
 }
 
-inline static cell tag_dynamic(object *value)
-{
-       return RETAG(value,tag_for(value->h.hi_tag()));
+inline static cell tag_dynamic(object* value) {
+  return RETAG(value, value->type());
 }
+
+template <typename Type> struct tagged {
+  cell value_;
+
+  cell type() const { return TAG(value_); }
+
+  bool type_p() const {
+    if (Type::type_number == TYPE_COUNT)
+      return true;
+    return type() == Type::type_number;
+  }
+
+  cell value() const {
+    FACTOR_ASSERT(type_p());
+    return value_;
+  }
+
+  Type* untagged() const {
+    FACTOR_ASSERT(type_p());
+    return (Type*)(UNTAG(value_));
+  }
+
+  explicit tagged(cell tagged) : value_(tagged) {}
+  explicit tagged(Type* untagged) : value_(factor::tag(untagged)) {}
+
+  void set_value(const cell ptr) {
+    value_ = ptr;
+  }
+
+  void set_untagged(const Type *untagged) {
+    set_value(tag(untagged));
+  }
+
+  Type* operator->() const { return untagged(); }
+  cell* operator&() const { return &value(); }
+
+  bool operator==(const tagged<Type>& x) { return value_ == x.value_; }
+  bool operator!=(const tagged<Type>& x) { return value_ != x.value_; }
+
+  template <typename NewType> tagged<NewType> as() {
+    return tagged<NewType>(value_);
+  }
+};
+
+template <typename Type> Type* untag(cell value) {
+  return tagged<Type>(value).untagged();
+}
+
 }