Merge remote-tracking branch 'upstream/main' into chore-revamped-from…

…-impls

.changeset/heavy-hotels-complain.md

@@ -0,0 +1,5 @@
+---
+"@nomicfoundation/slang": patch
+---
+
+refactor CST building and querying utilities into a separate `metaslang_cst` crate.

.cspell.json

@@ -13,6 +13,7 @@
     "inheritdoc",
     "instanceof",
     "ipfs",
+    "metaslang",
     "mkdocs",
     "napi",
     "nomic",

Cargo.toml

@@ -23,6 +23,8 @@ members = [
     "crates/infra/cli",
     "crates/infra/utils",
 
+    "crates/metaslang/cst",
+
     "crates/solidity/inputs/language",
     "crates/solidity/outputs/cargo/slang_solidity_node_addon",
     "crates/solidity/outputs/cargo/slang_solidity",
@@ -60,6 +62,8 @@ codegen_testing = { path = "crates/codegen/testing" }
 infra_cli = { path = "crates/infra/cli" }
 infra_utils = { path = "crates/infra/utils" }
 
+metaslang_cst = { path = "crates/metaslang/cst" }
+
 slang_solidity = { path = "crates/solidity/outputs/cargo/slang_solidity" }
 slang_solidity_node_addon = { path = "crates/solidity/outputs/cargo/slang_solidity_node_addon" }
 solidity_cargo_tests = { path = "crates/solidity/outputs/cargo/tests" }

crates/codegen/language/definition/src/compiler/analysis/mod.rs

@@ -1,5 +1,4 @@
 mod definitions;
-mod queries;
 mod reachability;
 mod references;
 mod utils;
@@ -10,7 +9,6 @@ use indexmap::IndexMap;
 use proc_macro2::Span;
 
 use crate::compiler::analysis::definitions::analyze_definitions;
-use crate::compiler::analysis::queries::analyze_queries;
 use crate::compiler::analysis::reachability::analyze_reachability;
 use crate::compiler::analysis::references::analyze_references;
 use crate::compiler::version_set::VersionSet;
@@ -64,7 +62,6 @@ impl Analysis {
         }
 
         analyze_reachability(&mut analysis);
-        analyze_queries(&mut analysis);
 
         analysis
     }

crates/codegen/language/definition/src/model/manifest.rs

@@ -2,7 +2,7 @@ use std::collections::BTreeSet;
 use std::path::PathBuf;
 
 use codegen_language_internal_macros::{derive_spanned_type, ParseInputTokens, WriteOutputTokens};
-use indexmap::{IndexMap, IndexSet};
+use indexmap::IndexSet;
 use semver::Version;
 use serde::{Deserialize, Serialize};
 
@@ -22,8 +22,6 @@ pub struct Language {
     pub versions: IndexSet<Version>,
 
     pub sections: Vec<Section>,
-
-    pub queries: IndexMap<Identifier, String>,
 }
 
 impl Language {

crates/codegen/language/tests/src/fail/definitions/duplicate_expression_name/test.rs

@@ -27,8 +27,7 @@ codegen_language_macros::compile!(Language(
                 )
             ]
         )]
-    )],
-    queries = ()
+    )]
 ));
 
 fn main() {}

crates/codegen/language/tests/src/fail/definitions/duplicate_item_name/test.rs

@@ -17,8 +17,7 @@ codegen_language_macros::compile!(Language(
                 Struct(name = Bar2, fields = (field = Required(Bar1)))
             ]
         )]
-    )],
-    queries = ()
+    )]
 ));
 
 fn main() {}

crates/codegen/language/tests/src/fail/definitions/duplicate_variant_name/test.rs

@@ -30,8 +30,7 @@ codegen_language_macros::compile!(Language(
                 )
             ]
         )]
-    )],
-    queries = ()
+    )]
 ));
 
 fn main() {}

crates/codegen/language/tests/src/fail/parsing/duplicate_map_key/test.rs

@@ -26,8 +26,7 @@ codegen_language_macros::compile!(Language(
                 )
             ]
         )]
-    )],
-    queries = ()
+    )]
 ));
 
 fn main() {}

crates/codegen/language/tests/src/fail/parsing/duplicate_set_entry/test.rs

@@ -16,8 +16,7 @@ codegen_language_macros::compile!(Language(
                 definitions = [TokenDefinition(scanner = Atom("bar"))]
             )]
         )]
-    )],
-    queries = ()
+    )]
 ));
 
 fn main() {}

crates/codegen/language/tests/src/fail/parsing/empty_string/test.rs

@@ -16,8 +16,7 @@ codegen_language_macros::compile!(Language(
                 definitions = [TokenDefinition(scanner = Atom(""))]
             )]
         )]
