Skip to content

Commit 0608222

Browse files
abnerabner
committed
updated quickjs engine to version 2020-09-06
1 parent 0d42c5c commit 0608222

File tree

15 files changed

+667
-439
lines changed

15 files changed

+667
-439
lines changed

‎quickjs/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ add_library( fastdev_quickjs_runtime
1717
src/main/c/quickjs/libregexp.c
1818
src/main/c/quickjs/libunicode.c
1919
src/main/c/quickjs/quickjs.c
20-
)
20+
)
2121

22-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DCONFIG_VERSION=\\\"2020-07-05\\\"")
22+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DCONFIG_VERSION=\\\"2020-09-06\\\"")
2323

2424
find_library(log-lib log)
2525
target_link_libraries(fastdev_quickjs_runtime ${log-lib})

‎quickjs/src/main/c/quickjs/cutils.c‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -258,19 +258,30 @@ int unicode_from_utf8(const uint8_t *p, int max_len, const uint8_t **pp)
258258
return c;
259259
}
260260
switch(c) {
261-
case 0xc0 ... 0xdf:
261+
case 0xc0: case 0xc1: case 0xc2: case 0xc3:
262+
case 0xc4: case 0xc5: case 0xc6: case 0xc7:
263+
case 0xc8: case 0xc9: case 0xca: case 0xcb:
264+
case 0xcc: case 0xcd: case 0xce: case 0xcf:
265+
case 0xd0: case 0xd1: case 0xd2: case 0xd3:
266+
case 0xd4: case 0xd5: case 0xd6: case 0xd7:
267+
case 0xd8: case 0xd9: case 0xda: case 0xdb:
268+
case 0xdc: case 0xdd: case 0xde: case 0xdf:
262269
l = 1;
263270
break;
264-
case 0xe0 ... 0xef:
271+
case 0xe0: case 0xe1: case 0xe2: case 0xe3:
272+
case 0xe4: case 0xe5: case 0xe6: case 0xe7:
273+
case 0xe8: case 0xe9: case 0xea: case 0xeb:
274+
case 0xec: case 0xed: case 0xee: case 0xef:
265275
l = 2;
266276
break;
267-
case 0xf0 ... 0xf7:
277+
case 0xf0: case 0xf1: case 0xf2: case 0xf3:
278+
case 0xf4: case 0xf5: case 0xf6: case 0xf7:
268279
l = 3;
269280
break;
270-
case 0xf8 ... 0xfb:
281+
case 0xf8: case 0xf9: case 0xfa: case 0xfb:
271282
l = 4;
272283
break;
273-
case 0xfc ... 0xfd:
284+
case 0xfc: case 0xfd:
274285
l = 5;
275286
break;
276287
default:
@@ -617,4 +628,4 @@ void rqsort(void *base, size_t nmemb, size_t size, cmp_f cmp, void *opaque)
617628
}
618629
}
619630

620-
#endif
631+
#endif

‎quickjs/src/main/c/quickjs/cutils.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,4 +294,4 @@ void rqsort(void *base, size_t nmemb, size_t size,
294294
int (*cmp)(const void *, const void *, void *),
295295
void *arg);
296296

297-
#endif /* CUTILS_H */
297+
#endif /* CUTILS_H */

‎quickjs/src/main/c/quickjs/libregexp-opcode.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,4 @@ DEF(bne_char_pos, 5) /* pop one stack element and jump if equal to the character
5555
DEF(prev, 1) /* go to the previous char */
5656
DEF(simple_greedy_quant, 17)
5757

58-
#endif /* DEF */
58+
#endif /* DEF */

‎quickjs/src/main/c/quickjs/libregexp.c‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,8 @@ int lre_parse_escape(const uint8_t **pp, int allow_utf16)
569569
}
570570
}
571571
break;
572-
case '0' ... '7':
572+
case '0': case '1': case '2': case '3':
573+
case '4': case '5': case '6': case '7':
573574
c -= '0';
574575
if (allow_utf16 == 2) {
575576
/* only accept \0 not followed by digit */
@@ -1410,7 +1411,9 @@ static int re_parse_term(REParseState *s, BOOL is_backward_dir)
14101411
}
14111412
}
14121413
goto normal_char;
1413-
case '1' ... '9':
1414+
case '1': case '2': case '3': case '4':
1415+
case '5': case '6': case '7': case '8':
1416+
case '9':
14141417
{
14151418
const uint8_t *q = ++p;
14161419

@@ -1434,7 +1437,7 @@ static int re_parse_term(REParseState *s, BOOL is_backward_dir)
14341437
}
14351438
goto normal_char;
14361439
}
1437-
return re_parse_error(s, "back reference out of range in reguar expression");
1440+
return re_parse_error(s, "back reference out of range in regular expression");
14381441
}
14391442
emit_back_reference:
14401443
last_atom_start = s->byte_code.size;
@@ -2533,6 +2536,17 @@ int lre_get_flags(const uint8_t *bc_buf)
25332536
return bc_buf[RE_HEADER_FLAGS];
25342537
}
25352538

2539+
/* Return NULL if no group names. Otherwise, return a pointer to
2540+
'capture_count - 1' zero terminated UTF-8 strings. */
2541+
const char *lre_get_groupnames(const uint8_t *bc_buf)
2542+
{
2543+
uint32_t re_bytecode_len;
2544+
if ((lre_get_flags(bc_buf) & LRE_FLAG_NAMED_GROUPS) == 0)
2545+
return NULL;
2546+
re_bytecode_len = get_u32(bc_buf + 3);
2547+
return (const char *)(bc_buf + 7 + re_bytecode_len);
2548+
}
2549+
25362550
#ifdef TEST
25372551

