Skip to content

Commit

Permalink
util, refactor: simplifying function calls with parameter defaults in…
Browse files Browse the repository at this point in the history 
… inspect.
  • Loading branch information
@xicilion
xicilion committed Oct 13, 2023
1 parent f6fbe99 commit 2fab566
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 18 deletions.
8 changes: 4 additions & 4 deletions fibjs/src/test/assert.cpp
View file
Expand Up @@ -106,19 +106,19 @@ class _msg {
str = strs[0];

if (strs[1]) {
str.append(json_format(*vs[0], false, DEFAULT_DEPTH, DEFAULT_MAX_ARRAY_LENGTH, DEFAULT_MAX_STRING_LENGTH));
str.append(json_format(*vs[0]));
str.append(strs[1]);

if (strs[2]) {
str.append(json_format(*vs[1], false, DEFAULT_DEPTH, DEFAULT_MAX_ARRAY_LENGTH, DEFAULT_MAX_STRING_LENGTH));
str.append(json_format(*vs[1]));
str.append(strs[2]);

if (strs[3]) {
str.append(json_format(*vs[2], false, DEFAULT_DEPTH, DEFAULT_MAX_ARRAY_LENGTH, DEFAULT_MAX_STRING_LENGTH));
str.append(json_format(*vs[2]));
str.append(strs[3]);

if (strs[4]) {
str.append(json_format(*vs[3], false, DEFAULT_DEPTH, DEFAULT_MAX_ARRAY_LENGTH, DEFAULT_MAX_STRING_LENGTH));
str.append(json_format(*vs[3]));
str.append(strs[4]);
}
}
Expand Down
8 changes: 6 additions & 2 deletions fibjs/src/util/util.h
View file
Expand Up @@ -26,8 +26,12 @@ namespace fibjs {
#define DEFAULT_MAX_ARRAY_LENGTH 100
#define DEFAULT_MAX_STRING_LENGTH 10000

void string_format(StringBuffer& strBuffer, v8::Local<v8::Value> v, bool color, int32_t maxStringLength);
exlib::string json_format(v8::Local<v8::Value> obj, bool color, int32_t depth, int32_t maxArrayLength, int32_t maxStringLength);
void string_format(StringBuffer& strBuffer, v8::Local<v8::Value> v, bool color = false,
int32_t maxStringLength = DEFAULT_MAX_STRING_LENGTH);
exlib::string json_format(v8::Local<v8::Value> obj, bool color = false, int32_t depth = DEFAULT_DEPTH,
int32_t maxArrayLength = DEFAULT_MAX_ARRAY_LENGTH, int32_t maxStringLength = DEFAULT_MAX_STRING_LENGTH);

exlib::string table_format(v8::Local<v8::Value> obj, v8::Local<v8::Array> fields, bool color, bool encode_string);
result_t util_format(exlib::string fmt, OptArgs args, bool color, exlib::string& retVal);

}
8 changes: 4 additions & 4 deletions fibjs/src/util/util_format.cpp
View file
Expand Up @@ -395,7 +395,7 @@ exlib::string json_format(v8::Local<v8::Value> obj, bool color, int32_t depth, i

if (!it->obj.IsEmpty()) {
TryCatch try_catch;
string_format(strBuffer, v, false, DEFAULT_MAX_STRING_LENGTH);
string_format(strBuffer, v);

if (it->obj->IsMap()) {
strBuffer.append(" => ");
Expand Down Expand Up @@ -456,7 +456,7 @@ result_t util_format(exlib::string fmt, OptArgs args, bool color, exlib::string&
v8::Local<v8::Value> v = v8::Number::New(isolate->m_isolate, (int32_t)n);

exlib::string s;
s = json_format(v, color, DEFAULT_DEPTH, DEFAULT_MAX_ARRAY_LENGTH, DEFAULT_MAX_STRING_LENGTH);
s = json_format(v, color);
retVal.append(s);
}
} else
Expand All @@ -465,7 +465,7 @@ result_t util_format(exlib::string fmt, OptArgs args, bool color, exlib::string&
case 'j':
if (idx < argc) {
exlib::string s;
s = json_format(args[idx++], color, DEFAULT_DEPTH, DEFAULT_MAX_ARRAY_LENGTH, DEFAULT_MAX_STRING_LENGTH);
s = json_format(args[idx++], color);
retVal.append(s);
} else
retVal.append("%j", 2);
Expand Down Expand Up @@ -493,7 +493,7 @@ result_t util_format(exlib::string fmt, OptArgs args, bool color, exlib::string&
retVal.append(isolate->toString(v));
else {
exlib::string s;
s = json_format(v, color, DEFAULT_DEPTH, DEFAULT_MAX_ARRAY_LENGTH, DEFAULT_MAX_STRING_LENGTH);
s = json_format(v, color);

retVal.append(s);
}
Expand Down
16 changes: 8 additions & 8 deletions fibjs/src/util/util_format_table.cpp
View file
Expand Up @@ -186,7 +186,7 @@ inline void append_value(exlib::string& str, int32_t width, int32_t max_width, S
exlib::string object_format(v8::Local<v8::Value> v, bool color, bool l2 = false)
{
if (IsJSBuffer(v))
return json_format(v, color, DEFAULT_DEPTH, DEFAULT_MAX_ARRAY_LENGTH, DEFAULT_MAX_STRING_LENGTH);
return json_format(v, color);

Isolate* isolate = Isolate::current();
v8::Local<v8::Context> _context = isolate->context();
Expand Down Expand Up @@ -227,7 +227,7 @@ exlib::string object_format(v8::Local<v8::Value> v, bool color, bool l2 = false)

JSValue v = array->Get(_context, i);
if (isSimpleValue(v))
buf.append(json_format(v, color, DEFAULT_DEPTH, DEFAULT_MAX_ARRAY_LENGTH, DEFAULT_MAX_STRING_LENGTH));
buf.append(json_format(v, color));
else
buf.append(object_format(v, color, true));
}
Expand Down Expand Up @@ -263,7 +263,7 @@ exlib::string object_format(v8::Local<v8::Value> v, bool color, bool l2 = false)
buf.append(", ");

JSValue v = array->Get(_context, i);
buf.append(json_format(v, color, DEFAULT_DEPTH, DEFAULT_MAX_ARRAY_LENGTH, DEFAULT_MAX_STRING_LENGTH));
buf.append(json_format(v, color));
}

if (len == len1 + 1)
Expand Down Expand Up @@ -293,13 +293,13 @@ exlib::string object_format(v8::Local<v8::Value> v, bool color, bool l2 = false)
buf.append(", ");

JSValue v = keys->Get(_context, i);
string_format(buf, v, false, DEFAULT_MAX_STRING_LENGTH);
string_format(buf, v);

buf.append(": ");

v = obj->Get(_context, v);
if (isSimpleValue(v))
buf.append(json_format(v, color, DEFAULT_DEPTH, DEFAULT_MAX_ARRAY_LENGTH, DEFAULT_MAX_STRING_LENGTH));
buf.append(json_format(v, color));
else
buf.append(object_format(v, color, true));
}
Expand All @@ -311,7 +311,7 @@ exlib::string object_format(v8::Local<v8::Value> v, bool color, bool l2 = false)
exlib::string table_format(v8::Local<v8::Value> obj, v8::Local<v8::Array> fields, bool color, bool encode_string)
{
if (isSimpleValue(obj))
return json_format(obj, color, DEFAULT_DEPTH, DEFAULT_MAX_ARRAY_LENGTH, DEFAULT_MAX_STRING_LENGTH);
return json_format(obj, color);

v8::Local<v8::Object> o = v8::Local<v8::Object>::Cast(obj);

Expand Down Expand Up @@ -360,7 +360,7 @@ exlib::string table_format(v8::Local<v8::Value> obj, v8::Local<v8::Array> fields
GetArgumentValue(isolate, v, val);
value_cols.append(val);
} else
value_cols.append(json_format(v, color, DEFAULT_DEPTH, DEFAULT_MAX_ARRAY_LENGTH, DEFAULT_MAX_STRING_LENGTH));
value_cols.append(json_format(v, color));
}
} else {
v8::Local<v8::Object> ro = v8::Local<v8::Object>::Cast(v);
Expand All @@ -386,7 +386,7 @@ exlib::string table_format(v8::Local<v8::Value> obj, v8::Local<v8::Array> fields
if (!encode_string && (rv->IsString() || rv->IsStringObject()))
GetArgumentValue(isolate, rv, row_value);
else
row_value = json_format(rv, color, DEFAULT_DEPTH, DEFAULT_MAX_ARRAY_LENGTH, DEFAULT_MAX_STRING_LENGTH);
row_value = json_format(rv, color);
} else
row_value = object_format(rv, color);

Expand Down

0 comments on commit 2fab566

Please sign in to comment.