sfja.skp/thiselang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add more fancy_string

Browse Source
This commit is contained in:
SimonFJ20 2023-03-19 04:40:25 +01:00
parent ae5ead91da
commit 663bf954f6
2 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/ast.rs
View File

@ -223,9 +223,18 @@ impl AstNode for Expr {
None => "None".to_string(), None => "None".to_string(),
}, },
), ),
Expr::FunctionValue { parameters, body } => format!("FunctionValue <...>"), Expr::FunctionValue {
Expr::Member { subject, value } => format!("Member <...>"), parameters: _,
Expr::Index { subject, value } => format!("Index <...>"), body: _,
} => format!("FunctionValue <...>"),
Expr::Member {
subject: _,
value: _,
} => format!("Member <...>"),
Expr::Index {
subject: _,
value: _,
} => format!("Index <...>"),
Expr::Call { subject, arguments } => format!( Expr::Call { subject, arguments } => format!(
"Call\n{}subject: {}\n{}arguments:\n{}", "Call\n{}subject: {}\n{}arguments:\n{}",
indent(depth + 1), indent(depth + 1),
@ -242,6 +251,7 @@ impl AstNode for Expr {
acc.push_str(&v); acc.push_str(&v);
acc acc
}) })
.map(|s| s.trim_end().to_string())
.unwrap_or("".to_string()), .unwrap_or("".to_string()),
), ),
Expr::Unary { Expr::Unary {
@ -267,12 +277,12 @@ impl AstNode for Expr {
indent(depth + 1), indent(depth + 1),
right.fancy_string(depth + 1), right.fancy_string(depth + 1),
), ),
Expr::RangeExclusive { begin, end } => format!("RangeExclusive <...>"), Expr::RangeExclusive { begin: _, end: _ } => format!("RangeExclusive <...>"),
Expr::RangeInclusive { begin, end } => format!("RangeInclusive <...>"), Expr::RangeInclusive { begin: _, end: _ } => format!("RangeInclusive <...>"),
Expr::Assign { Expr::Assign {
assign_type, assign_type: _,
subject, subject: _,
value, value: _,
} => format!("Assign <...>"), } => format!("Assign <...>"),
Expr::Let { subject, value } => format!( Expr::Let { subject, value } => format!(
"Let {{\n{}subject: {}\n{}value: {}\n{}}}", "Let {{\n{}subject: {}\n{}value: {}\n{}}}",
@ -287,11 +297,14 @@ impl AstNode for Expr {
), ),
Expr::Continue => format!("Continue"), Expr::Continue => format!("Continue"),
Expr::Break => format!("Break"), Expr::Break => format!("Break"),
Expr::While { condition, body } => format!("While <...>"), Expr::While {
condition: _,
body: _,
} => format!("While <...>"),
Expr::For { Expr::For {
subject, subject: _,
value, value: _,
body, body: _,
} => format!("For <...>"), } => format!("For <...>"),
Expr::Return(value) => format!( Expr::Return(value) => format!(
"Return{}", "Return{}",
@ -329,7 +342,7 @@ impl AstNode for Expr {
body.fancy_string(depth + 1) body.fancy_string(depth + 1)
), ),
Expr::Block { statements, value } => format!( Expr::Block { statements, value } => format!(
"Block\n{}statements:\n{}{}value: {}", "Block\n{}statements:\n{}{}value: \n{}{}",
indent(depth + 1), indent(depth + 1),
statements statements
.iter() .iter()
@ -344,8 +357,9 @@ impl AstNode for Expr {
}) })
.unwrap_or("".to_string()), .unwrap_or("".to_string()),
indent(depth + 1), indent(depth + 1),
indent(depth + 2),
match value { match value {
Some(expr) => expr.fancy_string(depth + 1), Some(expr) => expr.fancy_string(depth + 2),
None => "None".to_string(), None => "None".to_string(),
}, },
), ),
@ -355,17 +369,17 @@ impl AstNode for Expr {
} }
impl AstNode for ObjectEntry { impl AstNode for ObjectEntry {
fn fancy_string(&self, depth: usize) -> String { fn fancy_string(&self, _depth: usize) -> String {
match self { match self {
ObjectEntry::Error(message) => format!("Error({message})"), ObjectEntry::Error(message) => format!("Error({message})"),
ObjectEntry::Pair { key, value } => format!("Pair <...>"), ObjectEntry::Pair { key: _, value: _ } => format!("Pair <...>"),
ObjectEntry::Spread(_) => format!("Spread <...>"), ObjectEntry::Spread(_) => format!("Spread <...>"),
} }
} }
} }
impl AstNode for Parameter { impl AstNode for Parameter {
fn fancy_string(&self, depth: usize) -> String { fn fancy_string(&self, _depth: usize) -> String {
match self { match self {
Parameter::Error(message) => format!("Error({message})"), Parameter::Error(message) => format!("Error({message})"),
Parameter::Id { name, mutable } => { Parameter::Id { name, mutable } => {

1
src/main.rs
View File

@ -20,6 +20,7 @@ fn main() {
{ {
fn myfunc(a, b) { fn myfunc(a, b) {
let c = a;
return a + b; return a + b;
} }
myfunc(1, 2); myfunc(1, 2);