DeCarabas/oden
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[fine] Empty blocks generate nothing

Browse source
This commit is contained in:
John Doty 2024-01-06 11:00:31 -08:00
parent 8835d9eaf2
commit 56e4be9a5b
3 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
fine/src/semantics.rs
View file

@ -347,10 +347,10 @@ impl<'a> Semantics<'a> {
return None; return None;
} }
// if tree.children.len() == 2 { if tree.children.len() == 2 {
// // Empty blocks generate Nothing. // Empty blocks generate Nothing.
// return Some(Type::Nothing); return Some(Type::Nothing);
// } }
// The type of the block is the type of the last expression. // The type of the block is the type of the last expression.
// (But the last child is the closing brace probably?) // (But the last child is the closing brace probably?)
@ -359,6 +359,9 @@ impl<'a> Semantics<'a> {
let mut is_unreachable = false; let mut is_unreachable = false;
for i in 1..last_index { for i in 1..last_index {
// TODO: if `is_unreachable` here then we actually have
// unreachable code here! We should warn about it I guess.
is_unreachable = self is_unreachable = self
.type_of(tree.nth_tree(i)?) .type_of(tree.nth_tree(i)?)
.map(|t| matches!(t, Type::Unreachable)) .map(|t| matches!(t, Type::Unreachable))

2
fine/tests/example_tests.rs
View file

@ -16,7 +16,7 @@ fn rebase_concrete(source_path: &str, dump: &str) {
result.push_str(line); result.push_str(line);
result.push_str("\n"); result.push_str("\n");
if line == "// concrete:" { if line == "// @concrete:" {
found_concrete_section = true; found_concrete_section = true;
break; break;
} }

10
fine/tests/expression/block.fine Normal file
View file

@ -0,0 +1,10 @@
// @concrete:
// | File
// | Block
// | LeftBrace:'"{"'
// | RightBrace:'"}"'
// |
{}
// @type: 94 ()