Compare commits
4 Commits
dbb88ad79d
...
12e1d4d4c2
Author | SHA1 | Date |
---|---|---|
Sébastien Bourdeauducq | 12e1d4d4c2 | |
Sébastien Bourdeauducq | d0ed143579 | |
Sébastien Bourdeauducq | c5fe70ec9a | |
Sébastien Bourdeauducq | 03d10a1907 |
250
src/main.rs
250
src/main.rs
|
@ -1,12 +1,11 @@
|
|||
use std::collections::HashMap;
|
||||
use std::collections::{HashMap, HashSet};
|
||||
use std::num::NonZeroUsize;
|
||||
use std::path::Path;
|
||||
use std::process::Command;
|
||||
use std::sync::Arc;
|
||||
|
||||
use parking_lot::Mutex;
|
||||
|
||||
use eframe::egui;
|
||||
use parking_lot::{Mutex, RwLock};
|
||||
|
||||
use nac3core::codegen;
|
||||
use nac3core::inkwell;
|
||||
|
@ -18,6 +17,188 @@ use nac3core::typecheck::{type_inferencer, typedef};
|
|||
mod basic_symbol_resolver;
|
||||
use basic_symbol_resolver::{Resolver, ResolverInternal};
|
||||
|
||||
fn handle_typevar_definition(
|
||||
var: &nac3parser::ast::Expr,
|
||||
resolver: &(dyn nac3core::symbol_resolver::SymbolResolver + Send + Sync),
|
||||
def_list: &[Arc<RwLock<toplevel::TopLevelDef>>],
|
||||
unifier: &mut nac3core::typecheck::typedef::Unifier,
|
||||
primitives: &type_inferencer::PrimitiveStore,
|
||||
) -> Result<typedef::Type, HashSet<String>> {
|
||||
let nac3parser::ast::ExprKind::Call { func, args, .. } = &var.node else {
|
||||
return Err(HashSet::from([format!(
|
||||
"expression {var:?} cannot be handled as a generic parameter in global scope"
|
||||
)]));
|
||||
};
|
||||
|
||||
match &func.node {
|
||||
nac3parser::ast::ExprKind::Name { id, .. } if id == &"TypeVar".into() => {
|
||||
let nac3parser::ast::ExprKind::Constant {
|
||||
value: nac3parser::ast::Constant::Str(ty_name),
|
||||
..
|
||||
} = &args[0].node
|
||||
else {
|
||||
return Err(HashSet::from([format!(
|
||||
"Expected string constant for first parameter of `TypeVar`, got {:?}",
|
||||
&args[0].node
|
||||
)]));
|
||||
};
|
||||
let generic_name: nac3parser::ast::StrRef = ty_name.to_string().into();
|
||||
|
||||
let constraints = args
|
||||
.iter()
|
||||
.skip(1)
|
||||
.map(|x| -> Result<typedef::Type, HashSet<String>> {
|
||||
let ty = toplevel::type_annotation::parse_ast_to_type_annotation_kinds(
|
||||
resolver,
|
||||
def_list,
|
||||
unifier,
|
||||
primitives,
|
||||
x,
|
||||
HashMap::new(),
|
||||
)?;
|
||||
toplevel::type_annotation::get_type_from_type_annotation_kinds(
|
||||
def_list, unifier, primitives, &ty, &mut None,
|
||||
)
|
||||
})
|
||||
.collect::<Result<Vec<_>, _>>()?;
|
||||
let loc = func.location;
|
||||
|
||||
if constraints.len() == 1 {
|
||||
return Err(HashSet::from([format!(
|
||||
"A single constraint is not allowed (at {loc})"
|
||||
)]));
|
||||
}
|
||||
|
||||
Ok(unifier
|
||||
.get_fresh_var_with_range(&constraints, Some(generic_name), Some(loc))
|
||||
.ty)
|
||||
}
|
||||
|
||||
nac3parser::ast::ExprKind::Name { id, .. } if id == &"ConstGeneric".into() => {
|
||||
if args.len() != 2 {
|
||||
return Err(HashSet::from([format!(
|
||||
"Expected 2 arguments for `ConstGeneric`, got {}",
|
||||
args.len()
|
||||
)]));
|
||||
}
|
||||
|
||||
let nac3parser::ast::ExprKind::Constant {
|
||||
value: nac3parser::ast::Constant::Str(ty_name),
|
||||
..
|
||||
} = &args[0].node
|
||||
else {
|
||||
return Err(HashSet::from([format!(
|
||||
"Expected string constant for first parameter of `ConstGeneric`, got {:?}",
|
||||
&args[0].node
|
||||
)]));
|
||||
};
|
||||
let generic_name: nac3parser::ast::StrRef = ty_name.to_string().into();
|
||||
|
||||
let ty = toplevel::type_annotation::parse_ast_to_type_annotation_kinds(
|
||||
resolver,
|
||||
def_list,
|
||||
unifier,
|
||||
primitives,
|
||||
&args[1],
|
||||
HashMap::new(),
|
||||
)?;
|
||||
let constraint = toplevel::type_annotation::get_type_from_type_annotation_kinds(
|
||||
def_list, unifier, primitives, &ty, &mut None,
|
||||
)?;
|
||||
let loc = func.location;
|
||||
|
||||
Ok(unifier
|
||||
.get_fresh_const_generic_var(constraint, Some(generic_name), Some(loc))
|
||||
.ty)
|
||||
}
|
||||
|
||||
_ => Err(HashSet::from([format!(
|
||||
"expression {var:?} cannot be handled as a generic parameter in global scope"
|
||||
)])),
|
||||
}
|
||||
}
|
||||
|
||||
fn handle_assignment_pattern(
|
||||
targets: &[nac3parser::ast::Expr],
|
||||
value: &nac3parser::ast::Expr,
|
||||
resolver: &(dyn nac3core::symbol_resolver::SymbolResolver + Send + Sync),
|
||||
internal_resolver: &ResolverInternal,
|
||||
def_list: &[Arc<RwLock<toplevel::TopLevelDef>>],
|
||||
unifier: &mut nac3core::typecheck::typedef::Unifier,
|
||||
primitives: &type_inferencer::PrimitiveStore,
|
||||
) -> Result<(), String> {
|
||||
if targets.len() == 1 {
|
||||
match &targets[0].node {
|
||||
nac3parser::ast::ExprKind::Name { id, .. } => {
|
||||
if let Ok(var) =
|
||||
handle_typevar_definition(value, resolver, def_list, unifier, primitives)
|
||||
{
|
||||
internal_resolver.add_id_type(*id, var);
|
||||
Ok(())
|
||||
} else if let Ok(val) =
|
||||
toplevel::helper::parse_parameter_default_value(value, resolver)
|
||||
{
|
||||
internal_resolver.add_module_global(*id, val);
|
||||
Ok(())
|
||||
} else {
|
||||
Err(format!("fails to evaluate this expression `{:?}` as a constant or generic parameter at {}",
|
||||
targets[0].node,
|
||||
targets[0].location,
|
||||
))
|
||||
}
|
||||
}
|
||||
nac3parser::ast::ExprKind::List { elts, .. }
|
||||
| nac3parser::ast::ExprKind::Tuple { elts, .. } => {
|
||||
handle_assignment_pattern(
|
||||
elts,
|
||||
value,
|
||||
resolver,
|
||||
internal_resolver,
|
||||
def_list,
|
||||
unifier,
|
||||
primitives,
|
||||
)?;
|
||||
Ok(())
|
||||
}
|
||||
_ => Err(format!(
|
||||
"assignment to {:?} is not supported at {}",
|
||||
targets[0], targets[0].location
|
||||
)),
|
||||
}
|
||||
} else {
|
||||
match &value.node {
|
||||
nac3parser::ast::ExprKind::List { elts, .. }
|
||||
| nac3parser::ast::ExprKind::Tuple { elts, .. } => {
|
||||
if elts.len() == targets.len() {
|
||||
for (tar, val) in targets.iter().zip(elts) {
|
||||
handle_assignment_pattern(
|
||||
std::slice::from_ref(tar),
|
||||
val,
|
||||
resolver,
|
||||
internal_resolver,
|
||||
def_list,
|
||||
unifier,
|
||||
primitives,
|
||||
)?;
|
||||
}
|
||||
Ok(())
|
||||
} else {
|
||||
Err(format!(
|
||||
"number of elements to unpack does not match (expect {}, found {}) at {}",
|
||||
targets.len(),
|
||||
elts.len(),
|
||||
value.location
|
||||
))
|
||||
}
|
||||
}
|
||||
_ => Err(format!(
|
||||
"unpack of this expression is not supported at {}",
|
||||
value.location
|
||||
)),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn compile(code: &String, run_symbol: &String, output_filename: &Path) -> Result<(), String> {
|
||||
let mut target_machine_options = codegen::CodeGenTargetMachineOptions::from_host();
|
||||
target_machine_options.reloc_mode = inkwell::targets::RelocMode::PIC;
|
||||
|
@ -60,20 +241,35 @@ fn compile(code: &String, run_symbol: &String, output_filename: &Path) -> Result
|
|||
}
|
||||
};
|
||||
for mut stmt in parser_result {
|
||||
if let nac3parser::ast::StmtKind::FunctionDef { name, .. } = &mut stmt.node {
|
||||
if *name == "run".into() {
|
||||
*name = run_symbol.as_str().into();
|
||||
}
|
||||
}
|
||||
match composer.register_top_level(stmt, Some(resolver.clone()), "__main__", true) {
|
||||
Ok((name, def_id, ty)) => {
|
||||
internal_resolver.add_id_def(name, def_id);
|
||||
if let Some(ty) = ty {
|
||||
internal_resolver.add_id_type(name, ty);
|
||||
if let nac3parser::ast::StmtKind::Assign { targets, value, .. } = stmt.node {
|
||||
let def_list = composer.extract_def_list();
|
||||
let unifier = &mut composer.unifier;
|
||||
let primitives = &composer.primitives_ty;
|
||||
handle_assignment_pattern(
|
||||
&targets,
|
||||
&value,
|
||||
resolver.as_ref(),
|
||||
internal_resolver.as_ref(),
|
||||
&def_list,
|
||||
unifier,
|
||||
primitives,
|
||||
)?;
|
||||
} else {
|
||||
if let nac3parser::ast::StmtKind::FunctionDef { name, .. } = &mut stmt.node {
|
||||
if name.to_string() == "run" {
|
||||
*name = run_symbol.as_str().into();
|
||||
}
|
||||
}
|
||||
Err(err) => {
|
||||
return Err(format!("composer error: {}", err));
|
||||
match composer.register_top_level(stmt, Some(resolver.clone()), "__main__", true) {
|
||||
Ok((name, def_id, ty)) => {
|
||||
internal_resolver.add_id_def(name, def_id);
|
||||
if let Some(ty) = ty {
|
||||
internal_resolver.add_id_type(name, ty);
|
||||
}
|
||||
}
|
||||
Err(err) => {
|
||||
return Err(format!("composer error: {}", err));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -185,7 +381,6 @@ fn compile(code: &String, run_symbol: &String, output_filename: &Path) -> Result
|
|||
// Private all functions except "run"
|
||||
let mut function_iter = main.get_first_function();
|
||||
while let Some(func) = function_iter {
|
||||
println!("{}", func.get_name().to_str().unwrap());
|
||||
if func.count_basic_blocks() > 0 && func.get_name().to_str().unwrap() != run_symbol {
|
||||
func.set_linkage(inkwell::module::Linkage::Private);
|
||||
}
|
||||
|
@ -294,6 +489,16 @@ struct Cells {
|
|||
cells: Vec<Cell>,
|
||||
}
|
||||
|
||||
static mut CELL_UI: Option<&'static mut egui::Ui> = None;
|
||||
|
||||
#[no_mangle]
|
||||
pub extern "C" fn __nac3_cells_slider(prev: f64) -> f64 {
|
||||
let ui = unsafe { CELL_UI.as_mut().unwrap() };
|
||||
let mut value = prev;
|
||||
ui.add(egui::Slider::new(&mut value, 0.0..=100.0));
|
||||
value
|
||||
}
|
||||
|
||||
impl Cells {
|
||||
fn new() -> Self {
|
||||
Self {
|
||||
|
@ -346,7 +551,18 @@ impl Cells {
|
|||
});
|
||||
match &cell.result {
|
||||
Ok(bin) => {
|
||||
ui.label(format!("{}", unsafe { bin.run_fn.unwrap()() }));
|
||||
let result = {
|
||||
unsafe {
|
||||
CELL_UI.replace(std::mem::transmute::<
|
||||
&mut egui::Ui,
|
||||
&'static mut egui::Ui,
|
||||
>(ui))
|
||||
};
|
||||
let result = unsafe { bin.run_fn.unwrap()() };
|
||||
unsafe { CELL_UI.take() };
|
||||
result
|
||||
};
|
||||
ui.label(format!("{}", result));
|
||||
}
|
||||
Err(msg) => {
|
||||
if !msg.is_empty() {
|
||||
|
|
Loading…
Reference in New Issue