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

Revert "Revert "[ruby/prism] Change ScopeNode to point to previous ScopeNode""

Browse Source 
This reverts commit fd87372a7482cbf7672c44ef95bc1dc3b00bab7c.
This commit is contained in:
Jemma Issroff 2023-10-16 15:36:07 -07:00 committed by Aaron Patterson
parent d2b0c9da2e
commit a9512e80b0
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
prism/node.h
View File

@ -33,10 +33,17 @@ PRISM_EXPORTED_FUNCTION const char * pm_node_type_to_str(pm_node_type_t node_typ
// declare them here to avoid generating them.
typedef struct pm_scope_node {
pm_node_t base;
struct pm_scope_node *previous;
pm_node_t *ast_node;
struct pm_parameters_node *parameters;
pm_node_t *body;
pm_constant_id_list_t locals;
pm_parser_t *parser;
// We don't have the CRuby types ID and st_table within Prism
// so we use void *
void *constants; // ID *constants
void *index_lookup_table; // st_table *index_lookup_table
} pm_scope_node_t;
#endif // PRISM_NODE_H

12
prism/prism.c
View File

@ -654,14 +654,22 @@ pm_arguments_validate_block(pm_parser_t *parser, pm_arguments_t *arguments, pm_b
// Generate a scope node from the given node.
void
pm_scope_node_init(pm_node_t *node, pm_scope_node_t *scope) {
pm_scope_node_init(const pm_node_t *node, pm_scope_node_t *scope, pm_scope_node_t *previous, pm_parser_t *parser) {
scope->base.type = PM_SCOPE_NODE;
scope->base.location.start = node->location.start;
scope->base.location.end = node->location.end;
scope->ast_node = node;
scope->previous = previous;
scope->parser = parser;
scope->ast_node = (pm_node_t *)node;
scope->parameters = NULL;
scope->body = NULL;
scope->constants = NULL;
if (previous) {
scope->constants = previous->constants;
}
scope->index_lookup_table = NULL;
pm_constant_id_list_init(&scope->locals);
switch (PM_NODE_TYPE(node)) {

2
prism/prism.h
View File

@ -34,7 +34,7 @@ void pm_print_node(pm_parser_t *parser, pm_node_t *node);
void pm_parser_metadata(pm_parser_t *parser, const char *metadata);
// Generate a scope node from the given node.
void pm_scope_node_init(pm_node_t *node, pm_scope_node_t *dest);
void pm_scope_node_init(const pm_node_t *node, pm_scope_node_t *scope, pm_scope_node_t *previous, pm_parser_t *parser);
// The prism version and the serialization format.
PRISM_EXPORTED_FUNCTION const char * pm_version(void);