1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/yarp] Address PR comments

Browse Source 
- odd whitespace
- a couple of name changes
- properly read uint32_t when not properly aligned

https://github.com/ruby/yarp/commit/3208ee3983
This commit is contained in:
Thomas E. Enebo 2023-08-04 11:02:29 -04:00 committed by Takashi Kokubun
parent d6f9f3e498
commit 96aebb4265
Notes: git 2023-08-17 00:48:03 +00:00 
Merged: https://github.com/ruby/ruby/pull/8226
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
yarp/yarp.c
View File

@ -12873,6 +12873,17 @@ parse_program(yp_parser_t *parser) {
return (yp_node_t *) yp_program_node_create(parser, &locals, statements); return (yp_node_t *) yp_program_node_create(parser, &locals, statements);
} }
static uint32_t
yp_read_u32(const char *ptr) {
if (((uintptr_t) ptr) % sizeof(uint32_t) == 0) {
return *((uint32_t *) ptr);
} else {
uint32_t value;
memcpy(&value, ptr, sizeof(uint32_t));
return value;
}
}
// Process any additional metadata being passed into a parse. Since the source // Process any additional metadata being passed into a parse. Since the source
// of these calls will be from Ruby implementation internals we assume it is from // of these calls will be from Ruby implementation internals we assume it is from
// a trusted source. // a trusted source.
@ -12894,19 +12905,19 @@ parse_program(yp_parser_t *parser) {
// ] // ]
// ``` // ```
static void static void
yp_process_metadata(yp_parser_t *parser, const char *metadata) { yp_parser_metadata(yp_parser_t *parser, const char *metadata) {
const char *p = metadata; const char *p = metadata;
uint32_t number_of_scopes = (uint32_t) *p; uint32_t number_of_scopes = yp_read_u32(p);
p += 4; p += 4;
for (size_t scope_index = 0; scope_index < number_of_scopes; scope_index++) { for (size_t scope_index = 0; scope_index < number_of_scopes; scope_index++) {
uint32_t number_of_variables = (uint32_t) *p; uint32_t number_of_variables = yp_read_u32(p);
p += 4; p += 4;
yp_parser_scope_push(parser, scope_index == 0); yp_parser_scope_push(parser, scope_index == 0);
for (size_t variable_index = 0; variable_index < number_of_variables; variable_index++) { for (size_t variable_index = 0; variable_index < number_of_variables; variable_index++) {
uint32_t length = (uint32_t) *p; uint32_t length = yp_read_u32(p);
p += 4; p += 4;
yp_parser_local_add_location(parser, p, p + length); yp_parser_local_add_location(parser, p, p + length);
@ -13073,7 +13084,7 @@ YP_EXPORTED_FUNCTION void
yp_parse_serialize(const char *source, size_t size, yp_buffer_t *buffer, const char *metadata) { yp_parse_serialize(const char *source, size_t size, yp_buffer_t *buffer, const char *metadata) {
yp_parser_t parser; yp_parser_t parser;
yp_parser_init(&parser, source, size, NULL); yp_parser_init(&parser, source, size, NULL);
if (metadata) yp_process_metadata(&parser, metadata); if (metadata) yp_parser_metadata(&parser, metadata);
yp_node_t *node = yp_parse(&parser); yp_node_t *node = yp_parse(&parser);
yp_serialize(&parser, node, buffer); yp_serialize(&parser, node, buffer);

2
yarp/yarp.h
View File

@ -61,7 +61,7 @@ YP_EXPORTED_FUNCTION void yp_serialize(yp_parser_t *parser, yp_node_t *node, yp_
// Parse and serialize the AST represented by the given source to the given // Parse and serialize the AST represented by the given source to the given
// buffer. // buffer.
YP_EXPORTED_FUNCTION void yp_parse_serialize(const char *source, size_t size, yp_buffer_t *buffer, const char *parent_scopes); YP_EXPORTED_FUNCTION void yp_parse_serialize(const char *source, size_t size, yp_buffer_t *buffer, const char *metadata);
// Returns a string representation of the given token type. // Returns a string representation of the given token type.
YP_EXPORTED_FUNCTION const char * yp_token_type_to_str(yp_token_type_t token_type); YP_EXPORTED_FUNCTION const char * yp_token_type_to_str(yp_token_type_t token_type);