Skip to content
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

Jump to bottom

Tree-sitter: Split up ast_node_info table into two tables #15966

Merged
merged 4 commits into from
Mar 20, 2024
Merged

Tree-sitter: Split up ast_node_info table into two tables #15966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cee6f00
Tree-sitter: Split up `ast_node_info` table into two tables
hvitved Mar 19, 2024
72ff494
Ruby: Regenerate dbscheme and stats
hvitved Mar 19, 2024
865026f
Ruby: Add up/downgrade scripts (sigh)
hvitved Mar 19, 2024
31e0463
QL4QL: Regenerate DB scheme and stats
hvitved Mar 19, 2024
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
24 changes: 12 additions & 12 deletions ql/ql/src/codeql_ql/ast/internal/TreeSitter.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ module QL {
string toString() { result = this.getAPrimaryQlClass() }

/** Gets the location of this element. */
final L::Location getLocation() { ql_ast_node_info(this, _, _, result) }
final L::Location getLocation() { ql_ast_node_location(this, result) }

/** Gets the parent of this element. */
final AstNode getParent() { ql_ast_node_info(this, result, _, _) }
final AstNode getParent() { ql_ast_node_parent(this, result, _) }

/** Gets the index of this node among the children of its parent. */
final int getParentIndex() { ql_ast_node_info(this, _, result, _) }
final int getParentIndex() { ql_ast_node_parent(this, _, result) }

/** Gets a field or child node of this node. */
AstNode getAFieldOrChild() { none() }
Expand Down Expand Up @@ -1282,13 +1282,13 @@ module Dbscheme {
string toString() { result = this.getAPrimaryQlClass() }

/** Gets the location of this element. */
final L::Location getLocation() { dbscheme_ast_node_info(this, _, _, result) }
final L::Location getLocation() { dbscheme_ast_node_location(this, result) }

/** Gets the parent of this element. */
final AstNode getParent() { dbscheme_ast_node_info(this, result, _, _) }
final AstNode getParent() { dbscheme_ast_node_parent(this, result, _) }

/** Gets the index of this node among the children of its parent. */
final int getParentIndex() { dbscheme_ast_node_info(this, _, result, _) }
final int getParentIndex() { dbscheme_ast_node_parent(this, _, result) }

/** Gets a field or child node of this node. */
AstNode getAFieldOrChild() { none() }
Expand Down Expand Up @@ -1618,13 +1618,13 @@ module Blame {
string toString() { result = this.getAPrimaryQlClass() }

/** Gets the location of this element. */
final L::Location getLocation() { blame_ast_node_info(this, _, _, result) }
final L::Location getLocation() { blame_ast_node_location(this, result) }

/** Gets the parent of this element. */
final AstNode getParent() { blame_ast_node_info(this, result, _, _) }
final AstNode getParent() { blame_ast_node_parent(this, result, _) }

/** Gets the index of this node among the children of its parent. */
final int getParentIndex() { blame_ast_node_info(this, _, result, _) }
final int getParentIndex() { blame_ast_node_parent(this, _, result) }

/** Gets a field or child node of this node. */
AstNode getAFieldOrChild() { none() }
Expand Down Expand Up @@ -1731,13 +1731,13 @@ module JSON {
string toString() { result = this.getAPrimaryQlClass() }

/** Gets the location of this element. */
final L::Location getLocation() { json_ast_node_info(this, _, _, result) }
final L::Location getLocation() { json_ast_node_location(this, result) }

/** Gets the parent of this element. */
final AstNode getParent() { json_ast_node_info(this, result, _, _) }
final AstNode getParent() { json_ast_node_parent(this, result, _) }

/** Gets the index of this node among the children of its parent. */
final int getParentIndex() { json_ast_node_info(this, _, result, _) }
final int getParentIndex() { json_ast_node_parent(this, _, result) }

/** Gets a field or child node of this node. */
AstNode getAFieldOrChild() { none() }
Expand Down
48 changes: 28 additions & 20 deletions ql/ql/src/ql.dbscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,14 +972,16 @@ case @ql_token.kind of

@ql_ast_node = @ql_add_expr | @ql_aggregate | @ql_annot_arg | @ql_annotation | @ql_arityless_predicate_expr | @ql_as_expr | @ql_as_exprs | @ql_body | @ql_bool | @ql_call_body | @ql_call_or_unqual_agg_expr | @ql_charpred | @ql_class_member | @ql_classless_predicate | @ql_comp_term | @ql_conjunction | @ql_dataclass | @ql_datatype | @ql_datatype_branch | @ql_datatype_branches | @ql_disjunction | @ql_expr_aggregate_body | @ql_expr_annotation | @ql_field | @ql_full_aggregate_body | @ql_higher_order_term | @ql_if_term | @ql_implication | @ql_import_directive | @ql_import_module_expr | @ql_in_expr | @ql_instance_of | @ql_literal | @ql_member_predicate | @ql_module | @ql_module_alias_body | @ql_module_expr | @ql_module_instantiation | @ql_module_member | @ql_module_name | @ql_module_param | @ql_mul_expr | @ql_negation | @ql_order_by | @ql_order_bys | @ql_par_expr | @ql_predicate_alias_body | @ql_predicate_expr | @ql_prefix_cast | @ql_ql | @ql_qualified_expr | @ql_qualified_rhs | @ql_quantified | @ql_range | @ql_select | @ql_set_literal | @ql_signature_expr | @ql_special_call | @ql_super_ref | @ql_token | @ql_type_alias_body | @ql_type_expr | @ql_type_union_body | @ql_unary_expr | @ql_unqual_agg_body | @ql_var_decl | @ql_var_name | @ql_variable

@ql_ast_node_parent = @file | @ql_ast_node
ql_ast_node_location(
unique int node: @ql_ast_node ref,
int loc: @location_default ref
);

#keyset[parent, parent_index]
ql_ast_node_info(
ql_ast_node_parent(
unique int node: @ql_ast_node ref,
int parent: @ql_ast_node_parent ref,
int parent_index: int ref,
int loc: @location_default ref
int parent: @ql_ast_node ref,
int parent_index: int ref
);

/*- Dbscheme dbscheme -*/
Expand Down Expand Up @@ -1159,14 +1161,16 @@ case @dbscheme_token.kind of

@dbscheme_ast_node = @dbscheme_annotation | @dbscheme_args_annotation | @dbscheme_branch | @dbscheme_case_decl | @dbscheme_col_type | @dbscheme_column | @dbscheme_dbscheme | @dbscheme_entry | @dbscheme_repr_type | @dbscheme_table | @dbscheme_table_name | @dbscheme_token | @dbscheme_union_decl

@dbscheme_ast_node_parent = @dbscheme_ast_node | @file
dbscheme_ast_node_location(
unique int node: @dbscheme_ast_node ref,
int loc: @location_default ref
);

#keyset[parent, parent_index]
dbscheme_ast_node_info(
dbscheme_ast_node_parent(
unique int node: @dbscheme_ast_node ref,
int parent: @dbscheme_ast_node_parent ref,
int parent_index: int ref,
int loc: @location_default ref
int parent: @dbscheme_ast_node ref,
int parent_index: int ref
);

/*- Blame dbscheme -*/
Expand Down Expand Up @@ -1222,14 +1226,16 @@ case @blame_token.kind of

@blame_ast_node = @blame_blame_entry | @blame_blame_info | @blame_file_entry | @blame_token

@blame_ast_node_parent = @blame_ast_node | @file
blame_ast_node_location(
unique int node: @blame_ast_node ref,
int loc: @location_default ref
);

#keyset[parent, parent_index]
blame_ast_node_info(
blame_ast_node_parent(
unique int node: @blame_ast_node ref,
int parent: @blame_ast_node_parent ref,
int parent_index: int ref,
int loc: @location_default ref
int parent: @blame_ast_node ref,
int parent_index: int ref
);

/*- JSON dbscheme -*/
Expand Down Expand Up @@ -1304,13 +1310,15 @@ case @json_token.kind of

@json_ast_node = @json_array | @json_document | @json_object | @json_pair | @json_string__ | @json_token

@json_ast_node_parent = @file | @json_ast_node
json_ast_node_location(
unique int node: @json_ast_node ref,
int loc: @location_default ref
);

#keyset[parent, parent_index]
json_ast_node_info(
json_ast_node_parent(
unique int node: @json_ast_node ref,
int parent: @json_ast_node_parent ref,
int parent_index: int ref,
int loc: @location_default ref
int parent: @json_ast_node ref,
int parent_index: int ref
);

Loading
Loading