Extended number formatting #312

triallax · 2024-02-05T15:36:27Z

Fixes #264.

TODO:

Add format specifiers for strings (and possibly other types?)
Fix todos
Check that format specifiers are valid (currently anything invalid will crash Numbat)
Fix units not being printed in quantity interpolations with format specifiers
Research possible choices other than strfmt
Add tests
Document
Improve error messages

numbat/src/ast.rs

numbat/src/parser.rs

numbat/src/tokenizer.rs

numbat/src/typechecker.rs

numbat/src/value.rs

numbat/src/ast.rs

numbat/src/bytecode_interpreter.rs

numbat/src/parser.rs

book/src/example-numbat_syntax.md

sharkdp · 2024-03-19T20:33:59Z

book/src/procedures.md

@@ -26,6 +26,15 @@ let speed = 25 km/h
 print("Speed of the bicycle: {speed} ({speed -> mph})")
 ```

+Rust-style format specifiers are also supported in interpolations. For instance:


Let's not put too much emphasis on rust maybe?

Suggested change

Rust-style format specifiers are also supported in interpolations. For instance:

Format specifiers are also supported in interpolations. For instance:

book/src/procedures.md

examples/numbat_syntax.nbt

numbat/src/vm.rs

numbat/src/value.rs

sharkdp · 2024-03-19T20:50:04Z

numbat/src/vm.rs

+                                        strfmt::strfmt(&format!("{{value{}}}", specifiers), &vars)
+                                            .map_err(|err| match err {
+                                                strfmt::FmtError::Invalid(s) => {
+                                                    RuntimeError::InvalidFormatSpecifiers(s)
+                                                }
+                                                strfmt::FmtError::KeyError(_) => unreachable!(),
+                                                strfmt::FmtError::TypeError(s) => {
+                                                    RuntimeError::InvalidTypeForFormatSpecifiers(s)
+                                                }
+                                            })?;


Can we please extract this into a function to avoid the duplication?

The best I could do was extracting the function passed to map_err. I couldn't get the strfmt::strfmt(...) portion to be shared between the two branches because vars has a different type in each branch (in one its values are of type f64, in the other of type String. I could maybe do some generic shenanigans or, god forbid, use a macro, but doesn't seem worth it to me.

sharkdp

Very nice! Just a couple of minor suggestions.

Fixes #264.

sharkdp

Thank you!

triallax · 2024-03-20T19:12:56Z

Thanks!

sharkdp · 2024-03-20T19:15:27Z

Changes are live on https://numbat.dev/

triallax commented Feb 5, 2024

View reviewed changes

numbat/src/ast.rs Outdated Show resolved Hide resolved

numbat/src/parser.rs Outdated Show resolved Hide resolved

numbat/src/tokenizer.rs Outdated Show resolved Hide resolved

triallax force-pushed the extended-number-formatting branch from f8ec0af to 92504d2 Compare February 19, 2024 13:20

sharkdp reviewed Feb 19, 2024

View reviewed changes

numbat/src/typechecker.rs Outdated Show resolved Hide resolved

sharkdp reviewed Feb 19, 2024

View reviewed changes

numbat/src/value.rs Outdated Show resolved Hide resolved

sharkdp reviewed Feb 19, 2024

View reviewed changes

numbat/src/ast.rs Outdated Show resolved Hide resolved

sharkdp reviewed Feb 19, 2024

View reviewed changes

numbat/src/bytecode_interpreter.rs Outdated Show resolved Hide resolved

sharkdp reviewed Feb 19, 2024

View reviewed changes

numbat/src/parser.rs Outdated Show resolved Hide resolved

triallax force-pushed the extended-number-formatting branch from 19f3532 to f5c5ea1 Compare February 26, 2024 10:50

triallax force-pushed the extended-number-formatting branch from f5c5ea1 to f281c35 Compare March 12, 2024 17:34

triallax marked this pull request as ready for review March 12, 2024 17:34