language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-26 13:29:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

add ingest file to can ir and start pipelining it through the compiler

Browse source
This commit is contained in:
Brendan Hansknecht 2023-04-03 17:40:54 -07:00
parent 7c77f7c2a2
commit d42aa43b41
No known key found for this signature in database
GPG key ID: 0EA784685083E75B
7 changed files with 59 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/compiler/can/src/copy.rs
View file

@ -277,6 +277,7 @@ fn deep_copy_expr_help<C: CopyEnv>(env: &mut C, copied: &mut Vec<Variable>, expr
Float(v1, v2, str, val, bound) => Float(sub!(*v1), sub!(*v2), str.clone(), *val, *bound),
Str(str) => Str(str.clone()),
SingleQuote(v1, v2, char, bound) => SingleQuote(sub!(*v1), sub!(*v2), *char, *bound),
IngestedFile(bytes, anno) => IngestedFile(bytes.clone(), anno.clone()),
List {
elem_var,
loc_elems,

1
crates/compiler/can/src/debug/pretty_print.rs
View file

@ -165,6 +165,7 @@ fn expr<'a>(c: &Ctx, p: EPrec, f: &'a Arena<'a>, e: &'a Expr) -> DocBuilder<'a,
Num(_, n, _, _) | Int(_, _, n, _, _) | Float(_, _, n, _, _) => f.text(&**n),
Str(s) => f.text(format!(r#""{}""#, s)),
SingleQuote(_, _, c, _) => f.text(format!("'{}'", c)),
IngestedFile(_,_) => todo!("I am not really sure how we want this to be printed. file name? all bytes? as correct type?"),
List {
elem_var: _,
loc_elems,

81
crates/compiler/can/src/expr.rs
View file

@ -1,5 +1,5 @@
use crate::abilities::SpecializationId;
use crate::annotation::{freshen_opaque_def, IntroducedVariables};
use crate::annotation::{self, freshen_opaque_def, IntroducedVariables};
use crate::builtins::builtin_defs_map;
use crate::def::{can_defs_with_return, Annotation, Def};
use crate::env::Env;
@ -102,6 +102,9 @@ pub enum Expr {
loc_elems: Vec<Loc<Expr>>,
},
// The bytes of a file and the expected type annotation.
IngestedFile(Vec<u8>, annotation::Annotation),
// Lookups
Var(Symbol, Variable),
AbilityMember(
@ -299,6 +302,19 @@ impl Expr {
Self::Int(..) => Category::Int,
Self::Float(..) => Category::Frac,
Self::Str(..) => Category::Str,
Self::IngestedFile(_, anno) => {
dbg!(&anno);
todo!()
// if let Type::Apply(0, 1, 2) = anno.typ {
// Category::Str
// } else if let Type::Apply(_, _, _) = anno.typ {
// Category::List
// } else {
// todo!(
// "Not sure how we should handle other types here that are probably invalid"
// )
// }
}
Self::SingleQuote(..) => Category::Character,
Self::List { .. } => Category::List,
&Self::Var(sym, _) => Category::Lookup(sym),
@ -732,50 +748,25 @@ pub fn canonicalize_expr<'a>(
ast::Expr::Str(literal) => flatten_str_literal(env, var_store, scope, literal),
ast::Expr::IngestedFile(file_path, type_ann) => {
use ast::TypeAnnotation::Apply;
if let Apply("", "Str", &[]) = type_ann.value {
match std::fs::read_to_string(file_path) {
Ok(data) => (Expr::Str(data.into_boxed_str()), Output::default()),
// TODO: Also handle when it returns an error converting to UTF8 explicitly.
Err(e) => todo!("Handle err case of loading a string from a file: {:?}", e),
}
} else if let Apply(
"",
"List",
&[Loc {
value: Apply("", "U8", &[]),
..
}],
) = type_ann.value
{
let mut file =
File::open(file_path).expect("file should exist due to earlier check");
let mut bytes = vec![];
match file.read_to_end(&mut bytes) {
Ok(_) => (
Expr::List {
elem_var: Variable::U8,
loc_elems: bytes
.iter()
.map(|b| {
Loc::at_zero(Expr::Int(
Variable::U8,
Variable::U8,
b.to_string().into_boxed_str(),
IntValue::U128((*b as u128).to_ne_bytes()),
IntBound::None,
))
})
.collect(),
},
Output::default(),
let mut file = File::open(file_path).expect("file should exist due to earlier check. In the rare case the file got deleted, we should create a can error here too.");
let mut bytes = vec![];
match file.read_to_end(&mut bytes) {
Ok(_) => (
Expr::IngestedFile(
bytes,
annotation::canonicalize_annotation(
env,
scope,
&type_ann.value,
region,
var_store,
&VecMap::default(),
annotation::AnnotationFor::Value,
),
),
Err(e) => todo!("Handle err case of loading bytes from a file: {:?}", e),
}
} else {
// env.problems.push(Problem::BadTypeArguments)
todo!("properly return a type error")
Output::default(),
),
Err(e) => todo!("failed to load file emit can error: {}", e),
}
}
@ -1904,6 +1895,7 @@ pub fn inline_calls(var_store: &mut VarStore, expr: Expr) -> Expr {
| other @ Int(..)
| other @ Float(..)
| other @ Str { .. }
| other @ IngestedFile(..)
| other @ SingleQuote(..)
| other @ RuntimeError(_)
| other @ EmptyRecord
@ -3035,6 +3027,7 @@ pub(crate) fn get_lookup_symbols(expr: &Expr) -> Vec<ExpectLookup> {
| Expr::Float(_, _, _, _, _)
| Expr::Int(_, _, _, _, _)
| Expr::Str(_)
| Expr::IngestedFile(_, _)
| Expr::ZeroArgumentTag { .. }
| Expr::RecordAccessor(_)
| Expr::SingleQuote(..)

1
crates/compiler/can/src/module.rs
View file

@ -1093,6 +1093,7 @@ fn fix_values_captured_in_closure_expr(
| Float(..)
| Str(_)
| SingleQuote(..)
| IngestedFile(..)
| Var(..)
| AbilityMember(..)
| EmptyRecord

1
crates/compiler/can/src/traverse.rs
View file

@ -257,6 +257,7 @@ pub fn walk_expr<V: Visitor>(visitor: &mut V, expr: &Expr, var: Variable) {
Expr::Int(..) => { /* terminal */ }
Expr::Float(..) => { /* terminal */ }
Expr::Str(..) => { /* terminal */ }
Expr::IngestedFile(..) => { /* terminal */ }
Expr::SingleQuote(..) => { /* terminal */ }
Expr::List {
elem_var,