Skip to content

Use string_get for clarity #352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 7, 2024
Merged

Use string_get for clarity #352

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 14 additions & 41 deletions quickjs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1517,6 +1517,10 @@ static inline int is_digit(int c) {
return c >= '0' && c <= '9';
}

static inline int string_get(const JSString *p, int idx) {
return p->is_wide_char ? p->u.str16[idx] : p->u.str8[idx];
}

static inline BOOL is_be(void)
{
union {
Expand Down Expand Up @@ -2408,10 +2412,7 @@ static inline BOOL is_num_string(uint32_t *pval, const JSString *p)
len = p->len;
if (len == 0 || len > 10)
return FALSE;
if (p->is_wide_char)
c = p->u.str16[0];
else
c = p->u.str8[0];
c = string_get(p, 0);
if (is_num(c)) {
if (c == '0') {
if (len != 1)
Expand All @@ -2420,10 +2421,7 @@ static inline BOOL is_num_string(uint32_t *pval, const JSString *p)
} else {
n = c - '0';
for(i = 1; i < len; i++) {
if (p->is_wide_char)
c = p->u.str16[i];
else
c = p->u.str8[i];
c = string_get(p, i);
if (!is_num(c))
return FALSE;
n64 = (uint64_t)n * 10 + (c - '0');
Expand Down Expand Up @@ -2481,10 +2479,7 @@ static __maybe_unused void JS_DumpString(JSRuntime *rt,
sep = (p->header.ref_count == 1) ? '\"' : '\'';
putchar(sep);
for(i = 0; i < p->len; i++) {
if (p->is_wide_char)
c = p->u.str16[i];
else
c = p->u.str8[i];
c = string_get(p, i);
if (c == sep || c == '\\') {
putchar('\\');
putchar(c);
Expand Down Expand Up @@ -3046,10 +3041,7 @@ static const char *JS_AtomGetStrRT(JSRuntime *rt, char *buf, int buf_size,
return (const char *)str->u.str8;
}
for(i = 0; i < str->len; i++) {
if (str->is_wide_char)
c = str->u.str16[i];
else
c = str->u.str8[i];
c = string_get(str, i);
if ((q - buf) >= buf_size - UTF8_CHAR_LEN_MAX)
break;
if (c < 128) {
Expand Down Expand Up @@ -3676,10 +3668,6 @@ static int string_buffer_putc(StringBuffer *s, uint32_t c)
return string_buffer_putc16(s, c);
}

static int string_get(const JSString *p, int idx) {
return p->is_wide_char ? p->u.str16[idx] : p->u.str8[idx];
}

static int string_getc(const JSString *p, int *pidx)
{
int idx, c, c1;
Expand Down Expand Up @@ -7148,10 +7136,7 @@ static JSValue JS_GetPropertyInternal2(JSContext *ctx, JSValue obj,
uint32_t idx, ch;
idx = __JS_AtomToUInt32(prop);
if (idx < p1->len) {
if (p1->is_wide_char)
ch = p1->u.str16[idx];
else
ch = p1->u.str8[idx];
ch = string_get(p1, idx);
return js_new_string_char(ctx, ch);
}
} else if (prop == JS_ATOM_length) {
Expand Down Expand Up @@ -39127,10 +39112,7 @@ static int js_string_get_own_property(JSContext *ctx,
idx = __JS_AtomToUInt32(prop);
if (idx < p1->len) {
if (desc) {
if (p1->is_wide_char)
ch = p1->u.str16[idx];
else
ch = p1->u.str8[idx];
ch = string_get(p1, idx);
desc->flags = JS_PROP_ENUMERABLE;
desc->value = js_new_string_char(ctx, ch);
desc->getter = JS_UNDEFINED;
Expand Down Expand Up @@ -39285,7 +39267,7 @@ static JSValue js_string_fromCodePoint(JSContext *ctx, JSValue this_val,
} else {
if (JS_ToFloat64(ctx, &d, argv[i]))
goto fail;
if (d < 0 || d > 0x10ffff || (c = (int)d) != d)
if (!(d >= 0 && d <= 0x10ffff) || (c = (int)d) != d)
goto range_error;
}
if (string_buffer_putc(b, c))
Expand Down Expand Up @@ -39387,10 +39369,7 @@ static JSValue js_string_at(JSContext *ctx, JSValue this_val,
if (idx < 0 || idx >= p->len) {
ret = JS_UNDEFINED;
} else {
if (p->is_wide_char)
c = p->u.str16[idx];
else
c = p->u.str8[idx];
c = string_get(p, idx);
ret = js_new_string_char(ctx, c);
}
JS_FreeValue(ctx, val);
Expand All @@ -39415,10 +39394,7 @@ static JSValue js_string_charCodeAt(JSContext *ctx, JSValue this_val,
if (idx < 0 || idx >= p->len) {
ret = JS_NAN;
} else {
if (p->is_wide_char)
c = p->u.str16[idx];
else
c = p->u.str8[idx];
c = string_get(p, idx);
ret = js_int32(c);
}
JS_FreeValue(ctx, val);
Expand All @@ -39443,10 +39419,7 @@ static JSValue js_string_charAt(JSContext *ctx, JSValue this_val,
if (idx < 0 || idx >= p->len) {
ret = js_new_string8(ctx, NULL, 0);
} else {
if (p->is_wide_char)
c = p->u.str16[idx];
else
c = p->u.str8[idx];
c = string_get(p, idx);
ret = js_new_string_char(ctx, c);
}
JS_FreeValue(ctx, val);
Expand Down