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

temp_type_impl: pretty-print functions

Browse Source
This commit is contained in:
John 2024-03-01 02:47:07 -06:00
parent 1eec1b06ce
commit 09737aa40b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cl-interpret/src/lib.rs
View File

@ -282,7 +282,9 @@ pub mod temp_type_impl {
')'.fmt(f) ')'.fmt(f)
} }
ConValue::Function(func) => { ConValue::Function(func) => {
write!(f, "fn {}", func.name()) use cl_ast::format::*;
use std::fmt::Write;
write!(f.pretty(), "{}", func.decl())
} }
ConValue::BuiltIn(func) => { ConValue::BuiltIn(func) => {
write!(f, "{}", func.description()) write!(f, "{}", func.description())
@ -311,6 +313,9 @@ pub mod function {
pub fn new(decl: &FnDecl) -> Self { pub fn new(decl: &FnDecl) -> Self {
Self { decl: decl.clone().into() } Self { decl: decl.clone().into() }
} }
pub fn decl(&self) -> &FnDecl {
&self.decl
}
} }
impl Callable for Function { impl Callable for Function {
@ -592,7 +597,11 @@ pub mod error {
write!(f, "{value} is not callable.") write!(f, "{value} is not callable.")
} }
Error::ArgNumber { want, got } => { Error::ArgNumber { want, got } => {
write!(f, "Expected {want} arguments, got {got}") write!(
f,
"Expected {want} argument{}, got {got}",
if *want == 1 { "" } else { "s" }
)
} }
Error::NullPointer => { Error::NullPointer => {
write!(f, "Attempted to dereference a null pointer?") write!(f, "Attempted to dereference a null pointer?")