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

Merge branch 'temp_numbers' into int_a_float_a

Browse source
This commit is contained in:
rvcas 2020-12-30 19:59:20 -05:00
commit 9dbcfb7a97
14 changed files with 493 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/can/src/expr.rs
View file

@ -56,8 +56,8 @@ pub enum Expr {
Num(Variable, i64),
// Int and Float store a variable to generate better error messages
Int(Variable, i64),
Float(Variable, f64),
Int(Variable, Variable, i64),
Float(Variable, Variable, f64),
Str(InlinableString),
List {
list_var: Variable, // required for uniqueness of the list
@ -1172,8 +1172,8 @@ pub fn inline_calls(var_store: &mut VarStore, scope: &mut Scope, expr: Expr) ->
// Num stores the `a` variable in `Num a`. Not the same as the variable
// stored in Int and Float below, which is strictly for better error messages
other @ Num(_, _)
| other @ Int(_, _)
| other @ Float(_, _)
| other @ Int(_, _, _)
| other @ Float(_, _, _)
| other @ Str { .. }
| other @ RuntimeError(_)
| other @ EmptyRecord