Rename Value_Obj to ValueObj

Author: mgreter

src/ast_values.cpp

@@ -894,12 +894,12 @@ namespace Sass {
   /////////////////////////////////////////////////////////////////////////
 
   String_Schema::String_Schema(ParserState pstate, size_t size, bool css)
-  : String(pstate), Vectorized<PreValue_Obj>(size), css_(css), hash_(0)
+  : String(pstate), Vectorized<PreValueObj>(size), css_(css), hash_(0)
   { concrete_type(STRING); }
 
   String_Schema::String_Schema(const String_Schema* ptr)
   : String(ptr),
-    Vectorized<PreValue_Obj>(*ptr),
+    Vectorized<PreValueObj>(*ptr),
     css_(ptr->css_),
     hash_(ptr->hash_)
   { concrete_type(STRING); }

src/ast_values.hpp

@@ -389,7 +389,7 @@ namespace Sass {
   // Interpolated strings. Meant to be reduced to flat strings during the
   // evaluation phase.
   ///////////////////////////////////////////////////////////////////////
-  class String_Schema final : public String, public Vectorized<PreValue_Obj> {
+  class String_Schema final : public String, public Vectorized<PreValueObj> {
     ADD_PROPERTY(bool, css)
     mutable size_t hash_;
   public:

src/eval.cpp

@@ -775,8 +775,8 @@ namespace Sass {
       }
 
       To_Value to_value(ctx);
-      Value_Obj v_l = Cast<Value>(lhs->perform(&to_value));
-      Value_Obj v_r = Cast<Value>(rhs->perform(&to_value));
+      ValueObj v_l = Cast<Value>(lhs->perform(&to_value));
+      ValueObj v_r = Cast<Value>(rhs->perform(&to_value));
 
       if (force_delay) {
         sass::string str("");
@@ -841,8 +841,8 @@ namespace Sass {
       else {
         To_Value to_value(ctx);
         // this will leak if perform does not return a value!
-        Value_Obj v_l = Cast<Value>(lhs->perform(&to_value));
-        Value_Obj v_r = Cast<Value>(rhs->perform(&to_value));
+        ValueObj v_l = Cast<Value>(lhs->perform(&to_value));
+        ValueObj v_r = Cast<Value>(rhs->perform(&to_value));
         bool interpolant = b->is_right_interpolant() ||
                            b->is_left_interpolant() ||
                            b->is_interpolant();

src/fn_lists.cpp

@@ -92,7 +92,7 @@ namespace Sass {
         return l.detach();
       }
       else {
-        Value_Obj rv = l->value_at_index(static_cast<int>(index));
+        ValueObj rv = l->value_at_index(static_cast<int>(index));
         rv->set_delayed(false);
         return rv.detach();
       }
@@ -275,7 +275,7 @@ namespace Sass {
     Signature is_bracketed_sig = "is-bracketed($list)";
     BUILT_IN(is_bracketed)
     {
-      Value_Obj value = ARG("$list", Value);
+      ValueObj value = ARG("$list", Value);
       List_Obj list = Cast<List>(value);
       return SASS_MEMORY_NEW(Boolean, pstate, list && list->is_bracketed());
     }

src/fn_maps.cpp

@@ -18,7 +18,7 @@ namespace Sass {
       Map_Obj m = ARGM("$map", Map);
       ExpressionObj v = ARG("$key", Expression);
       try {
-        Value_Obj val = m->at(v);
+        ValueObj val = m->at(v);
         if (!val) return SASS_MEMORY_NEW(Null, pstate);
         val->set_delayed(false);
         return val.detach();

src/fn_miscs.cpp

@@ -160,7 +160,7 @@ namespace Sass {
       ExpressionObj cond = ARG("$condition", Expression)->perform(&expand.eval);
       bool is_true = !cond->is_false();
       ExpressionObj res = ARG(is_true ? "$if-true" : "$if-false", Expression);
-      Value_Obj qwe = Cast<Value>(res->perform(&expand.eval));
+      ValueObj qwe = Cast<Value>(res->perform(&expand.eval));
       // res = res->perform(&expand.eval.val_eval);
       qwe->set_delayed(false); // clone?
       return qwe.detach();

src/parser.cpp

@@ -1663,7 +1663,7 @@ namespace Sass {
     return schema.detach();
   }
 
-  Value_Obj Parser::parse_static_value()
+  ValueObj Parser::parse_static_value()
   {
     lex< static_value >();
     Token str(lexed);

src/parser.hpp

@@ -294,7 +294,7 @@ namespace Sass {
     String_Obj parse_url_function_argument();
     String_Obj parse_interpolated_chunk(Token, bool constant = false, bool css = true);
     String_Obj parse_string();
-    Value_Obj parse_static_value();
+    ValueObj parse_static_value();
     String_Schema_Obj parse_css_variable_value();
     String_Obj parse_ie_property();
     String_Obj parse_ie_keyword_arg();

src/sass_values.cpp

@@ -283,7 +283,7 @@ extern "C" {
 
   union Sass_Value* ADDCALL sass_value_stringify (const union Sass_Value* v, bool compressed, int precision)
   {
-    Value_Obj val = sass_value_to_ast_node(v);
+    ValueObj val = sass_value_to_ast_node(v);
     Sass_Inspect_Options options(compressed ? COMPRESSED : NESTED, precision);
     sass::string str(val->to_string(options));
     return sass_make_qstring(str.c_str());
@@ -292,12 +292,12 @@ extern "C" {
   union Sass_Value* ADDCALL sass_value_op (enum Sass_OP op, const union Sass_Value* a, const union Sass_Value* b)
   {
 
-    Sass::Value_Obj rv;
+    Sass::ValueObj rv;
 
     try {
 
-      Value_Obj lhs = sass_value_to_ast_node(a);
-      Value_Obj rhs = sass_value_to_ast_node(b);
+      ValueObj lhs = sass_value_to_ast_node(a);
+      ValueObj rhs = sass_value_to_ast_node(b);
       struct Sass_Inspect_Options options(NESTED, 5);
 
       // see if it's a relational expression