mirror of
https://github.com/github/codeql.git
synced 2026-05-02 12:15:17 +02:00
Ruby/QL: unconditionally generate discard predicates
This commit is contained in:
@@ -17,7 +17,6 @@ pub fn generate(
|
||||
languages: Vec<language::Language>,
|
||||
dbscheme_path: PathBuf,
|
||||
ql_library_path: PathBuf,
|
||||
overlay_support: bool,
|
||||
) -> std::io::Result<()> {
|
||||
let dbscheme_file = File::create(dbscheme_path).map_err(|e| {
|
||||
tracing::error!("Failed to create dbscheme file: {}", e);
|
||||
@@ -50,14 +49,12 @@ pub fn generate(
|
||||
})],
|
||||
)?;
|
||||
|
||||
if overlay_support {
|
||||
ql::write(
|
||||
&mut ql_writer,
|
||||
&[ql::TopLevel::Predicate(
|
||||
ql_gen::create_is_overlay_predicate(),
|
||||
)],
|
||||
)?;
|
||||
}
|
||||
ql::write(
|
||||
&mut ql_writer,
|
||||
&[ql::TopLevel::Predicate(
|
||||
ql_gen::create_is_overlay_predicate(),
|
||||
)],
|
||||
)?;
|
||||
|
||||
for language in languages {
|
||||
let prefix = node_types::to_snake_case(&language.name);
|
||||
@@ -103,20 +100,19 @@ pub fn generate(
|
||||
ql::TopLevel::Class(ql_gen::create_reserved_word_class(&reserved_word_name)),
|
||||
];
|
||||
|
||||
if overlay_support {
|
||||
body.push(ql::TopLevel::Predicate(
|
||||
ql_gen::create_get_node_file_predicate(&ast_node_name, &node_location_table_name),
|
||||
));
|
||||
body.push(ql::TopLevel::Predicate(
|
||||
ql_gen::create_discard_file_predicate(),
|
||||
));
|
||||
body.push(ql::TopLevel::Predicate(
|
||||
ql_gen::create_discardable_ast_node_predicate(&ast_node_name),
|
||||
));
|
||||
body.push(ql::TopLevel::Predicate(
|
||||
ql_gen::create_discard_ast_node_predicate(&ast_node_name),
|
||||
));
|
||||
}
|
||||
// Overlay discard predicates
|
||||
body.push(ql::TopLevel::Predicate(
|
||||
ql_gen::create_get_node_file_predicate(&ast_node_name, &node_location_table_name),
|
||||
));
|
||||
body.push(ql::TopLevel::Predicate(
|
||||
ql_gen::create_discard_file_predicate(),
|
||||
));
|
||||
body.push(ql::TopLevel::Predicate(
|
||||
ql_gen::create_discardable_ast_node_predicate(&ast_node_name),
|
||||
));
|
||||
body.push(ql::TopLevel::Predicate(
|
||||
ql_gen::create_discard_ast_node_predicate(&ast_node_name),
|
||||
));
|
||||
|
||||
body.append(&mut ql_gen::convert_nodes(&nodes));
|
||||
ql::write(
|
||||
|
||||
Reference in New Issue
Block a user