j/Conlang
1
1
Fork 0
Code Issues 5 Pull Requests Packages Projects 2 Releases Wiki Activity

cl-ast: improve formatting of enums

Browse Source
This commit is contained in:
John 2024-04-01 04:18:31 -05:00
parent 8ee318f26b
commit bdf0bb68ca
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cl-ast/src/ast_impl.rs
View File

@ -13,6 +13,8 @@ mod display {
pub open: &'t str, pub open: &'t str,
pub close: &'t str, pub close: &'t str,
} }
/// Delimits with braces decorated with spaces `" {n"`, ..., `"\n}"`
pub const SPACED_BRACES: Delimiters = Delimiters { open: " {\n", close: "\n}" };
/// Delimits with braces on separate lines `{\n`, ..., `\n}` /// Delimits with braces on separate lines `{\n`, ..., `\n}`
pub const BRACES: Delimiters = Delimiters { open: "{\n", close: "\n}" }; pub const BRACES: Delimiters = Delimiters { open: "{\n", close: "\n}" };
/// Delimits with parentheses on separate lines `{\n`, ..., `\n}` /// Delimits with parentheses on separate lines `{\n`, ..., `\n}`
@ -190,9 +192,7 @@ mod display {
match self { match self {
StructKind::Empty => ';'.fmt(f), StructKind::Empty => ';'.fmt(f),
StructKind::Tuple(v) => delimit(separate(v, ", "), INLINE_PARENS)(f), StructKind::Tuple(v) => delimit(separate(v, ", "), INLINE_PARENS)(f),
StructKind::Struct(v) => { StructKind::Struct(v) => delimit(separate(v, ",\n"), SPACED_BRACES)(f),
delimit(separate(v, ",\n"), Delimiters { open: " {\n", ..BRACES })(f)
}
} }
} }
} }
@ -211,8 +211,8 @@ mod display {
impl Display for EnumKind { impl Display for EnumKind {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self { match self {
EnumKind::NoVariants => todo!(), EnumKind::NoVariants => ';'.fmt(f),
EnumKind::Variants(v) => separate(v, ", ")(f), EnumKind::Variants(v) => delimit(separate(v, ",\n"), SPACED_BRACES)(f),
} }
} }
} }
@ -226,9 +226,9 @@ mod display {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self { match self {
VariantKind::Plain => Ok(()), VariantKind::Plain => Ok(()),
VariantKind::CLike(n) => n.fmt(f), VariantKind::CLike(n) => write!(f, " = {n}"),
VariantKind::Tuple(v) => delimit(separate(v, ", "), INLINE_PARENS)(f), VariantKind::Tuple(v) => delimit(separate(v, ", "), INLINE_PARENS)(f),
VariantKind::Struct(v) => delimit(separate(v, ",\n"), BRACES)(f), VariantKind::Struct(v) => delimit(separate(v, ", "), INLINE_BRACES)(f),
} }
} }
} }
@ -563,7 +563,6 @@ mod display {
} }
} }
mod convert { mod convert {
//! Converts between major enums and enum variants //! Converts between major enums and enum variants
use super::*; use super::*;