audio.engine.test: cleanup using

[factor.git] / vm / tagged.hpp

diff --git a/vm/tagged.hpp b/vm/tagged.hpp
old mode 100755 (executable)
new mode 100644 (file)
index 02fcdee..0af2130
--- a/vm/tagged.hpp
+++ b/vm/tagged.hpp
@@ -1,83 +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_;
+template <typename Type> struct tagged {
+  cell value_;
 
-       cell value() const { return value_; }
-       Type *untagged() const { return (Type *)(UNTAG(value_)); }
+  cell type() const { return TAG(value_); }
 
-       cell type() const {
-               cell tag = TAG(value_);
-               if(tag == OBJECT_TYPE)
-                       return untagged()->h.hi_tag();
-               else
-                       return tag;
-       }
+  bool type_p() const {
+    if (Type::type_number == TYPE_COUNT)
+      return true;
+    return type() == Type::type_number;
+  }
 
-       bool type_p(cell type_) const
-       {
-               return type() == type_;
-       }
+  cell value() const {
+    FACTOR_ASSERT(type_p());
+    return value_;
+  }
 
-       bool type_p() const
-       {
-               if(Type::type_number == TYPE_COUNT)
-                       return true;
-               else
-                       return type_p(Type::type_number);
-       }
+  Type* untagged() const {
+    FACTOR_ASSERT(type_p());
+    return (Type*)(UNTAG(value_));
+  }
 
-       Type *untag_check(factor_vm *parent) const {
-               if(!type_p())
-                       parent->type_error(Type::type_number,value_);
-               return untagged();
-       }
+  explicit tagged(cell tagged) : value_(tagged) {}
+  explicit tagged(Type* untagged) : value_(factor::tag(untagged)) {}
 
-       explicit tagged(cell tagged) : value_(tagged) {
-#ifdef FACTOR_DEBUG
-               assert(type_p());
-#endif
-       }
+  void set_value(const cell ptr) {
+    value_ = ptr;
+  }
 
-       explicit tagged(Type *untagged) : value_(factor::tag(untagged)) {
-#ifdef FACTOR_DEBUG
-               assert(type_p());
-#endif
-       }
+  void set_untagged(const Type *untagged) {
+    set_value(tag(untagged));
+  }
 
-       Type *operator->() const { return untagged(); }
-       cell *operator&() const { return &value_; }
+  Type* operator->() const { return untagged(); }
+  cell* operator&() const { return &value(); }
 
-       const tagged<Type> &operator=(const Type *x) { value_ = tag(x); return *this; }
-       const tagged<Type> &operator=(const cell &x) { value_ = x; return *this; }
+  bool operator==(const tagged<Type>& x) { return value_ == x.value_; }
+  bool operator!=(const tagged<Type>& x) { return value_ != x.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 NewType> tagged<NewType> as() {
+    return tagged<NewType>(value_);
+  }
 };
 
-template<typename Type> Type *factor_vm::untag_check(cell value)
-{
-       return tagged<Type>(value).untag_check(this);
-}
-
-template<typename Type> Type *factor_vm::untag(cell value)
-{
-       return tagged<Type>(value).untagged();
+template <typename Type> Type* untag(cell value) {
+  return tagged<Type>(value).untagged();
 }
 
 }