Skip to content

C: Deprecate hb_array_size #883

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

Closed
timkaechele wants to merge 1 commit into from
Closed

C: Deprecate hb_array_size #883

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion ext/herb/extension_helpers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ VALUE create_lex_result(hb_array_T* tokens, VALUE source) {
VALUE warnings = rb_ary_new();
VALUE errors = rb_ary_new();

for (size_t i = 0; i < hb_array_size(tokens); i++) {
for (size_t i = 0; i < tokens->size; i++) {
token_T* token = hb_array_get(tokens, i);
if (token != NULL) { rb_ary_push(value, rb_token_from_c_struct(token)); }
}
Expand Down
6 changes: 3 additions & 3 deletions java/extension_helpers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ jobject CreateLexResult(JNIEnv* env, hb_array_T* tokens, jstring source) {
jmethodID arrayListConstructor = (*env)->GetMethodID(env, arrayListClass, "<init>", "(I)V");
jmethodID addMethod = (*env)->GetMethodID(env, arrayListClass, "add", "(Ljava/lang/Object;)Z");

jobject tokensList = (*env)->NewObject(env, arrayListClass, arrayListConstructor, (jint) hb_array_size(tokens));
jobject tokensList = (*env)->NewObject(env, arrayListClass, arrayListConstructor, (jint) tokens->size);

for (size_t i = 0; i < hb_array_size(tokens); i++) {
for (size_t i = 0; i < tokens->size; i++) {
token_T* token = (token_T*) hb_array_get(tokens, i);
jobject tokenObj = CreateToken(env, token);
(*env)->CallBooleanMethod(env, tokensList, addMethod, tokenObj);
Expand All @@ -85,7 +85,7 @@ jobject CreateParseResult(JNIEnv* env, AST_DOCUMENT_NODE_T* root, jstring source
jobject errorsList = (*env)->NewObject(env, arrayListClass, arrayListConstructor);

if (root->base.errors) {
for (size_t i = 0; i < hb_array_size(root->base.errors); i++) {
for (size_t i = 0; i < root->base.errors->size; i++) {
AST_NODE_T* error_node = (AST_NODE_T*) hb_array_get(root->base.errors, i);
jobject errorObj = CreateErrorNode(env, error_node);
(*env)->CallBooleanMethod(env, errorsList, addMethod, errorObj);
Expand Down
2 changes: 1 addition & 1 deletion javascript/packages/node/extension/extension_helpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ napi_value CreateLexResult(napi_env env, hb_array_T* tokens, napi_value source)

// Add tokens to array
if (tokens) {
for (size_t i = 0; i < hb_array_size(tokens); i++) {
for (size_t i = 0; i < tokens->size; i++) {
token_T* token = (token_T*)hb_array_get(tokens, i);
if (token) {
napi_value token_obj = CreateToken(env, token);
Expand Down
62 changes: 31 additions & 31 deletions src/analyze.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,8 +287,8 @@ static AST_NODE_T* create_control_node(

if (end_node) {
end_position = end_node->base.location.end;
} else if (children && hb_array_size(children) > 0) {
AST_NODE_T* last_child = hb_array_get(children, hb_array_size(children) - 1);
} else if (children && children->size > 0) {
AST_NODE_T* last_child = hb_array_get(children, children->size - 1);
end_position = last_child->location.end;
} else if (subsequent) {
end_position = subsequent->location.end;
Expand Down Expand Up @@ -329,7 +329,7 @@ static AST_NODE_T* create_control_node(
hb_array_T* in_conditions = hb_array_init(8);
hb_array_T* non_when_non_in_children = hb_array_init(8);

for (size_t i = 0; i < hb_array_size(children); i++) {
for (size_t i = 0; i < children->size; i++) {
AST_NODE_T* child = hb_array_get(children, i);

if (child && child->type == AST_ERB_WHEN_NODE) {
Expand All @@ -343,7 +343,7 @@ static AST_NODE_T* create_control_node(

hb_array_free(&children);

if (hb_array_size(in_conditions) > 0) {
if (in_conditions->size > 0) {
hb_array_free(&when_conditions);

return (AST_NODE_T*) ast_erb_case_match_node_init(
Expand Down Expand Up @@ -539,7 +539,7 @@ static size_t process_control_structure(
hb_array_T* in_conditions = hb_array_init(8);
hb_array_T* non_when_non_in_children = hb_array_init(8);

while (index < hb_array_size(array)) {
while (index < array->size) {
AST_NODE_T* next_node = hb_array_get(array, index);

if (!next_node) { break; }
Expand All @@ -555,7 +555,7 @@ static size_t process_control_structure(
index++;
}

while (index < hb_array_size(array)) {
while (index < array->size) {
AST_NODE_T* next_node = hb_array_get(array, index);

if (!next_node) { break; }
Expand Down Expand Up @@ -627,7 +627,7 @@ static size_t process_control_structure(

AST_ERB_ELSE_NODE_T* else_clause = NULL;

if (index < hb_array_size(array)) {
if (index < array->size) {
AST_NODE_T* next_node = hb_array_get(array, index);

if (next_node && next_node->type == AST_ERB_CONTENT_NODE) {
Expand Down Expand Up @@ -661,7 +661,7 @@ static size_t process_control_structure(

AST_ERB_END_NODE_T* end_node = NULL;

if (index < hb_array_size(array)) {
if (index < array->size) {
AST_NODE_T* potential_end = hb_array_get(array, index);

if (potential_end && potential_end->type == AST_ERB_CONTENT_NODE) {
Expand Down Expand Up @@ -694,15 +694,15 @@ static size_t process_control_structure(
end_position = end_node->base.location.end;
} else if (else_clause) {
end_position = else_clause->base.location.end;
} else if (hb_array_size(when_conditions) > 0) {
AST_NODE_T* last_when = hb_array_get(when_conditions, hb_array_size(when_conditions) - 1);
} else if (when_conditions->size > 0) {
AST_NODE_T* last_when = hb_array_get(when_conditions, when_conditions->size - 1);
end_position = last_when->location.end;
} else if (hb_array_size(in_conditions) > 0) {
AST_NODE_T* last_in = hb_array_get(in_conditions, hb_array_size(in_conditions) - 1);
} else if (in_conditions->size > 0) {
AST_NODE_T* last_in = hb_array_get(in_conditions, in_conditions->size - 1);
end_position = last_in->location.end;
}

if (hb_array_size(in_conditions) > 0) {
if (in_conditions->size > 0) {
hb_array_T* case_match_errors = erb_node->base.errors;
erb_node->base.errors = NULL;

Expand Down Expand Up @@ -760,7 +760,7 @@ static size_t process_control_structure(
AST_ERB_ELSE_NODE_T* else_clause = NULL;
AST_ERB_ENSURE_NODE_T* ensure_clause = NULL;

if (index < hb_array_size(array)) {
if (index < array->size) {
AST_NODE_T* next_node = hb_array_get(array, index);

if (next_node && next_node->type == AST_ERB_CONTENT_NODE) {
Expand All @@ -775,7 +775,7 @@ static size_t process_control_structure(
}
}

if (index < hb_array_size(array)) {
if (index < array->size) {
AST_NODE_T* next_node = hb_array_get(array, index);

if (next_node && next_node->type == AST_ERB_CONTENT_NODE) {
Expand Down Expand Up @@ -807,7 +807,7 @@ static size_t process_control_structure(
}
}

if (index < hb_array_size(array)) {
if (index < array->size) {
AST_NODE_T* next_node = hb_array_get(array, index);

if (next_node && next_node->type == AST_ERB_CONTENT_NODE) {
Expand All @@ -819,7 +819,7 @@ static size_t process_control_structure(

index++;

while (index < hb_array_size(array)) {
while (index < array->size) {
AST_NODE_T* child = hb_array_get(array, index);

if (!child) { break; }
Expand Down Expand Up @@ -855,7 +855,7 @@ static size_t process_control_structure(

AST_ERB_END_NODE_T* end_node = NULL;

if (index < hb_array_size(array)) {
if (index < array->size) {
AST_NODE_T* potential_end = hb_array_get(array, index);

if (potential_end && potential_end->type == AST_ERB_CONTENT_NODE) {
Expand Down Expand Up @@ -922,7 +922,7 @@ static size_t process_control_structure(

AST_ERB_END_NODE_T* end_node = NULL;

if (index < hb_array_size(array)) {
if (index < array->size) {
AST_NODE_T* potential_close = hb_array_get(array, index);

if (potential_close && potential_close->type == AST_ERB_CONTENT_NODE) {
Expand Down Expand Up @@ -954,8 +954,8 @@ static size_t process_control_structure(

if (end_node) {
end_position = end_node->base.location.end;
} else if (children && hb_array_size(children) > 0) {
AST_NODE_T* last_child = hb_array_get(children, hb_array_size(children) - 1);
} else if (children && children->size > 0) {
AST_NODE_T* last_child = hb_array_get(children, children->size - 1);
end_position = last_child->location.end;
}

Expand Down Expand Up @@ -984,7 +984,7 @@ static size_t process_control_structure(
AST_NODE_T* subsequent = NULL;
AST_ERB_END_NODE_T* end_node = NULL;

if (index < hb_array_size(array)) {
if (index < array->size) {
AST_NODE_T* next_node = hb_array_get(array, index);

if (next_node && next_node->type == AST_ERB_CONTENT_NODE) {
Expand All @@ -997,7 +997,7 @@ static size_t process_control_structure(
}
}

if (index < hb_array_size(array)) {
if (index < array->size) {
AST_NODE_T* potential_end = hb_array_get(array, index);

if (potential_end && potential_end->type == AST_ERB_CONTENT_NODE) {
Expand Down Expand Up @@ -1059,7 +1059,7 @@ static size_t process_subsequent_block(
hb_array_free(&children);
}

if (index < hb_array_size(array)) {
if (index < array->size) {
AST_NODE_T* next_node = hb_array_get(array, index);

if (next_node && next_node->type == AST_ERB_CONTENT_NODE) {
Expand Down Expand Up @@ -1117,7 +1117,7 @@ static size_t process_block_children(
analyze_ruby_context_T* context,
control_type_t parent_type
) {
while (index < hb_array_size(array)) {
while (index < array->size) {
AST_NODE_T* child = hb_array_get(array, index);

if (!child) { break; }
Expand All @@ -1139,7 +1139,7 @@ static size_t process_block_children(
hb_array_T* temp_array = hb_array_init(1);
size_t new_index = process_control_structure(node, array, index, temp_array, context, child_type);

if (hb_array_size(temp_array) > 0) { hb_array_append(children_array, hb_array_get(temp_array, 0)); }
if (temp_array->size > 0) { hb_array_append(children_array, hb_array_get(temp_array, 0)); }

hb_array_free(&temp_array);

Expand All @@ -1155,10 +1155,10 @@ static size_t process_block_children(
}

hb_array_T* rewrite_node_array(AST_NODE_T* node, hb_array_T* array, analyze_ruby_context_T* context) {
hb_array_T* new_array = hb_array_init(hb_array_size(array));
hb_array_T* new_array = hb_array_init(array->size);
size_t index = 0;

while (index < hb_array_size(array)) {
while (index < array->size) {
AST_NODE_T* item = hb_array_get(array, index);

if (!item) { break; }
Expand Down Expand Up @@ -1293,7 +1293,7 @@ static bool detect_invalid_erb_structures(const AST_NODE_T* node, void* data) {
if (if_node->end_node == NULL) { check_erb_node_for_missing_end(node); }

if (if_node->statements != NULL) {
for (size_t i = 0; i < hb_array_size(if_node->statements); i++) {
for (size_t i = 0; i < if_node->statements->size; i++) {
AST_NODE_T* statement = (AST_NODE_T*) hb_array_get(if_node->statements, i);

if (statement != NULL) { herb_visit_node(statement, detect_invalid_erb_structures, context); }
Expand Down Expand Up @@ -1325,7 +1325,7 @@ static bool detect_invalid_erb_structures(const AST_NODE_T* node, void* data) {
const AST_ERB_IF_NODE_T* elsif_node = (const AST_ERB_IF_NODE_T*) subsequent;

if (elsif_node->statements != NULL) {
for (size_t i = 0; i < hb_array_size(elsif_node->statements); i++) {
for (size_t i = 0; i < elsif_node->statements->size; i++) {
AST_NODE_T* statement = (AST_NODE_T*) hb_array_get(elsif_node->statements, i);

if (statement != NULL) { herb_visit_node(statement, detect_invalid_erb_structures, context); }
Expand All @@ -1337,7 +1337,7 @@ static bool detect_invalid_erb_structures(const AST_NODE_T* node, void* data) {
const AST_ERB_ELSE_NODE_T* else_node = (const AST_ERB_ELSE_NODE_T*) subsequent;

if (else_node->statements != NULL) {
for (size_t i = 0; i < hb_array_size(else_node->statements); i++) {
for (size_t i = 0; i < else_node->statements->size; i++) {
AST_NODE_T* statement = (AST_NODE_T*) hb_array_get(else_node->statements, i);

if (statement != NULL) { herb_visit_node(statement, detect_invalid_erb_structures, context); }
Expand Down
2 changes: 1 addition & 1 deletion src/ast_node.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ ast_node_type_T ast_node_type(const AST_NODE_T* node) {
}

size_t ast_node_errors_count(const AST_NODE_T* node) {
return hb_array_size(node->errors);
return node->errors->size;
}

hb_array_T* ast_node_errors(const AST_NODE_T* node) {
Expand Down
8 changes: 4 additions & 4 deletions src/extract.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ void herb_extract_ruby_to_buffer_with_semicolons(const char* source, hb_buffer_T
bool skip_erb_content = false;
bool is_comment_tag = false;

for (size_t i = 0; i < hb_array_size(tokens); i++) {
for (size_t i = 0; i < tokens->size; i++) {
const token_T* token = hb_array_get(tokens, i);

switch (token->type) {
Expand Down Expand Up @@ -79,7 +79,7 @@ void herb_extract_ruby_to_buffer_with_semicolons(const char* source, hb_buffer_T
bool needs_semicolon = false;
uint32_t current_line = token->location.end.line;

for (size_t j = i + 1; j < hb_array_size(tokens); j++) {
for (size_t j = i + 1; j < tokens->size; j++) {
const token_T* next_token = hb_array_get(tokens, j);

if (next_token->type == TOKEN_NEWLINE) { break; }
Expand Down Expand Up @@ -113,7 +113,7 @@ void herb_extract_ruby_to_buffer(const char* source, hb_buffer_T* output) {
hb_array_T* tokens = herb_lex(source);
bool skip_erb_content = false;

for (size_t i = 0; i < hb_array_size(tokens); i++) {
for (size_t i = 0; i < tokens->size; i++) {
const token_T* token = hb_array_get(tokens, i);

switch (token->type) {
Expand Down Expand Up @@ -160,7 +160,7 @@ void herb_extract_ruby_to_buffer(const char* source, hb_buffer_T* output) {
void herb_extract_html_to_buffer(const char* source, hb_buffer_T* output) {
hb_array_T* tokens = herb_lex(source);

for (size_t i = 0; i < hb_array_size(tokens); i++) {
for (size_t i = 0; i < tokens->size; i++) {
const token_T* token = hb_array_get(tokens, i);

switch (token->type) {
Expand Down
4 changes: 2 additions & 2 deletions src/herb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ hb_array_T* herb_lex_file(const char* path) {
void herb_lex_to_buffer(const char* source, hb_buffer_T* output) {
hb_array_T* tokens = herb_lex(source);

for (size_t i = 0; i < hb_array_size(tokens); i++) {
for (size_t i = 0; i < tokens->size; i++) {
token_T* token = hb_array_get(tokens, i);

hb_string_T type = token_to_string(token);
Expand All @@ -74,7 +74,7 @@ void herb_lex_to_buffer(const char* source, hb_buffer_T* output) {
void herb_free_tokens(hb_array_T** tokens) {
if (!tokens || !*tokens) { return; }

for (size_t i = 0; i < hb_array_size(*tokens); i++) {
for (size_t i = 0; i < (*tokens)->size; i++) {
token_T* token = hb_array_get(*tokens, i);
if (token) { token_free(token); }
}
Expand Down
12 changes: 6 additions & 6 deletions src/parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1142,7 +1142,7 @@ static void parser_parse_in_data_state(parser_T* parser, hb_array_T* children, h
static size_t find_matching_close_tag(hb_array_T* nodes, size_t start_idx, hb_string_T tag_name) {
int depth = 0;

for (size_t i = start_idx + 1; i < hb_array_size(nodes); i++) {
for (size_t i = start_idx + 1; i < nodes->size; i++) {
AST_NODE_T* node = (AST_NODE_T*) hb_array_get(nodes, i);
if (node == NULL) { continue; }

Expand All @@ -1166,9 +1166,9 @@ static size_t find_matching_close_tag(hb_array_T* nodes, size_t start_idx, hb_st
static hb_array_T* parser_build_elements_from_tags(hb_array_T* nodes, hb_array_T* errors);

static hb_array_T* parser_build_elements_from_tags(hb_array_T* nodes, hb_array_T* errors) {
hb_array_T* result = hb_array_init(hb_array_size(nodes));
hb_array_T* result = hb_array_init(nodes->size);

for (size_t index = 0; index < hb_array_size(nodes); index++) {
for (size_t index = 0; index < nodes->size; index++) {
AST_NODE_T* node = (AST_NODE_T*) hb_array_get(nodes, index);
if (node == NULL) { continue; }

Expand All @@ -1179,7 +1179,7 @@ static hb_array_T* parser_build_elements_from_tags(hb_array_T* nodes, hb_array_T
size_t close_index = find_matching_close_tag(nodes, index, tag_name);

if (close_index == (size_t) -1) {
if (hb_array_size(open_tag->base.errors) == 0) {
if (open_tag->base.errors->size == 0) {
append_missing_closing_tag_error(
open_tag->tag_name,
open_tag->base.location.start,
Expand Down Expand Up @@ -1223,7 +1223,7 @@ static hb_array_T* parser_build_elements_from_tags(hb_array_T* nodes, hb_array_T
AST_HTML_CLOSE_TAG_NODE_T* close_tag = (AST_HTML_CLOSE_TAG_NODE_T*) node;

if (!is_void_element(hb_string(close_tag->tag_name->value))) {
if (hb_array_size(close_tag->base.errors) == 0) {
if (close_tag->base.errors->size == 0) {
append_missing_opening_tag_error(
close_tag->tag_name,
close_tag->base.location.start,
Expand Down Expand Up @@ -1297,7 +1297,7 @@ void herb_parser_deinit(parser_T* parser) {
}

void match_tags_in_node_array(hb_array_T* nodes, hb_array_T* errors) {
if (nodes == NULL || hb_array_size(nodes) == 0) { return; }
if (nodes == NULL || nodes->size == 0) { return; }

hb_array_T* processed = parser_build_elements_from_tags(nodes, errors);

Expand Down
Loading
Loading