25382552
BOOL lre_check_stack_overflow(void *opaque, size_t alloca_size)
@@ -2585,4 +2599,4 @@ int main(int argc, char **argv)
25852599
}
25862600
return 0;
25872601
}
2588-
#endif
2602+
#endif

‎quickjs/src/main/c/quickjs/libregexp.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ uint8_t *lre_compile(int *plen, char *error_msg, int error_msg_size,
4444
void *opaque);
4545
int lre_get_capture_count(const uint8_t *bc_buf);
4646
int lre_get_flags(const uint8_t *bc_buf);
47+
const char *lre_get_groupnames(const uint8_t *bc_buf);
4748
int lre_exec(uint8_t **capture,
4849
const uint8_t *bc_buf, const uint8_t *cbuf, int cindex, int clen,
4950
int cbuf_type, void *opaque);
@@ -88,4 +89,4 @@ static inline int lre_js_is_ident_next(int c)
8889

8990
#undef LRE_BOOL
9091

91-
#endif /* LIBREGEXP_H */
92+
#endif /* LIBREGEXP_H */

‎quickjs/src/main/c/quickjs/libunicode-table.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4365,4 +4365,4 @@ static const uint16_t unicode_prop_len_table[] = {
43654365
countof(unicode_prop_Case_Ignorable_table),
43664366
};
43674367

4368-
#endif /* CONFIG_ALL_UNICODE */
4368+
#endif /* CONFIG_ALL_UNICODE */

‎quickjs/src/main/c/quickjs/libunicode.c‎

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -527,15 +527,22 @@ static int unicode_decomp_entry(uint32_t *res, uint32_t c,
527527
} else {
528528
d = unicode_decomp_data + unicode_decomp_table2[idx];
529529
switch(type) {
530-
case DECOMP_TYPE_L1 ... DECOMP_TYPE_L7:
530+
case DECOMP_TYPE_L1:
531+
case DECOMP_TYPE_L2:
532+
case DECOMP_TYPE_L3:
533+
case DECOMP_TYPE_L4:
534+
case DECOMP_TYPE_L5:
535+
case DECOMP_TYPE_L6:
536+
case DECOMP_TYPE_L7:
531537
l = type - DECOMP_TYPE_L1 + 1;
532538
d += (c - code) * l * 2;
533539
for(i = 0; i < l; i++) {
534540
if ((res[i] = unicode_get16(d + 2 * i)) == 0)
535541
return 0;
536542
}
537543
return l;
538-
case DECOMP_TYPE_LL1 ... DECOMP_TYPE_LL2:
544+
case DECOMP_TYPE_LL1:
545+
case DECOMP_TYPE_LL2:
539546
{
540547
uint32_t k, p;
541548
l = type - DECOMP_TYPE_LL1 + 1;
@@ -551,7 +558,11 @@ static int unicode_decomp_entry(uint32_t *res, uint32_t c,
551558
}
552559
}
553560
return l;
554-
case DECOMP_TYPE_S1 ... DECOMP_TYPE_S5:
561+
case DECOMP_TYPE_S1:
562+
case DECOMP_TYPE_S2:
563+
case DECOMP_TYPE_S3:
564+
case DECOMP_TYPE_S4:
565+
case DECOMP_TYPE_S5:
555566
l = type - DECOMP_TYPE_S1 + 1;
556567
d += (c - code) * l;
557568
for(i = 0; i < l; i++) {
@@ -582,7 +593,14 @@ static int unicode_decomp_entry(uint32_t *res, uint32_t c,
582593
case DECOMP_TYPE_B18:
583594
l = 18;
584595
goto decomp_type_b;
585-
case DECOMP_TYPE_B1 ... DECOMP_TYPE_B8:
596+
case DECOMP_TYPE_B1:
597+
case DECOMP_TYPE_B2:
598+
case DECOMP_TYPE_B3:
599+
case DECOMP_TYPE_B4:
600+
case DECOMP_TYPE_B5:
601+
case DECOMP_TYPE_B6:
602+
case DECOMP_TYPE_B7:
603+
case DECOMP_TYPE_B8:
586604
l = type - DECOMP_TYPE_B1 + 1;
587605
decomp_type_b:
588606
{
@@ -1535,4 +1553,4 @@ int unicode_prop(CharRange *cr, const char *prop_name)
15351553
return ret;
15361554
}
15371555

1538-
#endif /* CONFIG_ALL_UNICODE */
1556+
#endif /* CONFIG_ALL_UNICODE */

‎quickjs/src/main/c/quickjs/libunicode.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,4 +121,4 @@ int unicode_prop(CharRange *cr, const char *prop_name);
121121

122122
#undef LRE_BOOL
123123

124-
#endif /* LIBUNICODE_H */
124+
#endif /* LIBUNICODE_H */

‎quickjs/src/main/c/quickjs/list.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,4 @@ static inline int list_empty(struct list_head *el)
9797
for(el = (head)->prev, el1 = el->prev; el != (head); \
9898
el = el1, el1 = el->prev)
9999

100-
#endif /* LIST_H */
100+
#endif /* LIST_H */

0 commit comments

Comments
 (0)