Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6a2e4a7ac1 | |||
| 3d706cb32b | |||
| 7c3bfa9301 | |||
| b56c5461f1 | |||
| 61e1469845 |
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -770,7 +770,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lux"
|
name = "lux"
|
||||||
version = "0.1.1"
|
version = "0.1.2"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"lsp-server",
|
"lsp-server",
|
||||||
"lsp-types",
|
"lsp-types",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "lux"
|
name = "lux"
|
||||||
version = "0.1.2"
|
version = "0.1.3"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
description = "A functional programming language with first-class effects, schema evolution, and behavioral types"
|
description = "A functional programming language with first-class effects, schema evolution, and behavioral types"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
|
|||||||
@@ -44,7 +44,7 @@
|
|||||||
printf "\n"
|
printf "\n"
|
||||||
printf " \033[1;35m╦ ╦ ╦╦ ╦\033[0m\n"
|
printf " \033[1;35m╦ ╦ ╦╦ ╦\033[0m\n"
|
||||||
printf " \033[1;35m║ ║ ║╔╣\033[0m\n"
|
printf " \033[1;35m║ ║ ║╔╣\033[0m\n"
|
||||||
printf " \033[1;35m╩═╝╚═╝╩ ╩\033[0m v0.1.2\n"
|
printf " \033[1;35m╩═╝╚═╝╩ ╩\033[0m v0.1.3\n"
|
||||||
printf "\n"
|
printf "\n"
|
||||||
printf " Functional language with first-class effects\n"
|
printf " Functional language with first-class effects\n"
|
||||||
printf "\n"
|
printf "\n"
|
||||||
@@ -62,7 +62,7 @@
|
|||||||
|
|
||||||
packages.default = pkgs.rustPlatform.buildRustPackage {
|
packages.default = pkgs.rustPlatform.buildRustPackage {
|
||||||
pname = "lux";
|
pname = "lux";
|
||||||
version = "0.1.2";
|
version = "0.1.3";
|
||||||
src = ./.;
|
src = ./.;
|
||||||
cargoLock.lockFile = ./Cargo.lock;
|
cargoLock.lockFile = ./Cargo.lock;
|
||||||
|
|
||||||
@@ -79,7 +79,7 @@
|
|||||||
};
|
};
|
||||||
in muslPkgs.rustPlatform.buildRustPackage {
|
in muslPkgs.rustPlatform.buildRustPackage {
|
||||||
pname = "lux";
|
pname = "lux";
|
||||||
version = "0.1.2";
|
version = "0.1.3";
|
||||||
src = ./.;
|
src = ./.;
|
||||||
cargoLock.lockFile = ./Cargo.lock;
|
cargoLock.lockFile = ./Cargo.lock;
|
||||||
|
|
||||||
|
|||||||
@@ -541,7 +541,9 @@ pub enum Expr {
|
|||||||
span: Span,
|
span: Span,
|
||||||
},
|
},
|
||||||
/// Record literal: { name: "Alice", age: 30 }
|
/// Record literal: { name: "Alice", age: 30 }
|
||||||
|
/// With optional spread: { ...base, name: "Bob" }
|
||||||
Record {
|
Record {
|
||||||
|
spread: Option<Box<Expr>>,
|
||||||
fields: Vec<(Ident, Expr)>,
|
fields: Vec<(Ident, Expr)>,
|
||||||
span: Span,
|
span: Span,
|
||||||
},
|
},
|
||||||
@@ -621,7 +623,8 @@ pub enum BinaryOp {
|
|||||||
And,
|
And,
|
||||||
Or,
|
Or,
|
||||||
// Other
|
// Other
|
||||||
Pipe, // |>
|
Pipe, // |>
|
||||||
|
Concat, // ++
|
||||||
}
|
}
|
||||||
|
|
||||||
impl fmt::Display for BinaryOp {
|
impl fmt::Display for BinaryOp {
|
||||||
@@ -641,6 +644,7 @@ impl fmt::Display for BinaryOp {
|
|||||||
BinaryOp::And => write!(f, "&&"),
|
BinaryOp::And => write!(f, "&&"),
|
||||||
BinaryOp::Or => write!(f, "||"),
|
BinaryOp::Or => write!(f, "||"),
|
||||||
BinaryOp::Pipe => write!(f, "|>"),
|
BinaryOp::Pipe => write!(f, "|>"),
|
||||||
|
BinaryOp::Concat => write!(f, "++"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -730,10 +730,10 @@ impl CBackend {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Check for string concatenation - use lux_string_concat instead of +
|
// Check for string concatenation - use lux_string_concat instead of +
|
||||||
if matches!(op, BinaryOp::Add) {
|
if matches!(op, BinaryOp::Add | BinaryOp::Concat) {
|
||||||
let left_is_string = self.infer_expr_type(left).as_deref() == Some("LuxString");
|
let left_is_string = self.infer_expr_type(left).as_deref() == Some("LuxString");
|
||||||
let right_is_string = self.infer_expr_type(right).as_deref() == Some("LuxString");
|
let right_is_string = self.infer_expr_type(right).as_deref() == Some("LuxString");
|
||||||
if left_is_string || right_is_string {
|
if left_is_string || right_is_string || matches!(op, BinaryOp::Concat) {
|
||||||
return Ok(format!("lux_string_concat({}, {})", l, r));
|
return Ok(format!("lux_string_concat({}, {})", l, r));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -858,6 +858,7 @@ impl CBackend {
|
|||||||
self.writeln("#include <stdio.h>");
|
self.writeln("#include <stdio.h>");
|
||||||
self.writeln("#include <stdlib.h>");
|
self.writeln("#include <stdlib.h>");
|
||||||
self.writeln("#include <string.h>");
|
self.writeln("#include <string.h>");
|
||||||
|
self.writeln("#include <math.h>");
|
||||||
self.writeln("");
|
self.writeln("");
|
||||||
self.writeln("// === Lux Runtime Types ===");
|
self.writeln("// === Lux Runtime Types ===");
|
||||||
self.writeln("");
|
self.writeln("");
|
||||||
@@ -2839,8 +2840,18 @@ impl CBackend {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// String concatenation for ++ and +
|
||||||
|
if matches!(op, BinaryOp::Add | BinaryOp::Concat) {
|
||||||
|
let left_is_string = self.infer_expr_type(left).as_deref() == Some("LuxString");
|
||||||
|
let right_is_string = self.infer_expr_type(right).as_deref() == Some("LuxString");
|
||||||
|
if left_is_string || right_is_string || matches!(op, BinaryOp::Concat) {
|
||||||
|
return Ok(format!("lux_string_concat({}, {})", l, r));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
let op_str = match op {
|
let op_str = match op {
|
||||||
BinaryOp::Add => "+",
|
BinaryOp::Add => "+",
|
||||||
|
BinaryOp::Concat => unreachable!("handled above"),
|
||||||
BinaryOp::Sub => "-",
|
BinaryOp::Sub => "-",
|
||||||
BinaryOp::Mul => "*",
|
BinaryOp::Mul => "*",
|
||||||
BinaryOp::Div => "/",
|
BinaryOp::Div => "/",
|
||||||
@@ -3019,6 +3030,10 @@ impl CBackend {
|
|||||||
self.register_rc_var(&temp, "LuxString");
|
self.register_rc_var(&temp, "LuxString");
|
||||||
return Ok(temp);
|
return Ok(temp);
|
||||||
}
|
}
|
||||||
|
// Math module
|
||||||
|
if module_name.name == "Math" {
|
||||||
|
return self.emit_math_operation(&field.name, args);
|
||||||
|
}
|
||||||
// Check for user-defined module function
|
// Check for user-defined module function
|
||||||
let key = (module_name.name.clone(), field.name.clone());
|
let key = (module_name.name.clone(), field.name.clone());
|
||||||
if let Some(c_name) = self.module_functions.get(&key).cloned() {
|
if let Some(c_name) = self.module_functions.get(&key).cloned() {
|
||||||
@@ -3382,6 +3397,11 @@ impl CBackend {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Math module (treated as effect by parser but handled as direct C calls)
|
||||||
|
if effect.name == "Math" {
|
||||||
|
return self.emit_math_operation(&operation.name, args);
|
||||||
|
}
|
||||||
|
|
||||||
// Built-in Console effect
|
// Built-in Console effect
|
||||||
if effect.name == "Console" {
|
if effect.name == "Console" {
|
||||||
if operation.name == "print" {
|
if operation.name == "print" {
|
||||||
@@ -3844,12 +3864,34 @@ impl CBackend {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Expr::Record { fields, .. } => {
|
Expr::Record {
|
||||||
let field_strs: Result<Vec<_>, _> = fields.iter().map(|(name, val)| {
|
spread, fields, ..
|
||||||
let v = self.emit_expr(val)?;
|
} => {
|
||||||
Ok(format!(".{} = {}", name.name, v))
|
if let Some(spread_expr) = spread {
|
||||||
}).collect();
|
// Evaluate spread source, then override fields
|
||||||
Ok(format!("{{ {} }}", field_strs?.join(", ")))
|
let base = self.emit_expr(spread_expr)?;
|
||||||
|
if fields.is_empty() {
|
||||||
|
Ok(base)
|
||||||
|
} else {
|
||||||
|
// Copy spread into a temp, then override fields
|
||||||
|
let temp = format!("_spread_{}", self.fresh_name());
|
||||||
|
self.writeln(&format!("__auto_type {} = {};", temp, base));
|
||||||
|
for (name, val) in fields {
|
||||||
|
let v = self.emit_expr(val)?;
|
||||||
|
self.writeln(&format!("{}.{} = {};", temp, name.name, v));
|
||||||
|
}
|
||||||
|
Ok(temp)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
let field_strs: Result<Vec<_>, _> = fields
|
||||||
|
.iter()
|
||||||
|
.map(|(name, val)| {
|
||||||
|
let v = self.emit_expr(val)?;
|
||||||
|
Ok(format!(".{} = {}", name.name, v))
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
Ok(format!("{{ {} }}", field_strs?.join(", ")))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Expr::Field { object, field, .. } => {
|
Expr::Field { object, field, .. } => {
|
||||||
@@ -3919,6 +3961,64 @@ impl CBackend {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Emit code for Math module operations (Math.sin, Math.cos, etc.)
|
||||||
|
fn emit_math_operation(&mut self, op: &str, args: &[Expr]) -> Result<String, CGenError> {
|
||||||
|
match op {
|
||||||
|
"abs" => {
|
||||||
|
let x = self.emit_expr(&args[0])?;
|
||||||
|
Ok(format!("fabs({})", x))
|
||||||
|
}
|
||||||
|
"min" => {
|
||||||
|
let a = self.emit_expr(&args[0])?;
|
||||||
|
let b = self.emit_expr(&args[1])?;
|
||||||
|
Ok(format!("fmin({}, {})", a, b))
|
||||||
|
}
|
||||||
|
"max" => {
|
||||||
|
let a = self.emit_expr(&args[0])?;
|
||||||
|
let b = self.emit_expr(&args[1])?;
|
||||||
|
Ok(format!("fmax({}, {})", a, b))
|
||||||
|
}
|
||||||
|
"sqrt" => {
|
||||||
|
let x = self.emit_expr(&args[0])?;
|
||||||
|
Ok(format!("sqrt({})", x))
|
||||||
|
}
|
||||||
|
"pow" => {
|
||||||
|
let base = self.emit_expr(&args[0])?;
|
||||||
|
let exp = self.emit_expr(&args[1])?;
|
||||||
|
Ok(format!("pow({}, {})", base, exp))
|
||||||
|
}
|
||||||
|
"floor" => {
|
||||||
|
let x = self.emit_expr(&args[0])?;
|
||||||
|
Ok(format!("(int64_t)floor({})", x))
|
||||||
|
}
|
||||||
|
"ceil" => {
|
||||||
|
let x = self.emit_expr(&args[0])?;
|
||||||
|
Ok(format!("(int64_t)ceil({})", x))
|
||||||
|
}
|
||||||
|
"round" => {
|
||||||
|
let x = self.emit_expr(&args[0])?;
|
||||||
|
Ok(format!("(int64_t)round({})", x))
|
||||||
|
}
|
||||||
|
"sin" => {
|
||||||
|
let x = self.emit_expr(&args[0])?;
|
||||||
|
Ok(format!("sin({})", x))
|
||||||
|
}
|
||||||
|
"cos" => {
|
||||||
|
let x = self.emit_expr(&args[0])?;
|
||||||
|
Ok(format!("cos({})", x))
|
||||||
|
}
|
||||||
|
"atan2" => {
|
||||||
|
let y = self.emit_expr(&args[0])?;
|
||||||
|
let x = self.emit_expr(&args[1])?;
|
||||||
|
Ok(format!("atan2({}, {})", y, x))
|
||||||
|
}
|
||||||
|
_ => Err(CGenError {
|
||||||
|
message: format!("Math.{} not supported in C backend", op),
|
||||||
|
span: None,
|
||||||
|
}),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Emit code for List module operations (List.map, List.filter, etc.)
|
/// Emit code for List module operations (List.map, List.filter, etc.)
|
||||||
fn emit_list_operation(&mut self, op: &str, args: &[Expr]) -> Result<String, CGenError> {
|
fn emit_list_operation(&mut self, op: &str, args: &[Expr]) -> Result<String, CGenError> {
|
||||||
match op {
|
match op {
|
||||||
@@ -5821,7 +5921,10 @@ impl CBackend {
|
|||||||
}
|
}
|
||||||
self.collect_free_vars(body, &inner_bound, free);
|
self.collect_free_vars(body, &inner_bound, free);
|
||||||
}
|
}
|
||||||
Expr::Record { fields, .. } => {
|
Expr::Record { spread, fields, .. } => {
|
||||||
|
if let Some(spread_expr) = spread {
|
||||||
|
self.collect_free_vars(spread_expr, bound, free);
|
||||||
|
}
|
||||||
for (_, val) in fields {
|
for (_, val) in fields {
|
||||||
self.collect_free_vars(val, bound, free);
|
self.collect_free_vars(val, bound, free);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -909,13 +909,16 @@ impl JsBackend {
|
|||||||
let val = self.emit_expr(&let_decl.value)?;
|
let val = self.emit_expr(&let_decl.value)?;
|
||||||
let var_name = &let_decl.name.name;
|
let var_name = &let_decl.name.name;
|
||||||
|
|
||||||
// Check if this is a run expression (often results in undefined)
|
if var_name == "_" {
|
||||||
// We still want to execute it for its side effects
|
// Wildcard binding: just execute for side effects
|
||||||
self.writeln(&format!("const {} = {};", var_name, val));
|
self.writeln(&format!("{};", val));
|
||||||
|
} else {
|
||||||
|
self.writeln(&format!("const {} = {};", var_name, val));
|
||||||
|
|
||||||
// Register the variable for future use
|
// Register the variable for future use
|
||||||
self.var_substitutions
|
self.var_substitutions
|
||||||
.insert(var_name.clone(), var_name.clone());
|
.insert(var_name.clone(), var_name.clone());
|
||||||
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -954,12 +957,17 @@ impl JsBackend {
|
|||||||
let r = self.emit_expr(right)?;
|
let r = self.emit_expr(right)?;
|
||||||
|
|
||||||
// Check for string concatenation
|
// Check for string concatenation
|
||||||
if matches!(op, BinaryOp::Add) {
|
if matches!(op, BinaryOp::Add | BinaryOp::Concat) {
|
||||||
if self.is_string_expr(left) || self.is_string_expr(right) {
|
if self.is_string_expr(left) || self.is_string_expr(right) {
|
||||||
return Ok(format!("({} + {})", l, r));
|
return Ok(format!("({} + {})", l, r));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ++ on lists: use .concat()
|
||||||
|
if matches!(op, BinaryOp::Concat) {
|
||||||
|
return Ok(format!("{}.concat({})", l, r));
|
||||||
|
}
|
||||||
|
|
||||||
let op_str = match op {
|
let op_str = match op {
|
||||||
BinaryOp::Add => "+",
|
BinaryOp::Add => "+",
|
||||||
BinaryOp::Sub => "-",
|
BinaryOp::Sub => "-",
|
||||||
@@ -974,6 +982,7 @@ impl JsBackend {
|
|||||||
BinaryOp::Ge => ">=",
|
BinaryOp::Ge => ">=",
|
||||||
BinaryOp::And => "&&",
|
BinaryOp::And => "&&",
|
||||||
BinaryOp::Or => "||",
|
BinaryOp::Or => "||",
|
||||||
|
BinaryOp::Concat => unreachable!("handled above"),
|
||||||
BinaryOp::Pipe => {
|
BinaryOp::Pipe => {
|
||||||
// Pipe operator: x |> f becomes f(x)
|
// Pipe operator: x |> f becomes f(x)
|
||||||
return Ok(format!("{}({})", r, l));
|
return Ok(format!("{}({})", r, l));
|
||||||
@@ -1034,18 +1043,26 @@ impl JsBackend {
|
|||||||
name, value, body, ..
|
name, value, body, ..
|
||||||
} => {
|
} => {
|
||||||
let val = self.emit_expr(value)?;
|
let val = self.emit_expr(value)?;
|
||||||
let var_name = format!("{}_{}", name.name, self.fresh_name());
|
|
||||||
|
|
||||||
self.writeln(&format!("const {} = {};", var_name, val));
|
if name.name == "_" {
|
||||||
|
// Wildcard binding: just execute for side effects
|
||||||
|
self.writeln(&format!("{};", val));
|
||||||
|
} else {
|
||||||
|
let var_name = format!("{}_{}", name.name, self.fresh_name());
|
||||||
|
|
||||||
// Add substitution
|
self.writeln(&format!("const {} = {};", var_name, val));
|
||||||
self.var_substitutions
|
|
||||||
.insert(name.name.clone(), var_name.clone());
|
// Add substitution
|
||||||
|
self.var_substitutions
|
||||||
|
.insert(name.name.clone(), var_name.clone());
|
||||||
|
}
|
||||||
|
|
||||||
let body_result = self.emit_expr(body)?;
|
let body_result = self.emit_expr(body)?;
|
||||||
|
|
||||||
// Remove substitution
|
// Remove substitution
|
||||||
self.var_substitutions.remove(&name.name);
|
if name.name != "_" {
|
||||||
|
self.var_substitutions.remove(&name.name);
|
||||||
|
}
|
||||||
|
|
||||||
Ok(body_result)
|
Ok(body_result)
|
||||||
}
|
}
|
||||||
@@ -1232,10 +1249,15 @@ impl JsBackend {
|
|||||||
}
|
}
|
||||||
Statement::Let { name, value, .. } => {
|
Statement::Let { name, value, .. } => {
|
||||||
let val = self.emit_expr(value)?;
|
let val = self.emit_expr(value)?;
|
||||||
let var_name = format!("{}_{}", name.name, self.fresh_name());
|
if name.name == "_" {
|
||||||
self.writeln(&format!("const {} = {};", var_name, val));
|
self.writeln(&format!("{};", val));
|
||||||
self.var_substitutions
|
} else {
|
||||||
.insert(name.name.clone(), var_name.clone());
|
let var_name =
|
||||||
|
format!("{}_{}", name.name, self.fresh_name());
|
||||||
|
self.writeln(&format!("const {} = {};", var_name, val));
|
||||||
|
self.var_substitutions
|
||||||
|
.insert(name.name.clone(), var_name.clone());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1244,15 +1266,19 @@ impl JsBackend {
|
|||||||
self.emit_expr(result)
|
self.emit_expr(result)
|
||||||
}
|
}
|
||||||
|
|
||||||
Expr::Record { fields, .. } => {
|
Expr::Record {
|
||||||
let field_strs: Result<Vec<_>, _> = fields
|
spread, fields, ..
|
||||||
.iter()
|
} => {
|
||||||
.map(|(name, expr)| {
|
let mut parts = Vec::new();
|
||||||
let val = self.emit_expr(expr)?;
|
if let Some(spread_expr) = spread {
|
||||||
Ok(format!("{}: {}", name.name, val))
|
let spread_code = self.emit_expr(spread_expr)?;
|
||||||
})
|
parts.push(format!("...{}", spread_code));
|
||||||
.collect();
|
}
|
||||||
Ok(format!("{{ {} }}", field_strs?.join(", ")))
|
for (name, expr) in fields {
|
||||||
|
let val = self.emit_expr(expr)?;
|
||||||
|
parts.push(format!("{}: {}", name.name, val));
|
||||||
|
}
|
||||||
|
Ok(format!("{{ {} }}", parts.join(", ")))
|
||||||
}
|
}
|
||||||
|
|
||||||
Expr::Tuple { elements, .. } => {
|
Expr::Tuple { elements, .. } => {
|
||||||
@@ -2342,7 +2368,7 @@ impl JsBackend {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
Expr::BinaryOp { op, left, right, .. } => {
|
Expr::BinaryOp { op, left, right, .. } => {
|
||||||
matches!(op, BinaryOp::Add)
|
matches!(op, BinaryOp::Add | BinaryOp::Concat)
|
||||||
&& (self.is_string_expr(left) || self.is_string_expr(right))
|
&& (self.is_string_expr(left) || self.is_string_expr(right))
|
||||||
}
|
}
|
||||||
_ => false,
|
_ => false,
|
||||||
|
|||||||
@@ -688,15 +688,17 @@ impl Formatter {
|
|||||||
.join(", ")
|
.join(", ")
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
Expr::Record { fields, .. } => {
|
Expr::Record {
|
||||||
format!(
|
spread, fields, ..
|
||||||
"{{ {} }}",
|
} => {
|
||||||
fields
|
let mut parts = Vec::new();
|
||||||
.iter()
|
if let Some(spread_expr) = spread {
|
||||||
.map(|(name, val)| format!("{}: {}", name.name, self.format_expr(val)))
|
parts.push(format!("...{}", self.format_expr(spread_expr)));
|
||||||
.collect::<Vec<_>>()
|
}
|
||||||
.join(", ")
|
for (name, val) in fields {
|
||||||
)
|
parts.push(format!("{}: {}", name.name, self.format_expr(val)));
|
||||||
|
}
|
||||||
|
format!("{{ {} }}", parts.join(", "))
|
||||||
}
|
}
|
||||||
Expr::EffectOp { effect, operation, args, .. } => {
|
Expr::EffectOp { effect, operation, args, .. } => {
|
||||||
format!(
|
format!(
|
||||||
@@ -753,6 +755,7 @@ impl Formatter {
|
|||||||
BinaryOp::Ge => ">=",
|
BinaryOp::Ge => ">=",
|
||||||
BinaryOp::And => "&&",
|
BinaryOp::And => "&&",
|
||||||
BinaryOp::Or => "||",
|
BinaryOp::Or => "||",
|
||||||
|
BinaryOp::Concat => "++",
|
||||||
BinaryOp::Pipe => "|>",
|
BinaryOp::Pipe => "|>",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -74,6 +74,9 @@ pub enum BuiltinFn {
|
|||||||
MathFloor,
|
MathFloor,
|
||||||
MathCeil,
|
MathCeil,
|
||||||
MathRound,
|
MathRound,
|
||||||
|
MathSin,
|
||||||
|
MathCos,
|
||||||
|
MathAtan2,
|
||||||
|
|
||||||
// Additional List operations
|
// Additional List operations
|
||||||
ListIsEmpty,
|
ListIsEmpty,
|
||||||
@@ -1072,6 +1075,9 @@ impl Interpreter {
|
|||||||
("floor".to_string(), Value::Builtin(BuiltinFn::MathFloor)),
|
("floor".to_string(), Value::Builtin(BuiltinFn::MathFloor)),
|
||||||
("ceil".to_string(), Value::Builtin(BuiltinFn::MathCeil)),
|
("ceil".to_string(), Value::Builtin(BuiltinFn::MathCeil)),
|
||||||
("round".to_string(), Value::Builtin(BuiltinFn::MathRound)),
|
("round".to_string(), Value::Builtin(BuiltinFn::MathRound)),
|
||||||
|
("sin".to_string(), Value::Builtin(BuiltinFn::MathSin)),
|
||||||
|
("cos".to_string(), Value::Builtin(BuiltinFn::MathCos)),
|
||||||
|
("atan2".to_string(), Value::Builtin(BuiltinFn::MathAtan2)),
|
||||||
]));
|
]));
|
||||||
env.define("Math", math_module);
|
env.define("Math", math_module);
|
||||||
|
|
||||||
@@ -1115,11 +1121,50 @@ impl Interpreter {
|
|||||||
/// Execute a program
|
/// Execute a program
|
||||||
pub fn run(&mut self, program: &Program) -> Result<Value, RuntimeError> {
|
pub fn run(&mut self, program: &Program) -> Result<Value, RuntimeError> {
|
||||||
let mut last_value = Value::Unit;
|
let mut last_value = Value::Unit;
|
||||||
|
let mut has_main_let = false;
|
||||||
|
|
||||||
for decl in &program.declarations {
|
for decl in &program.declarations {
|
||||||
|
// Track if there's a top-level `let main = ...`
|
||||||
|
if let Declaration::Let(let_decl) = decl {
|
||||||
|
if let_decl.name.name == "main" {
|
||||||
|
has_main_let = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
last_value = self.eval_declaration(decl)?;
|
last_value = self.eval_declaration(decl)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Auto-invoke main if it was defined as a let binding with a function value
|
||||||
|
if has_main_let {
|
||||||
|
if let Some(main_val) = self.global_env.get("main") {
|
||||||
|
if let Value::Function(ref closure) = main_val {
|
||||||
|
if closure.params.is_empty() {
|
||||||
|
let span = Span { start: 0, end: 0 };
|
||||||
|
let mut result = self.eval_call(main_val.clone(), vec![], span)?;
|
||||||
|
// Trampoline loop
|
||||||
|
loop {
|
||||||
|
match result {
|
||||||
|
EvalResult::Value(v) => {
|
||||||
|
last_value = v;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
EvalResult::Effect(req) => {
|
||||||
|
last_value = self.handle_effect(req)?;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
EvalResult::TailCall { func, args, span } => {
|
||||||
|
result = self.eval_call(func, args, span)?;
|
||||||
|
}
|
||||||
|
EvalResult::Resume(v) => {
|
||||||
|
last_value = v;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Ok(last_value)
|
Ok(last_value)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1525,8 +1570,28 @@ impl Interpreter {
|
|||||||
self.eval_expr_tail(result, &block_env, tail)
|
self.eval_expr_tail(result, &block_env, tail)
|
||||||
}
|
}
|
||||||
|
|
||||||
Expr::Record { fields, .. } => {
|
Expr::Record {
|
||||||
|
spread, fields, ..
|
||||||
|
} => {
|
||||||
let mut record = HashMap::new();
|
let mut record = HashMap::new();
|
||||||
|
|
||||||
|
// If there's a spread, evaluate it and start with its fields
|
||||||
|
if let Some(spread_expr) = spread {
|
||||||
|
let spread_val = self.eval_expr(spread_expr, env)?;
|
||||||
|
if let Value::Record(spread_fields) = spread_val {
|
||||||
|
record = spread_fields;
|
||||||
|
} else {
|
||||||
|
return Err(RuntimeError {
|
||||||
|
message: format!(
|
||||||
|
"Spread expression must evaluate to a record, got {}",
|
||||||
|
spread_val.type_name()
|
||||||
|
),
|
||||||
|
span: Some(expr.span()),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Override with explicit fields
|
||||||
for (name, expr) in fields {
|
for (name, expr) in fields {
|
||||||
let val = self.eval_expr(expr, env)?;
|
let val = self.eval_expr(expr, env)?;
|
||||||
record.insert(name.name.clone(), val);
|
record.insert(name.name.clone(), val);
|
||||||
@@ -1599,6 +1664,18 @@ impl Interpreter {
|
|||||||
span: Some(span),
|
span: Some(span),
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
|
BinaryOp::Concat => match (left, right) {
|
||||||
|
(Value::String(a), Value::String(b)) => Ok(Value::String(a + &b)),
|
||||||
|
(Value::List(a), Value::List(b)) => {
|
||||||
|
let mut result = a;
|
||||||
|
result.extend(b);
|
||||||
|
Ok(Value::List(result))
|
||||||
|
}
|
||||||
|
(l, r) => Err(RuntimeError {
|
||||||
|
message: format!("Cannot concatenate {} and {}", l.type_name(), r.type_name()),
|
||||||
|
span: Some(span),
|
||||||
|
}),
|
||||||
|
},
|
||||||
BinaryOp::Sub => match (left, right) {
|
BinaryOp::Sub => match (left, right) {
|
||||||
(Value::Int(a), Value::Int(b)) => Ok(Value::Int(a - b)),
|
(Value::Int(a), Value::Int(b)) => Ok(Value::Int(a - b)),
|
||||||
(Value::Float(a), Value::Float(b)) => Ok(Value::Float(a - b)),
|
(Value::Float(a), Value::Float(b)) => Ok(Value::Float(a - b)),
|
||||||
@@ -2463,6 +2540,45 @@ impl Interpreter {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BuiltinFn::MathSin => {
|
||||||
|
if args.len() != 1 {
|
||||||
|
return Err(err("Math.sin requires 1 argument"));
|
||||||
|
}
|
||||||
|
match &args[0] {
|
||||||
|
Value::Float(n) => Ok(EvalResult::Value(Value::Float(n.sin()))),
|
||||||
|
Value::Int(n) => Ok(EvalResult::Value(Value::Float((*n as f64).sin()))),
|
||||||
|
v => Err(err(&format!("Math.sin expects number, got {}", v.type_name()))),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
BuiltinFn::MathCos => {
|
||||||
|
if args.len() != 1 {
|
||||||
|
return Err(err("Math.cos requires 1 argument"));
|
||||||
|
}
|
||||||
|
match &args[0] {
|
||||||
|
Value::Float(n) => Ok(EvalResult::Value(Value::Float(n.cos()))),
|
||||||
|
Value::Int(n) => Ok(EvalResult::Value(Value::Float((*n as f64).cos()))),
|
||||||
|
v => Err(err(&format!("Math.cos expects number, got {}", v.type_name()))),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
BuiltinFn::MathAtan2 => {
|
||||||
|
if args.len() != 2 {
|
||||||
|
return Err(err("Math.atan2 requires 2 arguments: y, x"));
|
||||||
|
}
|
||||||
|
let y = match &args[0] {
|
||||||
|
Value::Float(n) => *n,
|
||||||
|
Value::Int(n) => *n as f64,
|
||||||
|
v => return Err(err(&format!("Math.atan2 expects number, got {}", v.type_name()))),
|
||||||
|
};
|
||||||
|
let x = match &args[1] {
|
||||||
|
Value::Float(n) => *n,
|
||||||
|
Value::Int(n) => *n as f64,
|
||||||
|
v => return Err(err(&format!("Math.atan2 expects number, got {}", v.type_name()))),
|
||||||
|
};
|
||||||
|
Ok(EvalResult::Value(Value::Float(y.atan2(x))))
|
||||||
|
}
|
||||||
|
|
||||||
// Additional List operations
|
// Additional List operations
|
||||||
BuiltinFn::ListIsEmpty => {
|
BuiltinFn::ListIsEmpty => {
|
||||||
let list = Self::expect_arg_1::<Vec<Value>>(&args, "List.isEmpty", span)?;
|
let list = Self::expect_arg_1::<Vec<Value>>(&args, "List.isEmpty", span)?;
|
||||||
@@ -5044,6 +5160,7 @@ mod tests {
|
|||||||
// Create a simple migration that adds a field
|
// Create a simple migration that adds a field
|
||||||
// Migration: old.name -> { name: old.name, email: "unknown" }
|
// Migration: old.name -> { name: old.name, email: "unknown" }
|
||||||
let migration_body = Expr::Record {
|
let migration_body = Expr::Record {
|
||||||
|
spread: None,
|
||||||
fields: vec![
|
fields: vec![
|
||||||
(
|
(
|
||||||
Ident::new("name", Span::default()),
|
Ident::new("name", Span::default()),
|
||||||
|
|||||||
30
src/lexer.rs
30
src/lexer.rs
@@ -70,6 +70,7 @@ pub enum TokenKind {
|
|||||||
|
|
||||||
// Operators
|
// Operators
|
||||||
Plus, // +
|
Plus, // +
|
||||||
|
PlusPlus, // ++
|
||||||
Minus, // -
|
Minus, // -
|
||||||
Star, // *
|
Star, // *
|
||||||
Slash, // /
|
Slash, // /
|
||||||
@@ -89,6 +90,7 @@ pub enum TokenKind {
|
|||||||
Arrow, // =>
|
Arrow, // =>
|
||||||
ThinArrow, // ->
|
ThinArrow, // ->
|
||||||
Dot, // .
|
Dot, // .
|
||||||
|
DotDotDot, // ...
|
||||||
Colon, // :
|
Colon, // :
|
||||||
ColonColon, // ::
|
ColonColon, // ::
|
||||||
Comma, // ,
|
Comma, // ,
|
||||||
@@ -160,6 +162,7 @@ impl fmt::Display for TokenKind {
|
|||||||
TokenKind::True => write!(f, "true"),
|
TokenKind::True => write!(f, "true"),
|
||||||
TokenKind::False => write!(f, "false"),
|
TokenKind::False => write!(f, "false"),
|
||||||
TokenKind::Plus => write!(f, "+"),
|
TokenKind::Plus => write!(f, "+"),
|
||||||
|
TokenKind::PlusPlus => write!(f, "++"),
|
||||||
TokenKind::Minus => write!(f, "-"),
|
TokenKind::Minus => write!(f, "-"),
|
||||||
TokenKind::Star => write!(f, "*"),
|
TokenKind::Star => write!(f, "*"),
|
||||||
TokenKind::Slash => write!(f, "/"),
|
TokenKind::Slash => write!(f, "/"),
|
||||||
@@ -179,6 +182,7 @@ impl fmt::Display for TokenKind {
|
|||||||
TokenKind::Arrow => write!(f, "=>"),
|
TokenKind::Arrow => write!(f, "=>"),
|
||||||
TokenKind::ThinArrow => write!(f, "->"),
|
TokenKind::ThinArrow => write!(f, "->"),
|
||||||
TokenKind::Dot => write!(f, "."),
|
TokenKind::Dot => write!(f, "."),
|
||||||
|
TokenKind::DotDotDot => write!(f, "..."),
|
||||||
TokenKind::Colon => write!(f, ":"),
|
TokenKind::Colon => write!(f, ":"),
|
||||||
TokenKind::ColonColon => write!(f, "::"),
|
TokenKind::ColonColon => write!(f, "::"),
|
||||||
TokenKind::Comma => write!(f, ","),
|
TokenKind::Comma => write!(f, ","),
|
||||||
@@ -268,7 +272,14 @@ impl<'a> Lexer<'a> {
|
|||||||
|
|
||||||
let kind = match c {
|
let kind = match c {
|
||||||
// Single-character tokens
|
// Single-character tokens
|
||||||
'+' => TokenKind::Plus,
|
'+' => {
|
||||||
|
if self.peek() == Some('+') {
|
||||||
|
self.advance();
|
||||||
|
TokenKind::PlusPlus
|
||||||
|
} else {
|
||||||
|
TokenKind::Plus
|
||||||
|
}
|
||||||
|
}
|
||||||
'*' => TokenKind::Star,
|
'*' => TokenKind::Star,
|
||||||
'%' => TokenKind::Percent,
|
'%' => TokenKind::Percent,
|
||||||
'(' => TokenKind::LParen,
|
'(' => TokenKind::LParen,
|
||||||
@@ -364,7 +375,22 @@ impl<'a> Lexer<'a> {
|
|||||||
TokenKind::Pipe
|
TokenKind::Pipe
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
'.' => TokenKind::Dot,
|
'.' => {
|
||||||
|
if self.peek() == Some('.') {
|
||||||
|
// Check for ... (need to peek past second dot)
|
||||||
|
// We look at source directly since we can only peek one ahead
|
||||||
|
let next_next = self.source[self.pos..].chars().nth(1);
|
||||||
|
if next_next == Some('.') {
|
||||||
|
self.advance(); // consume second '.'
|
||||||
|
self.advance(); // consume third '.'
|
||||||
|
TokenKind::DotDotDot
|
||||||
|
} else {
|
||||||
|
TokenKind::Dot
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
TokenKind::Dot
|
||||||
|
}
|
||||||
|
}
|
||||||
':' => {
|
':' => {
|
||||||
if self.peek() == Some(':') {
|
if self.peek() == Some(':') {
|
||||||
self.advance();
|
self.advance();
|
||||||
|
|||||||
@@ -513,7 +513,10 @@ impl Linter {
|
|||||||
Expr::Field { object, .. } | Expr::TupleIndex { object, .. } => {
|
Expr::Field { object, .. } | Expr::TupleIndex { object, .. } => {
|
||||||
self.collect_refs_expr(object);
|
self.collect_refs_expr(object);
|
||||||
}
|
}
|
||||||
Expr::Record { fields, .. } => {
|
Expr::Record { spread, fields, .. } => {
|
||||||
|
if let Some(spread_expr) = spread {
|
||||||
|
self.collect_refs_expr(spread_expr);
|
||||||
|
}
|
||||||
for (_, val) in fields {
|
for (_, val) in fields {
|
||||||
self.collect_refs_expr(val);
|
self.collect_refs_expr(val);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1571,7 +1571,10 @@ fn collect_call_site_hints(
|
|||||||
collect_call_site_hints(source, e, param_names, hints);
|
collect_call_site_hints(source, e, param_names, hints);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Expr::Record { fields, .. } => {
|
Expr::Record { spread, fields, .. } => {
|
||||||
|
if let Some(spread_expr) = spread {
|
||||||
|
collect_call_site_hints(source, spread_expr, param_names, hints);
|
||||||
|
}
|
||||||
for (_, e) in fields {
|
for (_, e) in fields {
|
||||||
collect_call_site_hints(source, e, param_names, hints);
|
collect_call_site_hints(source, e, param_names, hints);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ use std::borrow::Cow;
|
|||||||
use std::collections::HashSet;
|
use std::collections::HashSet;
|
||||||
use typechecker::TypeChecker;
|
use typechecker::TypeChecker;
|
||||||
|
|
||||||
const VERSION: &str = "0.1.0";
|
const VERSION: &str = env!("CARGO_PKG_VERSION");
|
||||||
|
|
||||||
const HELP: &str = r#"
|
const HELP: &str = r#"
|
||||||
Lux - A functional language with first-class effects
|
Lux - A functional language with first-class effects
|
||||||
@@ -902,6 +902,7 @@ fn compile_to_c(path: &str, output_path: Option<&str>, run_after: bool, emit_c:
|
|||||||
.args(["-O2", "-o"])
|
.args(["-O2", "-o"])
|
||||||
.arg(&output_bin)
|
.arg(&output_bin)
|
||||||
.arg(&temp_c)
|
.arg(&temp_c)
|
||||||
|
.arg("-lm")
|
||||||
.output();
|
.output();
|
||||||
|
|
||||||
match compile_result {
|
match compile_result {
|
||||||
|
|||||||
@@ -1558,6 +1558,7 @@ impl Parser {
|
|||||||
loop {
|
loop {
|
||||||
let op = match self.peek_kind() {
|
let op = match self.peek_kind() {
|
||||||
TokenKind::Plus => BinaryOp::Add,
|
TokenKind::Plus => BinaryOp::Add,
|
||||||
|
TokenKind::PlusPlus => BinaryOp::Concat,
|
||||||
TokenKind::Minus => BinaryOp::Sub,
|
TokenKind::Minus => BinaryOp::Sub,
|
||||||
_ => break,
|
_ => break,
|
||||||
};
|
};
|
||||||
@@ -2207,6 +2208,11 @@ impl Parser {
|
|||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Check for record spread: { ...expr, field: val }
|
||||||
|
if matches!(self.peek_kind(), TokenKind::DotDotDot) {
|
||||||
|
return self.parse_record_expr_rest(start);
|
||||||
|
}
|
||||||
|
|
||||||
// Check if it's a record (ident: expr) or block
|
// Check if it's a record (ident: expr) or block
|
||||||
if matches!(self.peek_kind(), TokenKind::Ident(_)) {
|
if matches!(self.peek_kind(), TokenKind::Ident(_)) {
|
||||||
let lookahead = self.tokens.get(self.pos + 1).map(|t| &t.kind);
|
let lookahead = self.tokens.get(self.pos + 1).map(|t| &t.kind);
|
||||||
@@ -2221,6 +2227,20 @@ impl Parser {
|
|||||||
|
|
||||||
fn parse_record_expr_rest(&mut self, start: Span) -> Result<Expr, ParseError> {
|
fn parse_record_expr_rest(&mut self, start: Span) -> Result<Expr, ParseError> {
|
||||||
let mut fields = Vec::new();
|
let mut fields = Vec::new();
|
||||||
|
let mut spread = None;
|
||||||
|
|
||||||
|
// Check for spread: { ...expr, ... }
|
||||||
|
if self.check(TokenKind::DotDotDot) {
|
||||||
|
self.advance(); // consume ...
|
||||||
|
let spread_expr = self.parse_expr()?;
|
||||||
|
spread = Some(Box::new(spread_expr));
|
||||||
|
|
||||||
|
self.skip_newlines();
|
||||||
|
if self.check(TokenKind::Comma) {
|
||||||
|
self.advance();
|
||||||
|
}
|
||||||
|
self.skip_newlines();
|
||||||
|
}
|
||||||
|
|
||||||
while !self.check(TokenKind::RBrace) {
|
while !self.check(TokenKind::RBrace) {
|
||||||
let name = self.parse_ident()?;
|
let name = self.parse_ident()?;
|
||||||
@@ -2237,7 +2257,11 @@ impl Parser {
|
|||||||
|
|
||||||
self.expect(TokenKind::RBrace)?;
|
self.expect(TokenKind::RBrace)?;
|
||||||
let span = start.merge(self.previous_span());
|
let span = start.merge(self.previous_span());
|
||||||
Ok(Expr::Record { fields, span })
|
Ok(Expr::Record {
|
||||||
|
spread,
|
||||||
|
fields,
|
||||||
|
span,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
fn parse_block_rest(&mut self, start: Span) -> Result<Expr, ParseError> {
|
fn parse_block_rest(&mut self, start: Span) -> Result<Expr, ParseError> {
|
||||||
|
|||||||
@@ -527,7 +527,10 @@ impl SymbolTable {
|
|||||||
self.visit_expr(e, scope_idx);
|
self.visit_expr(e, scope_idx);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Expr::Record { fields, .. } => {
|
Expr::Record { spread, fields, .. } => {
|
||||||
|
if let Some(spread_expr) = spread {
|
||||||
|
self.visit_expr(spread_expr, scope_idx);
|
||||||
|
}
|
||||||
for (_, e) in fields {
|
for (_, e) in fields {
|
||||||
self.visit_expr(e, scope_idx);
|
self.visit_expr(e, scope_idx);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -339,7 +339,10 @@ fn references_params(expr: &Expr, params: &[&str]) -> bool {
|
|||||||
Expr::Lambda { body, .. } => references_params(body, params),
|
Expr::Lambda { body, .. } => references_params(body, params),
|
||||||
Expr::Tuple { elements, .. } => elements.iter().any(|e| references_params(e, params)),
|
Expr::Tuple { elements, .. } => elements.iter().any(|e| references_params(e, params)),
|
||||||
Expr::List { elements, .. } => elements.iter().any(|e| references_params(e, params)),
|
Expr::List { elements, .. } => elements.iter().any(|e| references_params(e, params)),
|
||||||
Expr::Record { fields, .. } => fields.iter().any(|(_, e)| references_params(e, params)),
|
Expr::Record { spread, fields, .. } => {
|
||||||
|
spread.as_ref().is_some_and(|s| references_params(s, params))
|
||||||
|
|| fields.iter().any(|(_, e)| references_params(e, params))
|
||||||
|
}
|
||||||
Expr::Match { scrutinee, arms, .. } => {
|
Expr::Match { scrutinee, arms, .. } => {
|
||||||
references_params(scrutinee, params)
|
references_params(scrutinee, params)
|
||||||
|| arms.iter().any(|a| references_params(&a.body, params))
|
|| arms.iter().any(|a| references_params(&a.body, params))
|
||||||
@@ -516,8 +519,9 @@ fn has_recursive_calls(func_name: &str, body: &Expr) -> bool {
|
|||||||
Expr::Tuple { elements, .. } | Expr::List { elements, .. } => {
|
Expr::Tuple { elements, .. } | Expr::List { elements, .. } => {
|
||||||
elements.iter().any(|e| has_recursive_calls(func_name, e))
|
elements.iter().any(|e| has_recursive_calls(func_name, e))
|
||||||
}
|
}
|
||||||
Expr::Record { fields, .. } => {
|
Expr::Record { spread, fields, .. } => {
|
||||||
fields.iter().any(|(_, e)| has_recursive_calls(func_name, e))
|
spread.as_ref().is_some_and(|s| has_recursive_calls(func_name, s))
|
||||||
|
|| fields.iter().any(|(_, e)| has_recursive_calls(func_name, e))
|
||||||
}
|
}
|
||||||
Expr::Field { object, .. } | Expr::TupleIndex { object, .. } => has_recursive_calls(func_name, object),
|
Expr::Field { object, .. } | Expr::TupleIndex { object, .. } => has_recursive_calls(func_name, object),
|
||||||
Expr::Let { value, body, .. } => {
|
Expr::Let { value, body, .. } => {
|
||||||
@@ -672,6 +676,7 @@ fn generate_auto_migration_expr(
|
|||||||
|
|
||||||
// Build the record expression
|
// Build the record expression
|
||||||
Some(Expr::Record {
|
Some(Expr::Record {
|
||||||
|
spread: None,
|
||||||
fields: field_exprs,
|
fields: field_exprs,
|
||||||
span,
|
span,
|
||||||
})
|
})
|
||||||
@@ -1744,7 +1749,11 @@ impl TypeChecker {
|
|||||||
span,
|
span,
|
||||||
} => self.infer_block(statements, result, *span),
|
} => self.infer_block(statements, result, *span),
|
||||||
|
|
||||||
Expr::Record { fields, span } => self.infer_record(fields, *span),
|
Expr::Record {
|
||||||
|
spread,
|
||||||
|
fields,
|
||||||
|
span,
|
||||||
|
} => self.infer_record(spread.as_deref(), fields, *span),
|
||||||
|
|
||||||
Expr::Tuple { elements, span } => self.infer_tuple(elements, *span),
|
Expr::Tuple { elements, span } => self.infer_tuple(elements, *span),
|
||||||
|
|
||||||
@@ -1804,6 +1813,29 @@ impl TypeChecker {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BinaryOp::Concat => {
|
||||||
|
// Concat (++) supports strings and lists
|
||||||
|
if let Err(e) = unify_with_env(&left_type, &right_type, &self.env) {
|
||||||
|
self.errors.push(TypeError {
|
||||||
|
message: format!("Operands of '++' must have same type: {}", e),
|
||||||
|
span,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
match &left_type {
|
||||||
|
Type::String | Type::List(_) | Type::Var(_) => left_type,
|
||||||
|
_ => {
|
||||||
|
self.errors.push(TypeError {
|
||||||
|
message: format!(
|
||||||
|
"Operator '++' requires String or List operands, got {}",
|
||||||
|
left_type
|
||||||
|
),
|
||||||
|
span,
|
||||||
|
});
|
||||||
|
Type::Error
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
BinaryOp::Sub | BinaryOp::Mul | BinaryOp::Div | BinaryOp::Mod => {
|
BinaryOp::Sub | BinaryOp::Mul | BinaryOp::Div | BinaryOp::Mod => {
|
||||||
// Arithmetic: both operands must be same numeric type
|
// Arithmetic: both operands must be same numeric type
|
||||||
if let Err(e) = unify_with_env(&left_type, &right_type, &self.env) {
|
if let Err(e) = unify_with_env(&left_type, &right_type, &self.env) {
|
||||||
@@ -2528,12 +2560,46 @@ impl TypeChecker {
|
|||||||
self.infer_expr(result)
|
self.infer_expr(result)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn infer_record(&mut self, fields: &[(Ident, Expr)], _span: Span) -> Type {
|
fn infer_record(
|
||||||
let field_types: Vec<(String, Type)> = fields
|
&mut self,
|
||||||
|
spread: Option<&Expr>,
|
||||||
|
fields: &[(Ident, Expr)],
|
||||||
|
span: Span,
|
||||||
|
) -> Type {
|
||||||
|
// Start with spread fields if present
|
||||||
|
let mut field_types: Vec<(String, Type)> = if let Some(spread_expr) = spread {
|
||||||
|
let spread_type = self.infer_expr(spread_expr);
|
||||||
|
match spread_type {
|
||||||
|
Type::Record(spread_fields) => spread_fields,
|
||||||
|
_ => {
|
||||||
|
self.errors.push(TypeError {
|
||||||
|
message: format!(
|
||||||
|
"Spread expression must be a record type, got {}",
|
||||||
|
spread_type
|
||||||
|
),
|
||||||
|
span,
|
||||||
|
});
|
||||||
|
Vec::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Vec::new()
|
||||||
|
};
|
||||||
|
|
||||||
|
// Apply explicit field overrides
|
||||||
|
let explicit_types: Vec<(String, Type)> = fields
|
||||||
.iter()
|
.iter()
|
||||||
.map(|(name, expr)| (name.name.clone(), self.infer_expr(expr)))
|
.map(|(name, expr)| (name.name.clone(), self.infer_expr(expr)))
|
||||||
.collect();
|
.collect();
|
||||||
|
|
||||||
|
for (name, typ) in explicit_types {
|
||||||
|
if let Some(existing) = field_types.iter_mut().find(|(n, _)| n == &name) {
|
||||||
|
existing.1 = typ;
|
||||||
|
} else {
|
||||||
|
field_types.push((name, typ));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Type::Record(field_types)
|
Type::Record(field_types)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
12
src/types.rs
12
src/types.rs
@@ -1887,6 +1887,18 @@ impl TypeEnv {
|
|||||||
"round".to_string(),
|
"round".to_string(),
|
||||||
Type::function(vec![Type::var()], Type::Int),
|
Type::function(vec![Type::var()], Type::Int),
|
||||||
),
|
),
|
||||||
|
(
|
||||||
|
"sin".to_string(),
|
||||||
|
Type::function(vec![Type::Float], Type::Float),
|
||||||
|
),
|
||||||
|
(
|
||||||
|
"cos".to_string(),
|
||||||
|
Type::function(vec![Type::Float], Type::Float),
|
||||||
|
),
|
||||||
|
(
|
||||||
|
"atan2".to_string(),
|
||||||
|
Type::function(vec![Type::Float, Type::Float], Type::Float),
|
||||||
|
),
|
||||||
]);
|
]);
|
||||||
env.bind("Math", TypeScheme::mono(math_module_type));
|
env.bind("Math", TypeScheme::mono(math_module_type));
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user