language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-02 00:01:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Parse and expand numeric bounds in canonicalization pass

Browse source
This commit is contained in:
ayazhafiz 2022-02-01 22:48:29 -05:00
parent 17c5fe0bff
commit a6f7579c07
113 changed files with 472 additions and 1361 deletions
Download patch file Download diff file Expand all files Collapse all files

29
compiler/fmt/src/expr.rs
View file

@ -6,8 +6,7 @@ use crate::spaces::{fmt_comments_only, fmt_spaces, NewlineAt, INDENT};
use crate::Buf;
use roc_module::called_via::{self, BinOp};
use roc_parse::ast::{
AssignedField, Base, Collection, CommentOrNewline, Expr, ExtractSpaces, NumericBound, Pattern,
WhenBranch,
AssignedField, Base, Collection, CommentOrNewline, Expr, ExtractSpaces, Pattern, WhenBranch,
};
use roc_parse::ast::{StrLiteral, StrSegment};
use roc_region::all::Loc;
@ -30,7 +29,6 @@ impl<'a> Formattable for Expr<'a> {
// These expressions never have newlines
Float(..)
| Num(..)
| Int(..)
| NonBase10Int { .. }
| Access(_, _)
| AccessorFunction(_)
@ -198,29 +196,13 @@ impl<'a> Formattable for Expr<'a> {
buf.push(')');
}
}
&Num(string, bound) => {
&Num(string) => {
buf.indent(indent);
buf.push_str(string);
if let NumericBound::Exact(width) = bound {
buf.push_str(&width.to_string());
}
}
&Float(string, bound) => {
&Float(string) => {
buf.indent(indent);
buf.push_str(string);
if let NumericBound::Exact(width) = bound {
buf.push_str(&width.to_string());
}
}
&Int(string, bound) => {
buf.indent(indent);
buf.push_str(string);
if let NumericBound::Exact(width) = bound {
buf.push_str(&width.to_string());
}
}
GlobalTag(string) | PrivateTag(string) => {
buf.indent(indent);
@ -230,7 +212,6 @@ impl<'a> Formattable for Expr<'a> {
base,
string,
is_negative,
bound,
} => {
buf.indent(indent);
if is_negative {
@ -245,10 +226,6 @@ impl<'a> Formattable for Expr<'a> {
}
buf.push_str(string);
if let NumericBound::Exact(width) = bound {
buf.push_str(&width.to_string());
}
}
Record(fields) => {
fmt_record(buf, None, *fields, indent);

25
compiler/fmt/src/pattern.rs
View file

@ -1,7 +1,7 @@
use crate::annotation::{Formattable, Newlines, Parens};
use crate::spaces::{fmt_comments_only, fmt_spaces, NewlineAt};
use crate::Buf;
use roc_parse::ast::{Base, NumericBound, Pattern};
use roc_parse::ast::{Base, Pattern};
pub fn fmt_pattern<'a, 'buf>(
buf: &mut Buf<'buf>,
@ -32,7 +32,6 @@ impl<'a> Formattable for Pattern<'a> {
| Pattern::PrivateTag(_)
| Pattern::Apply(_, _)
| Pattern::NumLiteral(..)
| Pattern::IntLiteral(..)
| Pattern::NonBase10Literal { .. }
| Pattern::FloatLiteral(..)
| Pattern::StrLiteral(_)
@ -117,25 +116,14 @@ impl<'a> Formattable for Pattern<'a> {
loc_pattern.format(buf, indent);
}
&NumLiteral(string, bound) => {
&NumLiteral(string) => {
buf.indent(indent);
buf.push_str(string);
if let NumericBound::Exact(width) = bound {
buf.push_str(&width.to_string());
}
}
&IntLiteral(string, bound) => {
buf.indent(indent);
buf.push_str(string);
if let NumericBound::Exact(width) = bound {
buf.push_str(&width.to_string());
}
}
&NonBase10Literal {
base,
string,
is_negative,
bound,
} => {
buf.indent(indent);
if is_negative {
@ -150,17 +138,10 @@ impl<'a> Formattable for Pattern<'a> {
}
buf.push_str(string);
if let NumericBound::Exact(width) = bound {
buf.push_str(&width.to_string());
}
}
&FloatLiteral(string, bound) => {
&FloatLiteral(string) => {
buf.indent(indent);
buf.push_str(string);
if let NumericBound::Exact(width) = bound {
buf.push_str(&width.to_string());
}
}
StrLiteral(literal) => {
todo!("Format string literal: {:?}", literal);