raphael/minishell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Normed parser/src/node.c into multiple files

Browse source
This commit is contained in:
Maieul BOYER 2024-08-31 17:30:30 +00:00
parent 009be4a4b4
commit 36d9d411ba
10 changed files with 242 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

2
parser/Filelist.parser.mk
View file

@ -11,6 +11,8 @@ node/node_child_inner \
node/node_constructor \
node/node_fields \
node/node_getter_funcs1 \
node/node_getter_funcs2 \
node/node_getter_funcs3 \
node/node_iterator \
node/node_relevent \
parser \

59
parser/src/node/node_child.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/31 17:14:40 by maiboyer #+# #+# */
/* Updated: 2024/08/31 17:15:06 by maiboyer ### ########.fr */
/* Updated: 2024/08/31 17:21:02 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -14,35 +14,46 @@
t_u32 ts_node_child_count(TSNode self)
{
Subtree tree = ts_node__subtree(self);
Subtree tree;
tree = ts_node__subtree(self);
if (ts_subtree_child_count(tree) > 0)
return tree->visible_child_count;
return (tree->visible_child_count);
else
return 0;
return (0);
}
t_u32 ts_node_named_child_count(TSNode self)
{
Subtree tree = ts_node__subtree(self);
Subtree tree;
tree = ts_node__subtree(self);
if (ts_subtree_child_count(tree) > 0)
return tree->named_child_count;
return (tree->named_child_count);
else
return 0;
return (0);
}
TSFieldId ts_node_field_id_for_child(TSNode self, t_u32 child_index)
{
TSNode result = self;
bool did_descend = true;
TSFieldId inherited_field_id = 0;
TSNode result;
bool did_descend;
TSFieldId inherited_field_id;
TSNode child;
t_u32 index;
NodeChildIterator iterator;
t_u32 grandchild_index;
t_u32 grandchild_count;
TSFieldId field_id;
result = self;
did_descend = true;
inherited_field_id = 0;
while (did_descend)
{
did_descend = false;
TSNode child;
t_u32 index = 0;
NodeChildIterator iterator = ts_node_iterate_children(&result);
index = 0;
iterator = ts_node_iterate_children(&result);
while (ts_node_child_iterator_next(&iterator, &child))
{
if (ts_node__is_relevant(child, true))
@ -50,31 +61,33 @@ TSFieldId ts_node_field_id_for_child(TSNode self, t_u32 child_index)
if (index == child_index)
{
if (ts_node_is_extra(child))
return 0;
TSFieldId field_id = ts_node__field_id_from_language(result, iterator.structural_child_index - 1);
return (0);
field_id = ts_node__field_id_from_language(result,
iterator.structural_child_index - 1);
if (field_id)
return field_id;
return inherited_field_id;
return (field_id);
return (inherited_field_id);
}
index++;
}
else
{
t_u32 grandchild_index = child_index - index;
t_u32 grandchild_count = ts_node__relevant_child_count(child, true);
grandchild_index = child_index - index;
grandchild_count = ts_node__relevant_child_count(child, true);
if (grandchild_index < grandchild_count)
{
TSFieldId field_id = ts_node__field_id_from_language(result, iterator.structural_child_index - 1);
field_id = ts_node__field_id_from_language(result,
iterator.structural_child_index - 1);
if (field_id)
inherited_field_id = field_id;
did_descend = true;
result = child;
child_index = grandchild_index;
break;
break ;
}
index += grandchild_count;
}
}
}
return 0;
return (0);
}

34
parser/src/node/node_child_inner.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/31 17:16:18 by maiboyer #+# #+# */
/* Updated: 2024/08/31 17:16:34 by maiboyer ### ########.fr */
/* Updated: 2024/08/31 17:23:14 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -14,42 +14,44 @@
TSNode ts_node__child(TSNode self, t_u32 child_index, bool include_anonymous)
{
TSNode result = self;
bool did_descend = true;
TSNode result;
bool did_descend;
TSNode child;
t_u32 index;
NodeChildIterator iterator;
t_u32 grandchild_index;
t_u32 grandchild_count;
result = self;
did_descend = true;
while (did_descend)
{
did_descend = false;
TSNode child;
t_u32 index = 0;
NodeChildIterator iterator = ts_node_iterate_children(&result);
index = 0;
iterator = ts_node_iterate_children(&result);
while (ts_node_child_iterator_next(&iterator, &child))
{
if (ts_node__is_relevant(child, include_anonymous))
{
if (index == child_index)
{
return child;
}
return (child);
index++;
}
else
{
t_u32 grandchild_index = child_index - index;
t_u32 grandchild_count = ts_node__relevant_child_count(child, include_anonymous);
grandchild_index = child_index - index;
grandchild_count = ts_node__relevant_child_count(child,
include_anonymous);
if (grandchild_index < grandchild_count)
{
printf("did_descend\n");
did_descend = true;
result = child;
child_index = grandchild_index;
break;
break ;
}
index += grandchild_count;
}
}
}
return ts_node__null();
return (ts_node__null());
}

14
parser/src/node/node_constructor.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/31 17:10:57 by maiboyer #+# #+# */
/* Updated: 2024/08/31 17:11:24 by maiboyer ### ########.fr */
/* Updated: 2024/08/31 17:24:15 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -14,14 +14,16 @@
#include "parser/length.h"
#include "parser/subtree.h"
TSNode ts_node_new(const TSTree *tree, const Subtree *subtree, Length position, TSSymbol alias)
TSNode ts_node_new(const TSTree *tree, const Subtree *subtree, \
Length position, TSSymbol alias)
{
return (TSNode){
position.bytes, position.extent.row, position.extent.column, alias, subtree, tree,
};
return ((TSNode){
position.bytes, position.extent.row, position.extent.column, \
alias, subtree, tree,
});
}
TSNode ts_node__null(void)
{
return ts_node_new(NULL, NULL, length_zero(), 0);
return (ts_node_new(NULL, NULL, length_zero(), 0));
}

42
parser/src/node/node_fields.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/31 17:15:23 by maiboyer #+# #+# */
/* Updated: 2024/08/31 17:15:55 by maiboyer ### ########.fr */
/* Updated: 2024/08/31 17:25:26 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -15,26 +15,38 @@
#include "parser/language.h"
#include "parser/tree.h"
t_const_str ts_node__field_name_from_language(TSNode self, t_u32 structural_child_index)
t_const_str ts_node__field_name_from_language(TSNode self,
t_u32 structural_child_index)
{
const TSFieldMapEntry *field_map, *field_map_end;
ts_language_field_map(self.tree->language, ts_node__subtree(self)->production_id, &field_map, &field_map_end);
for (; field_map != field_map_end; field_map++)
const TSFieldMapEntry *field_map;
const TSFieldMapEntry *field_map_end;
ts_language_field_map(self.tree->language,
ts_node__subtree(self)->production_id, &field_map, &field_map_end);
while (field_map != field_map_end)
{
if (!field_map->inherited && field_map->child_index == structural_child_index)
return self.tree->language->field_names[field_map->field_id];
if (!field_map->inherited
&& field_map->child_index == structural_child_index)
return (self.tree->language->field_names[field_map->field_id]);
field_map++;
}
return NULL;
return (NULL);
}
TSFieldId ts_node__field_id_from_language(TSNode self, t_u32 structural_child_index)
TSFieldId ts_node__field_id_from_language(TSNode self,
t_u32 structural_child_index)
{
const TSFieldMapEntry *field_map, *field_map_end;
ts_language_field_map(self.tree->language, ts_node__subtree(self)->production_id, &field_map, &field_map_end);
for (; field_map != field_map_end; field_map++)
const TSFieldMapEntry *field_map;
const TSFieldMapEntry *field_map_end;
ts_language_field_map(self.tree->language,
ts_node__subtree(self)->production_id, &field_map, &field_map_end);
while (field_map != field_map_end)
{
if (!field_map->inherited && field_map->child_index == structural_child_index)
return field_map->field_id;
if (!field_map->inherited
&& field_map->child_index == structural_child_index)
return (field_map->field_id);
field_map++;
}
return 0;
return (0);
}

75
parser/src/node/node_getter_funcs1.c
View file

@ -6,88 +6,35 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/31 17:04:21 by maiboyer #+# #+# */
/* Updated: 2024/08/31 17:07:17 by maiboyer ### ########.fr */
/* Updated: 2024/08/31 17:29:45 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#include "parser/_inner/node.h"
#include "parser/tree.h"
#include "parser/language.h"
t_u32 ts_node_start_byte(TSNode self)
{
return self.start_byte;
}
const TSLanguage *ts_node_language(TSNode self)
{
return self.tree->language;
}
TSPoint ts_node_start_point(TSNode self)
{
return (TSPoint){self.start_row, self.start_col};
}
t_u32 ts_node__alias(const TSNode *self)
{
return self->alias;
}
Subtree ts_node__subtree(TSNode self)
{
return *(const Subtree *)self.id;
}
t_u32 ts_node_end_byte(TSNode self)
{
return ts_node_start_byte(self) + ts_subtree_size(ts_node__subtree(self)).bytes;
}
TSSymbol ts_node_symbol(TSNode self)
{
TSSymbol symbol = ts_node__alias(&self);
if (!symbol)
symbol = ts_subtree_symbol(ts_node__subtree(self));
return ts_language_public_symbol(self.tree->language, symbol);
}
t_const_str ts_node_type(TSNode self)
{
TSSymbol symbol = ts_node__alias(&self);
if (!symbol)
symbol = ts_subtree_symbol(ts_node__subtree(self));
return ts_language_symbol_name(self.tree->language, symbol);
}
TSSymbol ts_node_grammar_symbol(TSNode self)
{
return ts_subtree_symbol(ts_node__subtree(self));
}
t_const_str ts_node_grammar_type(TSNode self)
{
TSSymbol symbol = ts_subtree_symbol(ts_node__subtree(self));
return ts_language_symbol_name(self.tree->language, symbol);
}
#include "parser/tree.h"
bool ts_node_is_extra(TSNode self)
{
return ts_subtree_extra(ts_node__subtree(self));
return (ts_subtree_extra(ts_node__subtree(self)));
}
bool ts_node_is_named(TSNode self)
{
TSSymbol alias = ts_node__alias(&self);
return alias ? ts_language_symbol_metadata(self.tree->language, alias).named : ts_subtree_named(ts_node__subtree(self));
TSSymbol alias;
alias = ts_node__alias(&self);
if (alias)
return (ts_language_symbol_metadata(self.tree->language, alias).named);
return (ts_subtree_named(ts_node__subtree(self)));
}
TSNode ts_node_child(TSNode self, t_u32 child_index)
{
return ts_node__child(self, child_index, true);
return (ts_node__child(self, child_index, true));
}
TSNode ts_node_named_child(TSNode self, t_u32 child_index)
{
return ts_node__child(self, child_index, false);
return (ts_node__child(self, child_index, false));
}

40
parser/src/node/node_getter_funcs2.c Normal file
View file

@ -0,0 +1,40 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* node_getter_funcs2.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/31 17:29:00 by maiboyer #+# #+# */
/* Updated: 2024/08/31 17:29:25 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#include "parser/_inner/node.h"
#include "parser/language.h"
#include "parser/tree.h"
t_u32 ts_node_start_byte(TSNode self)
{
return (self.start_byte);
}
const TSLanguage *ts_node_language(TSNode self)
{
return (self.tree->language);
}
TSPoint ts_node_start_point(TSNode self)
{
return ((TSPoint){self.start_row, self.start_col});
}
t_u32 ts_node__alias(const TSNode *self)
{
return (self->alias);
}
Subtree ts_node__subtree(TSNode self)
{
return (*(const Subtree *)self.id);
}

54
parser/src/node/node_getter_funcs3.c Normal file
View file

@ -0,0 +1,54 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* node_getter_funcs3.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/31 17:29:34 by maiboyer #+# #+# */
/* Updated: 2024/08/31 17:29:48 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#include "parser/_inner/node.h"
#include "parser/language.h"
#include "parser/tree.h"
t_u32 ts_node_end_byte(TSNode self)
{
return (ts_node_start_byte(self)
+ ts_subtree_size(ts_node__subtree(self)).bytes);
}
TSSymbol ts_node_symbol(TSNode self)
{
TSSymbol symbol;
symbol = ts_node__alias(&self);
if (!symbol)
symbol = ts_subtree_symbol(ts_node__subtree(self));
return (ts_language_public_symbol(self.tree->language, symbol));
}
t_const_str ts_node_type(TSNode self)
{
TSSymbol symbol;
symbol = ts_node__alias(&self);
if (!symbol)
symbol = ts_subtree_symbol(ts_node__subtree(self));
return (ts_language_symbol_name(self.tree->language, symbol));
}
TSSymbol ts_node_grammar_symbol(TSNode self)
{
return (ts_subtree_symbol(ts_node__subtree(self)));
}
t_const_str ts_node_grammar_type(TSNode self)
{
TSSymbol symbol;
symbol = ts_subtree_symbol(ts_node__subtree(self));
return (ts_language_symbol_name(self.tree->language, symbol));
}

36
parser/src/node/node_iterator.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/31 17:14:00 by maiboyer #+# #+# */
/* Updated: 2024/08/31 17:14:14 by maiboyer ### ########.fr */
/* Updated: 2024/08/31 17:28:20 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -16,47 +16,49 @@
NodeChildIterator ts_node_iterate_children(const TSNode *node)
{
Subtree subtree = ts_node__subtree(*node);
Subtree subtree;
const TSSymbol *alias_sequence;
subtree = ts_node__subtree(*node);
if (ts_subtree_child_count(subtree) == 0)
{
return (NodeChildIterator){NULL, node->tree, length_zero(), 0, 0, NULL};
}
const TSSymbol *alias_sequence = ts_language_alias_sequence(node->tree->language, subtree->production_id);
return (NodeChildIterator){
return ((NodeChildIterator){NULL, node->tree, length_zero(), 0, 0,
NULL});
alias_sequence = ts_language_alias_sequence(node->tree->language,
subtree->production_id);
return ((NodeChildIterator){
.tree = node->tree,
.parent = subtree,
.position = {ts_node_start_byte(*node), ts_node_start_point(*node)},
.child_index = 0,
.structural_child_index = 0,
.alias_sequence = alias_sequence,
};
});
}
bool ts_node_child_iterator_done(NodeChildIterator *self)
{
return self->child_index == self->parent->child_count;
return (self->child_index == self->parent->child_count);
}
bool ts_node_child_iterator_next(NodeChildIterator *self, TSNode *result)
{
const Subtree *child;
TSSymbol alias_symbol;
if (!self->parent || ts_node_child_iterator_done(self))
return false;
const Subtree *child = &ts_subtree_children(self->parent)[self->child_index];
TSSymbol alias_symbol = 0;
return (false);
alias_symbol = 0;
child = &ts_subtree_children(self->parent)[self->child_index];
if (!ts_subtree_extra(*child))
{
if (self->alias_sequence)
{
alias_symbol = self->alias_sequence[self->structural_child_index];
}
self->structural_child_index++;
}
if (self->child_index > 0)
{
self->position = length_add(self->position, ts_subtree_padding(*child));
}
*result = ts_node_new(self->tree, child, self->position, alias_symbol);
self->position = length_add(self->position, ts_subtree_size(*child));
self->child_index++;
return true;
return (true);
}

19
parser/src/node/node_relevent.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/31 17:16:53 by maiboyer #+# #+# */
/* Updated: 2024/08/31 17:17:09 by maiboyer ### ########.fr */
/* Updated: 2024/08/31 17:26:57 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -18,25 +18,28 @@ bool ts_node__is_relevant(TSNode self, bool include_anonymous)
{
TSSymbol alias;
Subtree tree;
tree = ts_node__subtree(self);
if (include_anonymous)
return ts_subtree_visible(tree) || ts_node__alias(&self);
return (ts_subtree_visible(tree) || ts_node__alias(&self));
alias = ts_node__alias(&self);
if (alias)
return ts_language_symbol_metadata(self.tree->language, alias).named;
return (ts_language_symbol_metadata(self.tree->language, alias).named);
else
return ts_subtree_visible(tree) && ts_subtree_named(tree);
return (ts_subtree_visible(tree) && ts_subtree_named(tree));
}
t_u32 ts_node__relevant_child_count(TSNode self, bool include_anonymous)
{
Subtree tree = ts_node__subtree(self);
Subtree tree;
tree = ts_node__subtree(self);
if (ts_subtree_child_count(tree) > 0)
{
if (include_anonymous)
return tree->visible_child_count;
return (tree->visible_child_count);
else
return tree->named_child_count;
return (tree->named_child_count);
}
return 0;
return (0);
}