Move non-boilerplate impls out of impls.rs
diff --git a/syntax/names.rs b/syntax/names.rs
new file mode 100644
index 0000000..a61ffc3
--- /dev/null
+++ b/syntax/names.rs
@@ -0,0 +1,72 @@
+use crate::syntax::{CppName, Namespace, Pair, ResolvableName, Symbol, Types};
+use proc_macro2::{Ident, Span};
+use syn::Token;
+
+impl Pair {
+ /// Use this constructor when the item can't have a different
+ /// name in Rust and C++.
+ pub fn new(ns: Namespace, ident: Ident) -> Self {
+ Self {
+ rust: ident.clone(),
+ cxx: CppName::new(ns, ident),
+ }
+ }
+
+ /// Use this constructor when attributes such as #[rust_name]
+ /// can be used to potentially give a different name in Rust vs C++.
+ pub fn new_from_differing_names(ns: Namespace, cxx_ident: Ident, rust_ident: Ident) -> Self {
+ Self {
+ rust: rust_ident,
+ cxx: CppName::new(ns, cxx_ident),
+ }
+ }
+}
+
+impl ResolvableName {
+ pub fn new(ident: Ident) -> Self {
+ Self { rust: ident }
+ }
+
+ pub fn make_self(span: Span) -> Self {
+ Self {
+ rust: Token.into(),
+ }
+ }
+
+ pub fn is_self(&self) -> bool {
+ self.rust == "Self"
+ }
+
+ pub fn span(&self) -> Span {
+ self.rust.span()
+ }
+
+ pub fn to_symbol(&self, types: &Types) -> Symbol {
+ types.resolve(self).to_symbol()
+ }
+}
+
+impl CppName {
+ pub fn new(ns: Namespace, ident: Ident) -> Self {
+ Self { ns, ident }
+ }
+
+ fn iter_all_segments(&self) -> impl Iterator<Item = &Ident> {
+ self.ns.iter().chain(std::iter::once(&self.ident))
+ }
+
+ fn join(&self, sep: &str) -> String {
+ self.iter_all_segments()
+ .map(|s| s.to_string())
+ .collect::<Vec<_>>()
+ .join(sep)
+ }
+
+ pub fn to_symbol(&self) -> Symbol {
+ Symbol::from_idents(self.iter_all_segments())
+ }
+
+ pub fn to_fully_qualified(&self) -> String {
+ format!("::{}", self.join("::"))
+ }
+}