language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-29 06:44:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fix incorrect layout for Switch

Browse source
This commit is contained in:
Folkert 2020-03-20 19:56:50 +01:00
parent d0da300042
commit 0f22cbbf7d
3 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/mono/src/expr.rs
View file

@ -890,6 +890,7 @@ fn store_pattern<'a>(
Underscore => {
// ignore
}
IntLiteral(_) | FloatLiteral(_) | EnumLiteral { .. } | BitLiteral(_) => {}
_ => {
// store the field in a symbol, and continue matching on it
let symbol = env.fresh_symbol();
@ -927,6 +928,7 @@ fn store_record_destruct<'a>(
struct_layout: Layout<'a>,
stored: &mut Vec<'a, (Symbol, Layout<'a>, Expr<'a>)>,
) -> Result<(), String> {
use Pattern::*;
let record = env.arena.alloc(Expr::Load(outer_symbol));
let load = Expr::Access {
label: destruct.label.clone(),
@ -939,10 +941,10 @@ fn store_record_destruct<'a>(
stored.push((destruct.symbol, destruct.layout.clone(), load));
}
Some(guard_pattern) => match &guard_pattern {
Pattern::Identifier(symbol) => {
Identifier(symbol) => {
stored.push((*symbol, destruct.layout.clone(), load));
}
Pattern::Underscore => {
Underscore => {
// important that this is special-cased to do nothing: mono record patterns will extract all the
// fields, but those not bound in the source code are guarded with the underscore
// pattern. So given some record `{ x : a, y : b }`, a match
@ -955,6 +957,7 @@ fn store_record_destruct<'a>(
//
// internally. But `y` is never used, so we must make sure it't not stored/loaded.
}
IntLiteral(_) | FloatLiteral(_) | EnumLiteral { .. } | BitLiteral(_) => {}
_ => {
let symbol = env.fresh_symbol();
stored.push((symbol, destruct.layout.clone(), load));