Add basic YEAST dependency and rule

Author: asgerf

Cargo.lock

@@ -15,5 +15,6 @@ codeql_rust_binary(
         normal = True,
     ) + [
         "//shared/tree-sitter-extractor",
+        "//shared/yeast",
     ],
 )

unified/extractor/BUILD.bazel

@@ -20,3 +20,4 @@ lazy_static = "1.5.0"
 serde_json = "1.0.145"
 
 codeql-extractor = { path = "../../shared/tree-sitter-extractor" }
+yeast = { path = "../../shared/yeast" }

unified/extractor/Cargo.toml

@@ -3,6 +3,7 @@ use std::path::PathBuf;
 
 use codeql_extractor::extractor::simple;
 use codeql_extractor::trap;
+use yeast::{rule, DesugaringConfig};
 
 #[derive(Args)]
 pub struct Options {
@@ -19,9 +20,21 @@ pub struct Options {
     file_list: PathBuf,
 }
 
+fn swift_desugaring_rules() -> Vec<yeast::Rule> {
+    vec![
+        rule!(
+            (additive_expression)
+            =>
+            (simple_identifier "blah")
+        ),
+    ]
+}
+
 pub fn run(options: Options) -> std::io::Result<()> {
     codeql_extractor::extractor::set_tracing_level("ql");
 
+    let swift_desugar = DesugaringConfig::new(swift_desugaring_rules());
+
     let extractor = simple::Extractor {
         prefix: "unified".to_string(),
         languages: vec![
@@ -30,7 +43,7 @@ pub fn run(options: Options) -> std::io::Result<()> {
                 ts_language: tree_sitter_swift::LANGUAGE.into(),
                 node_types: tree_sitter_swift::NODE_TYPES,
                 file_globs: vec!["*.swift".into(), "*.swiftinterface".into()],
-                desugar: None,
+                desugar: Some(swift_desugar),
             },
         ],
         trap_dir: options.output_dir,

unified/extractor/src/extractor.rs

@@ -75,9 +75,9 @@ identifier
 | test.swift:73:23:73:29 | Element | Element |
 | test.swift:74:10:74:17 | isSorted | isSorted |
 | test.swift:75:13:75:13 | i | i |
-| test.swift:75:23:75:27 | count | count |
+| test.swift:75:23:75:31 | blah | blah |
 | test.swift:76:21:76:21 | i | i |
-| test.swift:76:31:76:31 | i | i |
+| test.swift:76:31:76:35 | blah | blah |
 | test.swift:85:6:85:12 | combine | combine |
 | test.swift:85:17:85:17 | _ | _ |
 | test.swift:85:19:85:24 | values | values |
@@ -98,3 +98,4 @@ func
 | test.swift:62:5:69:5 | FunctionDeclaration |
 | test.swift:74:5:81:5 | FunctionDeclaration |
 | test.swift:85:1:88:1 | FunctionDeclaration |
+add

unified/ql/test/library-tests/BasicTest/test.expected

@@ -3,3 +3,7 @@ import codeql.unified.Ast
 query predicate identifier(Swift::SimpleIdentifier node, string name) { name = node.getValue() }
 
 query predicate func(Swift::FunctionDeclaration node) { any() }
+
+query predicate add(Swift::AdditiveExpression node, Swift::AstNode lhs, Swift::AstNode rhs) {
+  lhs = node.getLhs(0) and rhs = node.getRhs(0)
+}