Skip to content

C: Use Arena Allocator for Lexing and Parsing #726

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

Draft
marcoroth wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

C: Use Arena Allocator for Lexing and Parsing #726

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
75 changes: 67 additions & 8 deletions ext/herb/extension.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#include "nodes.h"

#include "../../src/include/analyze.h"
#include "../../src/include/macros.h"
#include "../../src/include/util/hb_arena.h"

VALUE mHerb;
VALUE cPosition;
Expand All @@ -19,23 +21,52 @@ VALUE cParseResult;
static VALUE Herb_lex(VALUE self, VALUE source) {
char* string = (char*) check_string(source);

hb_array_T* tokens = herb_lex(string);
hb_arena_T* arena = malloc(sizeof(hb_arena_T));
if (!arena) { return Qnil; }

VALUE result = create_lex_result(tokens, source);
if (!hb_arena_init(arena, KB(512))) {
free(arena);
return Qnil;
}

herb_lex_result_T* lex_result = herb_lex(string, arena);

if (!lex_result) {
hb_arena_free(arena);
free(arena);
return Qnil;
}

VALUE result = create_lex_result(lex_result->tokens, source);

herb_free_tokens(&tokens);
herb_free_lex_result(&lex_result);

return result;
}

static VALUE Herb_lex_file(VALUE self, VALUE path) {
char* file_path = (char*) check_string(path);
hb_array_T* tokens = herb_lex_file(file_path);

hb_arena_T* arena = malloc(sizeof(hb_arena_T));
if (!arena) { return Qnil; }

if (!hb_arena_init(arena, KB(512))) {
free(arena);
return Qnil;
}

herb_lex_result_T* lex_result = herb_lex_file(file_path, arena);

if (!lex_result) {
hb_arena_free(arena);
free(arena);
return Qnil;
}

VALUE source_value = read_file_to_ruby_string(file_path);
VALUE result = create_lex_result(tokens, source_value);
VALUE result = create_lex_result(lex_result->tokens, source_value);

herb_free_tokens(&tokens);
herb_free_lex_result(&lex_result);

return result;
}
Expand All @@ -59,7 +90,21 @@ static VALUE Herb_parse(int argc, VALUE* argv, VALUE self) {
}
}

AST_DOCUMENT_NODE_T* root = herb_parse(string, parser_options);
hb_arena_T* arena = malloc(sizeof(hb_arena_T));
if (!arena) { return Qnil; }

if (!hb_arena_init(arena, KB(512))) {
free(arena);
return Qnil;
}

AST_DOCUMENT_NODE_T* root = herb_parse(string, parser_options, arena);

if (!root) {
hb_arena_free(arena);
free(arena);
return Qnil;
}

herb_analyze_parse_tree(root, string);

Expand All @@ -76,7 +121,21 @@ static VALUE Herb_parse_file(VALUE self, VALUE path) {
VALUE source_value = read_file_to_ruby_string(file_path);
char* string = (char*) check_string(source_value);

AST_DOCUMENT_NODE_T* root = herb_parse(string, NULL);
hb_arena_T* arena = malloc(sizeof(hb_arena_T));
if (!arena) { return Qnil; }

if (!hb_arena_init(arena, KB(512))) {
free(arena);
return Qnil;
}

AST_DOCUMENT_NODE_T* root = herb_parse(string, NULL, arena);

if (!root) {
hb_arena_free(arena);
free(arena);
return Qnil;
}

VALUE result = create_parse_result(root, source_value);

Expand Down
105 changes: 97 additions & 8 deletions javascript/packages/node/extension/herb.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ extern "C" {
#include "../extension/libherb/include/ast_nodes.h"
#include "../extension/libherb/include/herb.h"
#include "../extension/libherb/include/location.h"
#include "../extension/libherb/include/macros.h"
#include "../extension/libherb/include/range.h"
#include "../extension/libherb/include/token.h"
#include "../extension/libherb/include/util/hb_arena.h"
#include "../extension/libherb/include/util/hb_array.h"
#include "../extension/libherb/include/util/hb_buffer.h"
}
Expand All @@ -31,10 +33,31 @@ napi_value Herb_lex(napi_env env, napi_callback_info info) {
char* string = CheckString(env, args[0]);
if (!string) { return nullptr; }

hb_array_T* tokens = herb_lex(string);
napi_value result = CreateLexResult(env, tokens, args[0]);
hb_arena_T* arena = (hb_arena_T*) malloc(sizeof(hb_arena_T));

herb_free_tokens(&tokens);
if (!arena) {
free(string);
return nullptr;
}

if (!hb_arena_init(arena, KB(512))) {
free(arena);
free(string);
return nullptr;
}

herb_lex_result_T* lex_result = herb_lex(string, arena);

if (!lex_result) {
hb_arena_free(arena);
free(arena);
free(string);
return nullptr;
}

napi_value result = CreateLexResult(env, lex_result->tokens, args[0]);

herb_free_lex_result(&lex_result);
free(string);

return result;
Expand All @@ -53,11 +76,32 @@ napi_value Herb_lex_file(napi_env env, napi_callback_info info) {
char* file_path = CheckString(env, args[0]);
if (!file_path) { return nullptr; }

hb_array_T* tokens = herb_lex_file(file_path);
hb_arena_T* arena = (hb_arena_T*) malloc(sizeof(hb_arena_T));

if (!arena) {
free(file_path);
return nullptr;
}

if (!hb_arena_init(arena, KB(512))) {
free(arena);
free(file_path);
return nullptr;
}

herb_lex_result_T* lex_result = herb_lex_file(file_path, arena);

if (!lex_result) {
hb_arena_free(arena);
free(arena);
free(file_path);
return nullptr;
}

napi_value source_value = ReadFileToString(env, file_path);
napi_value result = CreateLexResult(env, tokens, source_value);
napi_value result = CreateLexResult(env, lex_result->tokens, source_value);

herb_free_tokens(&tokens);
herb_free_lex_result(&lex_result);
free(file_path);

return result;
Expand Down Expand Up @@ -101,7 +145,28 @@ napi_value Herb_parse(napi_env env, napi_callback_info info) {
}
}

AST_DOCUMENT_NODE_T* root = herb_parse(string, parser_options);
hb_arena_T* arena = (hb_arena_T*) malloc(sizeof(hb_arena_T));

if (!arena) {
free(string);
return nullptr;
}

if (!hb_arena_init(arena, KB(512))) {
free(arena);
free(string);
return nullptr;
}

AST_DOCUMENT_NODE_T* root = herb_parse(string, parser_options, arena);

if (!root) {
hb_arena_free(arena);
free(arena);
free(string);
return nullptr;
}

herb_analyze_parse_tree(root, string);
napi_value result = CreateParseResult(env, root, args[0]);

Expand Down Expand Up @@ -132,7 +197,31 @@ napi_value Herb_parse_file(napi_env env, napi_callback_info info) {
return nullptr;
}

AST_DOCUMENT_NODE_T* root = herb_parse(string, nullptr);
hb_arena_T* arena = (hb_arena_T*) malloc(sizeof(hb_arena_T));

if (!arena) {
free(file_path);
free(string);
return nullptr;
}

if (!hb_arena_init(arena, KB(512))) {
free(arena);
free(file_path);
free(string);
return nullptr;
}

AST_DOCUMENT_NODE_T* root = herb_parse(string, nullptr, arena);

if (!root) {
hb_arena_free(arena);
free(arena);
free(file_path);
free(string);
return nullptr;
}

napi_value result = CreateParseResult(env, root, source_value);

ast_node_free((AST_NODE_T *) root);
Expand Down
Loading
Loading