-    )],
-    queries = ()
+    )]
 ));
 
 fn main() {}

crates/codegen/language/tests/src/fail/parsing/missing_field/test.rs

@@ -10,8 +10,7 @@ codegen_language_macros::compile!(Language(
     sections = [Section(
         // title = "Section One"
         topics = []
-    )],
-    queries = ()
+    )]
 ));
 
 fn main() {}

crates/codegen/language/tests/src/fail/parsing/unrecognized_field/test.rs

@@ -17,8 +17,7 @@ codegen_language_macros::compile!(Language(
             )],
             unrecognized_field = true
         )]
-    )],
-    queries = ()
+    )]
 ));
 
 fn main() {}

crates/codegen/language/tests/src/fail/parsing/unrecognized_variant/test.rs

@@ -19,8 +19,7 @@ codegen_language_macros::compile!(Language(
             ),
             Topic(title = "Topic Two", items = [Unrecognized(true)])
         ]
-    )],
-    queries = ()
+    )]
 ));
 
 fn main() {}

crates/codegen/language/tests/src/fail/reachability/unreachable/test.rs

@@ -20,8 +20,7 @@ codegen_language_macros::compile!(Language(
                 Struct(name = Baz2, fields = (field = Required(Baz1)))
             ]
         )]
-    )],
-    queries = ()
+    )]
 ));
 
 fn main() {}

crates/codegen/language/tests/src/fail/reachability/unused_version/test.rs

@@ -22,8 +22,7 @@ codegen_language_macros::compile!(Language(
                 )
             ]
         )]
-    )],
-    queries = ()
+    )]
 ));
 
 fn main() {}

crates/codegen/language/tests/src/fail/references/disabled_too_late/test.rs

@@ -33,8 +33,7 @@ codegen_language_macros::compile!(Language(
                 )
             ]
         )]
-    )],
-    queries = ()
+    )]
 ));
 
 fn main() {}

crates/codegen/language/tests/src/fail/references/enabled_too_early/test.rs

@@ -33,8 +33,7 @@ codegen_language_macros::compile!(Language(
                 )
             ]
         )]
-    )],
-    queries = ()
+    )]
 ));
 
 fn main() {}

crates/codegen/language/tests/src/fail/references/invalid_filter/test.rs

@@ -16,8 +16,7 @@ codegen_language_macros::compile!(Language(
                 Fragment(name = Baz, scanner = Atom("baz"))
             ]
         )]
-    )],
-    queries = ()
+    )]
 ));
 
 fn main() {}

crates/codegen/language/tests/src/fail/references/invalid_version/test.rs

@@ -45,8 +45,7 @@ codegen_language_macros::compile!(Language(
                 )
             ]
         )]
-    )],
-    queries = ()
+    )]
 ));
 
 fn main() {}

crates/codegen/language/tests/src/fail/references/unknown_reference/test.rs

@@ -22,8 +22,7 @@ codegen_language_macros::compile!(Language(
                 )
             ]
         )]
-    )],
-    queries = ()
+    )]
 ));
 
 fn main() {}

crates/codegen/language/tests/src/fail/references/unordered_version_pair/test.rs

@@ -28,8 +28,7 @@ codegen_language_macros::compile!(Language(
                 )
             ]
         )]
-    )],
-    queries = ()
+    )]
 ));
 
 fn main() {}

crates/codegen/language/tests/src/fail/references/version_not_found/test.rs

@@ -25,8 +25,7 @@ codegen_language_macros::compile!(Language(
                 )
             ]
         )]
-    )],
-    queries = ()
+    )]
 ));
 
 fn main() {}

crates/codegen/language/tests/src/pass/tiny_language.rs

@@ -37,8 +37,7 @@ codegen_language_macros::compile!(Language(
                 )
             ]
         )]
-    )],
-    queries = ()
+    )]
 ));
 
 #[test]
@@ -118,8 +117,7 @@ fn definition() {
                     ]
                     .into()
                 }],
-            }],
-            queries: [].into()
+            }]
         }
         .into(),
     );

crates/codegen/runtime/cargo/Cargo.toml

@@ -13,9 +13,9 @@ codegen_runtime_generator = { workspace = true }
 
 [dependencies]
 ariadne = { workspace = true }
+metaslang_cst = { workspace = true }
 napi = { workspace = true, optional = true }
 napi-derive = { workspace = true, optional = true }
-nom = { workspace = true }
 semver = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true, optional = true }

crates/codegen/runtime/cargo/src/lib.rs

@@ -1,6 +1,5 @@
 #![allow(dead_code)]
 
 mod runtime;
-mod user_defined;
 
 pub use runtime::*;