Skip to content

Commit 52c0028

Browse files
committed
Rust: make Adt be generated
1 parent 3590cca commit 52c0028

File tree

14 files changed

+72
-40
lines changed

14 files changed

+72
-40
lines changed

rust/ast-generator/src/main.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -385,8 +385,8 @@ struct ExtractorInfo {
385385
}
386386

387387
fn enum_to_extractor_info(node: &AstEnumSrc) -> Option<ExtractorEnumInfo> {
388-
if node.name == "VariantDef" {
389-
// currently defined but unused
388+
if matches!(node.name.as_str(), "VariantDef" | "Adt") {
389+
// these are not used as types of fields, so we don't need to generate extractors for them
390390
return None;
391391
}
392392
Some(ExtractorEnumInfo {
@@ -485,8 +485,6 @@ fn main() -> anyhow::Result<()> {
485485
.expect("Failed to parse grammar");
486486
let mut grammar = codegen::grammar::lower(&grammar);
487487

488-
grammar.enums.retain(|x| x.name != "Adt");
489-
490488
let mut super_types: BTreeMap<String, BTreeSet<String>> = BTreeMap::new();
491489
for node in &grammar.enums {
492490
for variant in &node.variants {

rust/ql/.generated.list

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/ql/lib/codeql/rust/elements/Enum.qll

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/ql/lib/codeql/rust/elements/Struct.qll

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/ql/lib/codeql/rust/elements/Union.qll

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/ql/lib/codeql/rust/elements/internal/generated/Enum.qll

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)