Compare commits
8 Commits
v0.1.5
...
746643527d
| Author | SHA1 | Date | |
|---|---|---|---|
| 746643527d | |||
| 091ff1e422 | |||
| 1fc472a54c | |||
| caabaeeb9c | |||
| 4e43d3d50d | |||
| fd5ed53b29 | |||
| 2800ce4e2d | |||
| ec365ebb3f |
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -770,7 +770,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "lux"
|
||||
version = "0.1.4"
|
||||
version = "0.1.6"
|
||||
dependencies = [
|
||||
"lsp-server",
|
||||
"lsp-types",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "lux"
|
||||
version = "0.1.5"
|
||||
version = "0.1.6"
|
||||
edition = "2021"
|
||||
description = "A functional programming language with first-class effects, schema evolution, and behavioral types"
|
||||
license = "MIT"
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
printf "\n"
|
||||
printf " \033[1;35m╦ ╦ ╦╦ ╦\033[0m\n"
|
||||
printf " \033[1;35m║ ║ ║╔╣\033[0m\n"
|
||||
printf " \033[1;35m╩═╝╚═╝╩ ╩\033[0m v0.1.5\n"
|
||||
printf " \033[1;35m╩═╝╚═╝╩ ╩\033[0m v0.1.6\n"
|
||||
printf "\n"
|
||||
printf " Functional language with first-class effects\n"
|
||||
printf "\n"
|
||||
@@ -62,7 +62,7 @@
|
||||
|
||||
packages.default = pkgs.rustPlatform.buildRustPackage {
|
||||
pname = "lux";
|
||||
version = "0.1.5";
|
||||
version = "0.1.6";
|
||||
src = ./.;
|
||||
cargoLock.lockFile = ./Cargo.lock;
|
||||
|
||||
@@ -79,7 +79,7 @@
|
||||
};
|
||||
in muslPkgs.rustPlatform.buildRustPackage {
|
||||
pname = "lux";
|
||||
version = "0.1.5";
|
||||
version = "0.1.6";
|
||||
src = ./.;
|
||||
cargoLock.lockFile = ./Cargo.lock;
|
||||
|
||||
|
||||
@@ -697,8 +697,9 @@ pub enum Pattern {
|
||||
Var(Ident),
|
||||
/// Literal: 42, "hello", true
|
||||
Literal(Literal),
|
||||
/// Constructor: Some(x), None, Ok(v)
|
||||
/// Constructor: Some(x), None, Ok(v), module.Constructor(x)
|
||||
Constructor {
|
||||
module: Option<Ident>,
|
||||
name: Ident,
|
||||
fields: Vec<Pattern>,
|
||||
span: Span,
|
||||
|
||||
@@ -146,6 +146,8 @@ pub struct CBackend {
|
||||
imported_modules: HashSet<String>,
|
||||
/// Variable name renames: Lux name → C variable name (for let binding name mangling)
|
||||
var_renames: HashMap<String, String>,
|
||||
/// Inner type for Option-typed variables (variable name -> inner C type, e.g. "LuxInt")
|
||||
var_option_inner_types: HashMap<String, String>,
|
||||
}
|
||||
|
||||
impl CBackend {
|
||||
@@ -177,6 +179,7 @@ impl CBackend {
|
||||
module_functions: HashMap::new(),
|
||||
imported_modules: HashSet::new(),
|
||||
var_renames: HashMap::new(),
|
||||
var_option_inner_types: HashMap::new(),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -279,7 +282,7 @@ impl CBackend {
|
||||
Declaration::Let(let_decl) => {
|
||||
// Skip run expressions - they're handled in the main wrapper
|
||||
if !matches!(&let_decl.value, Expr::Run { .. }) {
|
||||
self.emit_global_let(&let_decl.name)?;
|
||||
self.emit_global_let(let_decl)?;
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
@@ -599,6 +602,18 @@ impl CBackend {
|
||||
self.writeln(&format!("{} {}({}) {{", ret_type, mangled_name, full_params));
|
||||
self.indent += 1;
|
||||
|
||||
// Register parameter types so match/option inference can use them
|
||||
for p in &func.params {
|
||||
if let Ok(c_type) = self.type_expr_to_c(&p.typ) {
|
||||
let escaped = self.escape_c_keyword(&p.name.name);
|
||||
self.var_types.insert(escaped.clone(), c_type);
|
||||
// Track Option inner types for match pattern extraction
|
||||
if let Some(inner) = self.option_inner_type_from_type_expr(&p.typ) {
|
||||
self.var_option_inner_types.insert(escaped, inner);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let old_has_evidence = self.has_evidence;
|
||||
if is_effectful {
|
||||
self.has_evidence = true;
|
||||
@@ -1149,6 +1164,7 @@ impl CBackend {
|
||||
self.writeln(" void (*delete_file)(void* env, LuxString path);");
|
||||
self.writeln(" LuxBool (*isDir)(void* env, LuxString path);");
|
||||
self.writeln(" void (*mkdir)(void* env, LuxString path);");
|
||||
self.writeln(" void (*copy)(void* env, LuxString src, LuxString dst);");
|
||||
self.writeln(" LuxList* (*readDir)(void* env, LuxString path);");
|
||||
self.writeln(" void* env;");
|
||||
self.writeln("} LuxFileHandler;");
|
||||
@@ -1336,6 +1352,20 @@ impl CBackend {
|
||||
self.writeln(" mkdir(path, 0755);");
|
||||
self.writeln("}");
|
||||
self.writeln("");
|
||||
self.writeln("static void lux_file_copy(LuxString src, LuxString dst) {");
|
||||
self.writeln(" FILE* fin = fopen(src, \"rb\");");
|
||||
self.writeln(" if (!fin) return;");
|
||||
self.writeln(" FILE* fout = fopen(dst, \"wb\");");
|
||||
self.writeln(" if (!fout) { fclose(fin); return; }");
|
||||
self.writeln(" char buf[4096];");
|
||||
self.writeln(" size_t n;");
|
||||
self.writeln(" while ((n = fread(buf, 1, sizeof(buf), fin)) > 0) {");
|
||||
self.writeln(" fwrite(buf, 1, n, fout);");
|
||||
self.writeln(" }");
|
||||
self.writeln(" fclose(fin);");
|
||||
self.writeln(" fclose(fout);");
|
||||
self.writeln("}");
|
||||
self.writeln("");
|
||||
self.writeln("#include <dirent.h>");
|
||||
self.writeln("// Forward declarations needed by lux_file_readDir");
|
||||
self.writeln("static LuxList* lux_list_new(int64_t capacity);");
|
||||
@@ -1391,6 +1421,11 @@ impl CBackend {
|
||||
self.writeln(" lux_file_mkdir(path);");
|
||||
self.writeln("}");
|
||||
self.writeln("");
|
||||
self.writeln("static void default_file_copy(void* env, LuxString src, LuxString dst) {");
|
||||
self.writeln(" (void)env;");
|
||||
self.writeln(" lux_file_copy(src, dst);");
|
||||
self.writeln("}");
|
||||
self.writeln("");
|
||||
self.writeln("static LuxList* default_file_readDir(void* env, LuxString path) {");
|
||||
self.writeln(" (void)env;");
|
||||
self.writeln(" return lux_file_readDir(path);");
|
||||
@@ -1404,6 +1439,7 @@ impl CBackend {
|
||||
self.writeln(" .delete_file = default_file_delete,");
|
||||
self.writeln(" .isDir = default_file_isDir,");
|
||||
self.writeln(" .mkdir = default_file_mkdir,");
|
||||
self.writeln(" .copy = default_file_copy,");
|
||||
self.writeln(" .readDir = default_file_readDir,");
|
||||
self.writeln(" .env = NULL");
|
||||
self.writeln("};");
|
||||
@@ -2051,6 +2087,42 @@ impl CBackend {
|
||||
self.writeln(" return result;");
|
||||
self.writeln("}");
|
||||
self.writeln("");
|
||||
// Sort helper: compare two void* as boxed ints
|
||||
self.writeln("static int lux_compare_int(const void* a, const void* b) {");
|
||||
self.writeln(" LuxInt va = *(LuxInt*)(*(void**)a);");
|
||||
self.writeln(" LuxInt vb = *(LuxInt*)(*(void**)b);");
|
||||
self.writeln(" return (va > vb) - (va < vb);");
|
||||
self.writeln("}");
|
||||
self.writeln("");
|
||||
self.writeln("static int lux_compare_string(const void* a, const void* b) {");
|
||||
self.writeln(" LuxString sa = (LuxString)(*(void**)a);");
|
||||
self.writeln(" LuxString sb = (LuxString)(*(void**)b);");
|
||||
self.writeln(" return strcmp(sa, sb);");
|
||||
self.writeln("}");
|
||||
self.writeln("");
|
||||
self.writeln("static LuxList* lux_list_sort(LuxList* list) {");
|
||||
self.writeln(" if (list->length <= 1) {");
|
||||
self.writeln(" lux_incref(list);");
|
||||
self.writeln(" return list;");
|
||||
self.writeln(" }");
|
||||
self.writeln(" LuxList* result = lux_list_new(list->length);");
|
||||
self.writeln(" for (int64_t i = 0; i < list->length; i++) {");
|
||||
self.writeln(" lux_incref(list->elements[i]);");
|
||||
self.writeln(" result->elements[i] = list->elements[i];");
|
||||
self.writeln(" }");
|
||||
self.writeln(" result->length = list->length;");
|
||||
self.writeln(" // Determine element type from first element and sort");
|
||||
self.writeln(" if (result->length > 0 && result->elements[0] != NULL) {");
|
||||
self.writeln(" uint32_t tag = LUX_RC_HEADER(result->elements[0])->tag;");
|
||||
self.writeln(" if (tag == LUX_TAG_BOXED_INT) {");
|
||||
self.writeln(" qsort(result->elements, result->length, sizeof(void*), lux_compare_int);");
|
||||
self.writeln(" } else if (tag == LUX_TAG_STRING) {");
|
||||
self.writeln(" qsort(result->elements, result->length, sizeof(void*), lux_compare_string);");
|
||||
self.writeln(" }");
|
||||
self.writeln(" }");
|
||||
self.writeln(" return result;");
|
||||
self.writeln("}");
|
||||
self.writeln("");
|
||||
// === Map Runtime Functions ===
|
||||
self.writeln("static LuxMap* lux_map_new(int64_t capacity) {");
|
||||
self.writeln(" LuxMap* map = (LuxMap*)malloc(sizeof(LuxMap));");
|
||||
@@ -2124,20 +2196,6 @@ impl CBackend {
|
||||
self.writeln("static Option lux_option_none(void) { return (Option){Option_TAG_NONE}; }");
|
||||
self.writeln("static Option lux_option_some(void* value) { return (Option){Option_TAG_SOME, .data.some = {value}}; }");
|
||||
self.writeln("");
|
||||
self.writeln("// String indexOf / lastIndexOf — return Option<Int>");
|
||||
self.writeln("static Option lux_string_indexOf(LuxString s, LuxString needle) {");
|
||||
self.writeln(" char* pos = strstr(s, needle);");
|
||||
self.writeln(" if (pos) return lux_option_some((void*)(intptr_t)(pos - s));");
|
||||
self.writeln(" return lux_option_none();");
|
||||
self.writeln("}");
|
||||
self.writeln("static Option lux_string_lastIndexOf(LuxString s, LuxString needle) {");
|
||||
self.writeln(" char* last = NULL;");
|
||||
self.writeln(" char* pos = strstr(s, needle);");
|
||||
self.writeln(" while (pos) { last = pos; pos = strstr(pos + 1, needle); }");
|
||||
self.writeln(" if (last) return lux_option_some((void*)(intptr_t)(last - s));");
|
||||
self.writeln(" return lux_option_none();");
|
||||
self.writeln("}");
|
||||
self.writeln("");
|
||||
self.writeln("// === Boxing/Unboxing ===");
|
||||
self.writeln("// All boxed values are RC-managed.");
|
||||
self.writeln("");
|
||||
@@ -2171,6 +2229,20 @@ impl CBackend {
|
||||
self.writeln("}");
|
||||
self.writeln("static LuxString lux_unbox_string(void* p) { return (LuxString)p; }");
|
||||
self.writeln("");
|
||||
self.writeln("// String indexOf / lastIndexOf — return Option<Int>");
|
||||
self.writeln("static Option lux_string_indexOf(LuxString s, LuxString needle) {");
|
||||
self.writeln(" char* pos = strstr(s, needle);");
|
||||
self.writeln(" if (pos) return lux_option_some(lux_box_int((LuxInt)(pos - s)));");
|
||||
self.writeln(" return lux_option_none();");
|
||||
self.writeln("}");
|
||||
self.writeln("static Option lux_string_lastIndexOf(LuxString s, LuxString needle) {");
|
||||
self.writeln(" char* last = NULL;");
|
||||
self.writeln(" char* pos = strstr(s, needle);");
|
||||
self.writeln(" while (pos) { last = pos; pos = strstr(pos + 1, needle); }");
|
||||
self.writeln(" if (last) return lux_option_some(lux_box_int((LuxInt)(last - s)));");
|
||||
self.writeln(" return lux_option_none();");
|
||||
self.writeln("}");
|
||||
self.writeln("");
|
||||
self.writeln("// === Polymorphic Drop Function ===");
|
||||
self.writeln("// Called when an object's refcount reaches zero.");
|
||||
self.writeln("// Recursively decrefs any owned references before freeing.");
|
||||
@@ -2706,7 +2778,11 @@ impl CBackend {
|
||||
for param in &func.params {
|
||||
let escaped = self.escape_c_keyword(¶m.name.name);
|
||||
if let Ok(c_type) = self.type_expr_to_c(¶m.typ) {
|
||||
self.var_types.insert(escaped, c_type);
|
||||
self.var_types.insert(escaped.clone(), c_type);
|
||||
// Track Option inner types for match pattern extraction
|
||||
if let Some(inner) = self.option_inner_type_from_type_expr(¶m.typ) {
|
||||
self.var_option_inner_types.insert(escaped, inner);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3067,6 +3143,13 @@ impl CBackend {
|
||||
// Infer the type from the value expression
|
||||
let var_type = self.infer_expr_type(value).unwrap_or_else(|| "LuxInt".to_string());
|
||||
|
||||
// Track Option inner type for match pattern extraction
|
||||
if var_type == "Option" {
|
||||
if let Some(inner) = self.infer_option_inner_type(value) {
|
||||
self.var_option_inner_types.insert(var_name.clone(), inner);
|
||||
}
|
||||
}
|
||||
|
||||
self.writeln(&format!("{} {} = {};", var_type, var_name, val));
|
||||
|
||||
// Register the variable rename so nested expressions can find it
|
||||
@@ -3375,6 +3458,13 @@ impl CBackend {
|
||||
// Record variable type for future inference
|
||||
self.var_types.insert(escaped_name.clone(), typ.clone());
|
||||
|
||||
// Track Option inner type for match pattern extraction
|
||||
if typ == "Option" {
|
||||
if let Some(inner) = self.infer_option_inner_type(value) {
|
||||
self.var_option_inner_types.insert(escaped_name.clone(), inner);
|
||||
}
|
||||
}
|
||||
|
||||
// Handle ownership transfer or RC registration
|
||||
if let Some(source_name) = source_var {
|
||||
// Ownership transfer: unregister source, register dest
|
||||
@@ -3679,6 +3769,16 @@ impl CBackend {
|
||||
}
|
||||
return Ok("NULL".to_string());
|
||||
}
|
||||
"copy" => {
|
||||
let src = self.emit_expr(&args[0])?;
|
||||
let dst = self.emit_expr(&args[1])?;
|
||||
if self.has_evidence {
|
||||
self.writeln(&format!("ev->file->copy(ev->file->env, {}, {});", src, dst));
|
||||
} else {
|
||||
self.writeln(&format!("lux_file_copy({}, {});", src, dst));
|
||||
}
|
||||
return Ok("NULL".to_string());
|
||||
}
|
||||
"readDir" | "listDir" => {
|
||||
let path = self.emit_expr(&args[0])?;
|
||||
let temp = format!("_readdir_{}", self.fresh_name());
|
||||
@@ -4615,6 +4715,82 @@ impl CBackend {
|
||||
Ok(result_var)
|
||||
}
|
||||
|
||||
"sort" => {
|
||||
if args.len() != 1 {
|
||||
return Err(CGenError {
|
||||
message: "List.sort takes 1 argument".to_string(),
|
||||
span: None,
|
||||
});
|
||||
}
|
||||
let list = self.emit_expr(&args[0])?;
|
||||
let result_var = format!("_sorted_{}", self.fresh_name());
|
||||
self.writeln(&format!(
|
||||
"LuxList* {} = lux_list_sort({});",
|
||||
result_var, list
|
||||
));
|
||||
self.register_rc_var(&result_var, "LuxList*");
|
||||
Ok(result_var)
|
||||
}
|
||||
"sortBy" => {
|
||||
if args.len() != 2 {
|
||||
return Err(CGenError {
|
||||
message: "List.sortBy takes 2 arguments".to_string(),
|
||||
span: None,
|
||||
});
|
||||
}
|
||||
let list = self.emit_expr(&args[0])?;
|
||||
let closure = self.emit_expr(&args[1])?;
|
||||
let result_var = format!("_sorted_{}", self.fresh_name());
|
||||
// Copy the list then do insertion sort with custom comparator
|
||||
self.writeln(&format!(
|
||||
"LuxList* {} = lux_list_new({}->length);",
|
||||
result_var, list
|
||||
));
|
||||
self.writeln(&format!(
|
||||
"for (int64_t _i = 0; _i < {}->length; _i++) {{",
|
||||
list
|
||||
));
|
||||
self.writeln(&format!(
|
||||
" lux_incref({}->elements[_i]);",
|
||||
list
|
||||
));
|
||||
self.writeln(&format!(
|
||||
" {}->elements[_i] = {}->elements[_i];",
|
||||
result_var, list
|
||||
));
|
||||
self.writeln("}");
|
||||
self.writeln(&format!(
|
||||
"{}->length = {}->length;",
|
||||
result_var, list
|
||||
));
|
||||
// Insertion sort using the comparator closure
|
||||
self.writeln(&format!(
|
||||
"for (int64_t _i = 1; _i < {}->length; _i++) {{",
|
||||
result_var
|
||||
));
|
||||
self.writeln(&format!(
|
||||
" void* _key = {}->elements[_i];",
|
||||
result_var
|
||||
));
|
||||
self.writeln(" int64_t _j = _i - 1;");
|
||||
self.writeln(&format!(
|
||||
" while (_j >= 0 && *(LuxInt*){}.fn({}.env, {}->elements[_j], _key) > 0) {{",
|
||||
closure, closure, result_var
|
||||
));
|
||||
self.writeln(&format!(
|
||||
" {}->elements[_j + 1] = {}->elements[_j];",
|
||||
result_var, result_var
|
||||
));
|
||||
self.writeln(" _j--;");
|
||||
self.writeln(" }");
|
||||
self.writeln(&format!(
|
||||
" {}->elements[_j + 1] = _key;",
|
||||
result_var
|
||||
));
|
||||
self.writeln("}");
|
||||
self.register_rc_var(&result_var, "LuxList*");
|
||||
Ok(result_var)
|
||||
}
|
||||
_ => Err(CGenError {
|
||||
message: format!("Unsupported List operation: {}", op),
|
||||
span: None,
|
||||
@@ -4841,8 +5017,8 @@ impl CBackend {
|
||||
if c_type == "void*" {
|
||||
// Cast from void* to actual type
|
||||
if Self::is_primitive_c_type(&actual_type) {
|
||||
// For primitive types stored as void*, cast via intptr_t
|
||||
self.writeln(&format!("{} {} = ({})(intptr_t)({});", actual_type, var_name, actual_type, c_expr));
|
||||
// For primitive types stored as boxed void*, dereference
|
||||
self.writeln(&format!("{} {} = *({}*)({});", actual_type, var_name, actual_type, c_expr));
|
||||
} else if !actual_type.ends_with('*') && actual_type != "void" {
|
||||
// Struct types: cast to pointer and dereference
|
||||
self.writeln(&format!("{} {} = *({}*)({});", actual_type, var_name, actual_type, c_expr));
|
||||
@@ -5142,7 +5318,7 @@ impl CBackend {
|
||||
if effect.name == "List" {
|
||||
match operation.name.as_str() {
|
||||
// Operations returning lists
|
||||
"map" | "filter" | "concat" | "reverse" | "take" | "drop" | "range" => Some("LuxList*".to_string()),
|
||||
"map" | "filter" | "concat" | "reverse" | "take" | "drop" | "range" | "sort" | "sortBy" => Some("LuxList*".to_string()),
|
||||
// Operations returning Option
|
||||
"head" | "tail" | "get" | "find" => Some("Option".to_string()),
|
||||
// Operations returning Int
|
||||
@@ -5175,7 +5351,7 @@ impl CBackend {
|
||||
} else if effect.name == "File" {
|
||||
match operation.name.as_str() {
|
||||
"read" => Some("LuxString".to_string()),
|
||||
"write" | "append" | "delete" | "mkdir" => Some("void".to_string()),
|
||||
"write" | "append" | "delete" | "mkdir" | "copy" => Some("void".to_string()),
|
||||
"exists" | "isDir" => Some("LuxBool".to_string()),
|
||||
"readDir" | "listDir" => Some("LuxList*".to_string()),
|
||||
_ => None,
|
||||
@@ -5383,7 +5559,13 @@ impl CBackend {
|
||||
None
|
||||
}
|
||||
}
|
||||
Expr::Var(_) => None,
|
||||
Expr::Var(ident) => {
|
||||
let escaped = self.escape_c_keyword(&ident.name);
|
||||
// Check renamed variables first, then original name
|
||||
let lookup_name = self.var_renames.get(&ident.name).unwrap_or(&escaped);
|
||||
self.var_option_inner_types.get(lookup_name).cloned()
|
||||
.or_else(|| self.var_option_inner_types.get(&escaped).cloned())
|
||||
}
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
@@ -5561,9 +5743,25 @@ impl CBackend {
|
||||
}
|
||||
}
|
||||
|
||||
fn emit_global_let(&mut self, name: &Ident) -> Result<(), CGenError> {
|
||||
// Declare global variable without initializer (initialized in main)
|
||||
self.writeln(&format!("static LuxInt {} = 0;", name.name));
|
||||
fn emit_global_let(&mut self, let_decl: &crate::ast::LetDecl) -> Result<(), CGenError> {
|
||||
// Infer type from the value expression (or type annotation)
|
||||
let typ = if let Some(ref type_expr) = let_decl.typ {
|
||||
self.type_expr_to_c(type_expr).unwrap_or_else(|_| "LuxInt".to_string())
|
||||
} else {
|
||||
self.infer_expr_type(&let_decl.value).unwrap_or_else(|| "LuxInt".to_string())
|
||||
};
|
||||
let default = match typ.as_str() {
|
||||
"LuxString" => "NULL",
|
||||
"LuxBool" => "false",
|
||||
"LuxFloat" => "0.0",
|
||||
"LuxList*" | "LuxClosure*" => "NULL",
|
||||
"Option" => "{0}",
|
||||
"Result" => "{0}",
|
||||
_ if typ.ends_with('*') => "NULL",
|
||||
_ => "0",
|
||||
};
|
||||
self.writeln(&format!("static {} {} = {};", typ, let_decl.name.name, default));
|
||||
self.var_types.insert(let_decl.name.name.clone(), typ);
|
||||
self.writeln("");
|
||||
Ok(())
|
||||
}
|
||||
@@ -5666,6 +5864,20 @@ impl CBackend {
|
||||
self.type_expr_to_c(type_expr)
|
||||
}
|
||||
|
||||
/// Extract the inner C type from an Option<T> type expression
|
||||
fn option_inner_type_from_type_expr(&self, type_expr: &TypeExpr) -> Option<String> {
|
||||
if let TypeExpr::App(base, args) = type_expr {
|
||||
if let TypeExpr::Named(name) = base.as_ref() {
|
||||
if name.name == "Option" {
|
||||
if let Some(inner) = args.first() {
|
||||
return self.type_expr_to_c(inner).ok();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
fn type_expr_to_c(&self, type_expr: &TypeExpr) -> Result<String, CGenError> {
|
||||
match type_expr {
|
||||
TypeExpr::Named(ident) => {
|
||||
|
||||
@@ -1812,6 +1812,18 @@ impl JsBackend {
|
||||
end, start, start
|
||||
))
|
||||
}
|
||||
"sort" => {
|
||||
let list = self.emit_expr(&args[0])?;
|
||||
Ok(format!(
|
||||
"[...{}].sort((a, b) => a < b ? -1 : a > b ? 1 : 0)",
|
||||
list
|
||||
))
|
||||
}
|
||||
"sortBy" => {
|
||||
let list = self.emit_expr(&args[0])?;
|
||||
let func = self.emit_expr(&args[1])?;
|
||||
Ok(format!("[...{}].sort({})", list, func))
|
||||
}
|
||||
_ => Err(JsGenError {
|
||||
message: format!("Unknown List operation: {}", operation),
|
||||
span: None,
|
||||
|
||||
@@ -333,11 +333,13 @@ mod tests {
|
||||
fn test_option_exhaustive() {
|
||||
let patterns = vec![
|
||||
Pattern::Constructor {
|
||||
module: None,
|
||||
name: make_ident("None"),
|
||||
fields: vec![],
|
||||
span: span(),
|
||||
},
|
||||
Pattern::Constructor {
|
||||
module: None,
|
||||
name: make_ident("Some"),
|
||||
fields: vec![Pattern::Wildcard(span())],
|
||||
span: span(),
|
||||
@@ -352,6 +354,7 @@ mod tests {
|
||||
#[test]
|
||||
fn test_option_missing_none() {
|
||||
let patterns = vec![Pattern::Constructor {
|
||||
module: None,
|
||||
name: make_ident("Some"),
|
||||
fields: vec![Pattern::Wildcard(span())],
|
||||
span: span(),
|
||||
@@ -391,11 +394,13 @@ mod tests {
|
||||
fn test_result_exhaustive() {
|
||||
let patterns = vec![
|
||||
Pattern::Constructor {
|
||||
module: None,
|
||||
name: make_ident("Ok"),
|
||||
fields: vec![Pattern::Wildcard(span())],
|
||||
span: span(),
|
||||
},
|
||||
Pattern::Constructor {
|
||||
module: None,
|
||||
name: make_ident("Err"),
|
||||
fields: vec![Pattern::Wildcard(span())],
|
||||
span: span(),
|
||||
|
||||
@@ -733,7 +733,30 @@ impl Formatter {
|
||||
match &lit.kind {
|
||||
LiteralKind::Int(n) => n.to_string(),
|
||||
LiteralKind::Float(f) => format!("{}", f),
|
||||
LiteralKind::String(s) => format!("\"{}\"", s.replace('\\', "\\\\").replace('"', "\\\"").replace('{', "\\{").replace('}', "\\}")),
|
||||
LiteralKind::String(s) => {
|
||||
if s.contains('\n') {
|
||||
// Use triple-quoted multiline string
|
||||
let tab = " ".repeat(self.config.indent_size);
|
||||
let base_indent = tab.repeat(self.indent_level);
|
||||
let content_indent = tab.repeat(self.indent_level + 1);
|
||||
let lines: Vec<&str> = s.split('\n').collect();
|
||||
let mut result = String::from("\"\"\"\n");
|
||||
for line in &lines {
|
||||
if line.is_empty() {
|
||||
result.push('\n');
|
||||
} else {
|
||||
result.push_str(&content_indent);
|
||||
result.push_str(&line.replace('{', "\\{").replace('}', "\\}"));
|
||||
result.push('\n');
|
||||
}
|
||||
}
|
||||
result.push_str(&base_indent);
|
||||
result.push_str("\"\"\"");
|
||||
result
|
||||
} else {
|
||||
format!("\"{}\"", s.replace('\\', "\\\\").replace('"', "\\\"").replace('{', "\\{").replace('}', "\\}"))
|
||||
}
|
||||
},
|
||||
LiteralKind::Char(c) => format!("'{}'", c),
|
||||
LiteralKind::Bool(b) => b.to_string(),
|
||||
LiteralKind::Unit => "()".to_string(),
|
||||
@@ -772,12 +795,22 @@ impl Formatter {
|
||||
Pattern::Wildcard(_) => "_".to_string(),
|
||||
Pattern::Var(ident) => ident.name.clone(),
|
||||
Pattern::Literal(lit) => self.format_literal(lit),
|
||||
Pattern::Constructor { name, fields, .. } => {
|
||||
Pattern::Constructor {
|
||||
module,
|
||||
name,
|
||||
fields,
|
||||
..
|
||||
} => {
|
||||
let prefix = match module {
|
||||
Some(m) => format!("{}.", m.name),
|
||||
None => String::new(),
|
||||
};
|
||||
if fields.is_empty() {
|
||||
name.name.clone()
|
||||
format!("{}{}", prefix, name.name)
|
||||
} else {
|
||||
format!(
|
||||
"{}({})",
|
||||
"{}{}({})",
|
||||
prefix,
|
||||
name.name,
|
||||
fields
|
||||
.iter()
|
||||
|
||||
@@ -28,6 +28,8 @@ pub enum BuiltinFn {
|
||||
ListGet,
|
||||
ListRange,
|
||||
ListForEach,
|
||||
ListSort,
|
||||
ListSortBy,
|
||||
|
||||
// String operations
|
||||
StringSplit,
|
||||
@@ -980,6 +982,11 @@ impl Interpreter {
|
||||
"forEach".to_string(),
|
||||
Value::Builtin(BuiltinFn::ListForEach),
|
||||
),
|
||||
("sort".to_string(), Value::Builtin(BuiltinFn::ListSort)),
|
||||
(
|
||||
"sortBy".to_string(),
|
||||
Value::Builtin(BuiltinFn::ListSortBy),
|
||||
),
|
||||
]));
|
||||
env.define("List", list_module);
|
||||
|
||||
@@ -2742,6 +2749,67 @@ impl Interpreter {
|
||||
Ok(EvalResult::Value(Value::Unit))
|
||||
}
|
||||
|
||||
BuiltinFn::ListSort => {
|
||||
// List.sort(list) - sort using natural ordering (Int, Float, String, Bool)
|
||||
let mut list =
|
||||
Self::expect_arg_1::<Vec<Value>>(&args, "List.sort", span)?;
|
||||
list.sort_by(|a, b| Self::compare_values(a, b));
|
||||
Ok(EvalResult::Value(Value::List(list)))
|
||||
}
|
||||
|
||||
BuiltinFn::ListSortBy => {
|
||||
// List.sortBy(list, fn(a, b) => Int) - sort with custom comparator
|
||||
// Comparator returns negative (a < b), 0 (a == b), or positive (a > b)
|
||||
let (list, func) =
|
||||
Self::expect_args_2::<Vec<Value>, Value>(&args, "List.sortBy", span)?;
|
||||
let mut indexed: Vec<(usize, Value)> =
|
||||
list.into_iter().enumerate().collect();
|
||||
let mut err: Option<RuntimeError> = None;
|
||||
let func_ref = &func;
|
||||
let self_ptr = self as *mut Self;
|
||||
indexed.sort_by(|a, b| {
|
||||
if err.is_some() {
|
||||
return std::cmp::Ordering::Equal;
|
||||
}
|
||||
// Safety: we're in a single-threaded context and the closure
|
||||
// needs mutable access to call eval_call_to_value
|
||||
let interp = unsafe { &mut *self_ptr };
|
||||
match interp.eval_call_to_value(
|
||||
func_ref.clone(),
|
||||
vec![a.1.clone(), b.1.clone()],
|
||||
span,
|
||||
) {
|
||||
Ok(Value::Int(n)) => {
|
||||
if n < 0 {
|
||||
std::cmp::Ordering::Less
|
||||
} else if n > 0 {
|
||||
std::cmp::Ordering::Greater
|
||||
} else {
|
||||
std::cmp::Ordering::Equal
|
||||
}
|
||||
}
|
||||
Ok(_) => {
|
||||
err = Some(RuntimeError {
|
||||
message: "List.sortBy comparator must return Int"
|
||||
.to_string(),
|
||||
span: Some(span),
|
||||
});
|
||||
std::cmp::Ordering::Equal
|
||||
}
|
||||
Err(e) => {
|
||||
err = Some(e);
|
||||
std::cmp::Ordering::Equal
|
||||
}
|
||||
}
|
||||
});
|
||||
if let Some(e) = err {
|
||||
return Err(e);
|
||||
}
|
||||
let result: Vec<Value> =
|
||||
indexed.into_iter().map(|(_, v)| v).collect();
|
||||
Ok(EvalResult::Value(Value::List(result)))
|
||||
}
|
||||
|
||||
// Additional String operations
|
||||
BuiltinFn::StringStartsWith => {
|
||||
let (s, prefix) = Self::expect_args_2::<String, String>(&args, "String.startsWith", span)?;
|
||||
@@ -3357,6 +3425,18 @@ impl Interpreter {
|
||||
})
|
||||
}
|
||||
|
||||
/// Compare two values for natural ordering (used by List.sort)
|
||||
fn compare_values(a: &Value, b: &Value) -> std::cmp::Ordering {
|
||||
match (a, b) {
|
||||
(Value::Int(x), Value::Int(y)) => x.cmp(y),
|
||||
(Value::Float(x), Value::Float(y)) => x.partial_cmp(y).unwrap_or(std::cmp::Ordering::Equal),
|
||||
(Value::String(x), Value::String(y)) => x.cmp(y),
|
||||
(Value::Bool(x), Value::Bool(y)) => x.cmp(y),
|
||||
(Value::Char(x), Value::Char(y)) => x.cmp(y),
|
||||
_ => std::cmp::Ordering::Equal,
|
||||
}
|
||||
}
|
||||
|
||||
fn match_pattern(&self, pattern: &Pattern, value: &Value) -> Option<Vec<(String, Value)>> {
|
||||
match pattern {
|
||||
Pattern::Wildcard(_) => Some(Vec::new()),
|
||||
@@ -3864,6 +3944,30 @@ impl Interpreter {
|
||||
}
|
||||
}
|
||||
|
||||
("File", "copy") => {
|
||||
let source = match request.args.first() {
|
||||
Some(Value::String(s)) => s.clone(),
|
||||
_ => return Err(RuntimeError {
|
||||
message: "File.copy requires a string source path".to_string(),
|
||||
span: None,
|
||||
}),
|
||||
};
|
||||
let dest = match request.args.get(1) {
|
||||
Some(Value::String(s)) => s.clone(),
|
||||
_ => return Err(RuntimeError {
|
||||
message: "File.copy requires a string destination path".to_string(),
|
||||
span: None,
|
||||
}),
|
||||
};
|
||||
match std::fs::copy(&source, &dest) {
|
||||
Ok(_) => Ok(Value::Unit),
|
||||
Err(e) => Err(RuntimeError {
|
||||
message: format!("Failed to copy '{}' to '{}': {}", source, dest, e),
|
||||
span: None,
|
||||
}),
|
||||
}
|
||||
}
|
||||
|
||||
// ===== Process Effect =====
|
||||
("Process", "exec") => {
|
||||
use std::process::Command;
|
||||
|
||||
226
src/lexer.rs
226
src/lexer.rs
@@ -411,7 +411,26 @@ impl<'a> Lexer<'a> {
|
||||
}
|
||||
|
||||
// String literals
|
||||
'"' => self.scan_string(start)?,
|
||||
'"' => {
|
||||
// Check for triple-quote multiline string """
|
||||
if self.peek() == Some('"') {
|
||||
// Clone to peek at the second char
|
||||
let mut lookahead = self.chars.clone();
|
||||
lookahead.next(); // consume first peeked "
|
||||
if lookahead.peek() == Some(&'"') {
|
||||
// It's a triple-quote: consume both remaining quotes
|
||||
self.advance(); // second "
|
||||
self.advance(); // third "
|
||||
self.scan_multiline_string(start)?
|
||||
} else {
|
||||
// It's an empty string ""
|
||||
self.advance(); // consume closing "
|
||||
TokenKind::String(String::new())
|
||||
}
|
||||
} else {
|
||||
self.scan_string(start)?
|
||||
}
|
||||
}
|
||||
|
||||
// Char literals
|
||||
'\'' => self.scan_char(start)?,
|
||||
@@ -669,6 +688,211 @@ impl<'a> Lexer<'a> {
|
||||
Ok(TokenKind::InterpolatedString(parts))
|
||||
}
|
||||
|
||||
fn scan_multiline_string(&mut self, _start: usize) -> Result<TokenKind, LexError> {
|
||||
let mut parts: Vec<StringPart> = Vec::new();
|
||||
let mut current_literal = String::new();
|
||||
|
||||
// Skip the first newline after opening """ if present
|
||||
if self.peek() == Some('\n') {
|
||||
self.advance();
|
||||
} else if self.peek() == Some('\r') {
|
||||
self.advance();
|
||||
if self.peek() == Some('\n') {
|
||||
self.advance();
|
||||
}
|
||||
}
|
||||
|
||||
loop {
|
||||
match self.advance() {
|
||||
Some('"') => {
|
||||
// Check for closing """
|
||||
if self.peek() == Some('"') {
|
||||
let mut lookahead = self.chars.clone();
|
||||
lookahead.next(); // consume first peeked "
|
||||
if lookahead.peek() == Some(&'"') {
|
||||
// Closing """ found
|
||||
self.advance(); // second "
|
||||
self.advance(); // third "
|
||||
break;
|
||||
}
|
||||
}
|
||||
// Not closing triple-quote, just a regular " in the string
|
||||
current_literal.push('"');
|
||||
}
|
||||
Some('\\') => {
|
||||
// Handle escape sequences (same as regular strings)
|
||||
match self.peek() {
|
||||
Some('{') => {
|
||||
self.advance();
|
||||
current_literal.push('{');
|
||||
}
|
||||
Some('}') => {
|
||||
self.advance();
|
||||
current_literal.push('}');
|
||||
}
|
||||
_ => {
|
||||
let escape_start = self.pos;
|
||||
let escaped = match self.advance() {
|
||||
Some('n') => '\n',
|
||||
Some('r') => '\r',
|
||||
Some('t') => '\t',
|
||||
Some('\\') => '\\',
|
||||
Some('"') => '"',
|
||||
Some('0') => '\0',
|
||||
Some('\'') => '\'',
|
||||
Some(c) => {
|
||||
return Err(LexError {
|
||||
message: format!("Invalid escape sequence: \\{}", c),
|
||||
span: Span::new(escape_start - 1, self.pos),
|
||||
});
|
||||
}
|
||||
None => {
|
||||
return Err(LexError {
|
||||
message: "Unterminated multiline string".into(),
|
||||
span: Span::new(_start, self.pos),
|
||||
});
|
||||
}
|
||||
};
|
||||
current_literal.push(escaped);
|
||||
}
|
||||
}
|
||||
}
|
||||
Some('{') => {
|
||||
// Interpolation (same as regular strings)
|
||||
if !current_literal.is_empty() {
|
||||
parts.push(StringPart::Literal(std::mem::take(&mut current_literal)));
|
||||
}
|
||||
|
||||
let mut expr_text = String::new();
|
||||
let mut brace_depth = 1;
|
||||
|
||||
loop {
|
||||
match self.advance() {
|
||||
Some('{') => {
|
||||
brace_depth += 1;
|
||||
expr_text.push('{');
|
||||
}
|
||||
Some('}') => {
|
||||
brace_depth -= 1;
|
||||
if brace_depth == 0 {
|
||||
break;
|
||||
}
|
||||
expr_text.push('}');
|
||||
}
|
||||
Some(c) => expr_text.push(c),
|
||||
None => {
|
||||
return Err(LexError {
|
||||
message: "Unterminated interpolation in multiline string"
|
||||
.into(),
|
||||
span: Span::new(_start, self.pos),
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
parts.push(StringPart::Expr(expr_text));
|
||||
}
|
||||
Some(c) => current_literal.push(c),
|
||||
None => {
|
||||
return Err(LexError {
|
||||
message: "Unterminated multiline string".into(),
|
||||
span: Span::new(_start, self.pos),
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Strip common leading whitespace from all lines
|
||||
let strip_indent = |s: &str| -> String {
|
||||
if s.is_empty() {
|
||||
return String::new();
|
||||
}
|
||||
let lines: Vec<&str> = s.split('\n').collect();
|
||||
// Find minimum indentation of non-empty lines
|
||||
let min_indent = lines
|
||||
.iter()
|
||||
.filter(|line| !line.trim().is_empty())
|
||||
.map(|line| line.len() - line.trim_start().len())
|
||||
.min()
|
||||
.unwrap_or(0);
|
||||
// Strip that indentation from each line
|
||||
lines
|
||||
.iter()
|
||||
.map(|line| {
|
||||
if line.len() >= min_indent {
|
||||
&line[min_indent..]
|
||||
} else {
|
||||
line.trim_start()
|
||||
}
|
||||
})
|
||||
.collect::<Vec<_>>()
|
||||
.join("\n")
|
||||
};
|
||||
|
||||
// Strip trailing whitespace-only line before closing """
|
||||
let trim_trailing = |s: &mut String| {
|
||||
// Remove trailing spaces/tabs (indent before closing """)
|
||||
while s.ends_with(' ') || s.ends_with('\t') {
|
||||
s.pop();
|
||||
}
|
||||
// Remove the trailing newline
|
||||
if s.ends_with('\n') {
|
||||
s.pop();
|
||||
if s.ends_with('\r') {
|
||||
s.pop();
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
if parts.is_empty() {
|
||||
trim_trailing(&mut current_literal);
|
||||
let result = strip_indent(¤t_literal);
|
||||
return Ok(TokenKind::String(result));
|
||||
}
|
||||
|
||||
// Add remaining literal
|
||||
if !current_literal.is_empty() {
|
||||
trim_trailing(&mut current_literal);
|
||||
parts.push(StringPart::Literal(current_literal));
|
||||
}
|
||||
|
||||
// For interpolated multiline strings, strip indent from literal parts
|
||||
// First, collect all literal content to find min indent
|
||||
let mut all_text = String::new();
|
||||
for part in &parts {
|
||||
if let StringPart::Literal(lit) = part {
|
||||
all_text.push_str(lit);
|
||||
}
|
||||
}
|
||||
let lines: Vec<&str> = all_text.split('\n').collect();
|
||||
let min_indent = lines
|
||||
.iter()
|
||||
.filter(|line| !line.trim().is_empty())
|
||||
.map(|line| line.len() - line.trim_start().len())
|
||||
.min()
|
||||
.unwrap_or(0);
|
||||
|
||||
if min_indent > 0 {
|
||||
for part in &mut parts {
|
||||
if let StringPart::Literal(lit) = part {
|
||||
let stripped_lines: Vec<&str> = lit
|
||||
.split('\n')
|
||||
.map(|line| {
|
||||
if line.len() >= min_indent {
|
||||
&line[min_indent..]
|
||||
} else {
|
||||
line.trim_start()
|
||||
}
|
||||
})
|
||||
.collect();
|
||||
*lit = stripped_lines.join("\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Ok(TokenKind::InterpolatedString(parts))
|
||||
}
|
||||
|
||||
fn scan_char(&mut self, start: usize) -> Result<TokenKind, LexError> {
|
||||
let c = match self.advance() {
|
||||
Some('\\') => match self.advance() {
|
||||
|
||||
94
src/main.rs
94
src/main.rs
@@ -3925,6 +3925,49 @@ c")"#;
|
||||
assert_eq!(eval(source).unwrap(), r#""literal {braces}""#);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_multiline_string() {
|
||||
let source = r#"
|
||||
let s = """
|
||||
hello
|
||||
world
|
||||
"""
|
||||
let result = String.length(s)
|
||||
"#;
|
||||
// "hello\nworld" = 11 chars
|
||||
assert_eq!(eval(source).unwrap(), "11");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_multiline_string_with_quotes() {
|
||||
// Quotes are fine in the middle of triple-quoted strings
|
||||
let source = "let s = \"\"\"\n She said \"hello\" to him.\n\"\"\"";
|
||||
assert_eq!(eval(source).unwrap(), r#""She said "hello" to him.""#);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_multiline_string_interpolation() {
|
||||
let source = r#"
|
||||
let name = "Lux"
|
||||
let s = """
|
||||
Hello, {name}!
|
||||
"""
|
||||
"#;
|
||||
assert_eq!(eval(source).unwrap(), r#""Hello, Lux!""#);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_multiline_string_empty() {
|
||||
let source = r#"let s = """""""#;
|
||||
assert_eq!(eval(source).unwrap(), r#""""#);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_multiline_string_inline() {
|
||||
let source = r#"let s = """hello world""""#;
|
||||
assert_eq!(eval(source).unwrap(), r#""hello world""#);
|
||||
}
|
||||
|
||||
// Option tests
|
||||
#[test]
|
||||
fn test_option_constructors() {
|
||||
@@ -5629,4 +5672,55 @@ c")"#;
|
||||
"#;
|
||||
assert_eq!(eval(source).unwrap(), "Some(30)");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_file_copy() {
|
||||
use std::io::Write;
|
||||
// Create a temp file, copy it, verify contents
|
||||
let dir = std::env::temp_dir().join("lux_test_file_copy");
|
||||
let _ = std::fs::create_dir_all(&dir);
|
||||
let src = dir.join("src.txt");
|
||||
let dst = dir.join("dst.txt");
|
||||
std::fs::File::create(&src).unwrap().write_all(b"hello copy").unwrap();
|
||||
let _ = std::fs::remove_file(&dst);
|
||||
|
||||
let source = format!(r#"
|
||||
fn main(): Unit with {{File}} =
|
||||
File.copy("{}", "{}")
|
||||
let _ = run main() with {{}}
|
||||
let result = "done"
|
||||
"#, src.display(), dst.display());
|
||||
let result = eval(&source);
|
||||
assert!(result.is_ok(), "File.copy failed: {:?}", result);
|
||||
let contents = std::fs::read_to_string(&dst).unwrap();
|
||||
assert_eq!(contents, "hello copy");
|
||||
|
||||
// Cleanup
|
||||
let _ = std::fs::remove_dir_all(&dir);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_effectful_callback_propagation() {
|
||||
// WISH-7: effectful callbacks in List.forEach should propagate effects
|
||||
// This should type-check successfully because Console effect is inferred
|
||||
let source = r#"
|
||||
fn printAll(items: List<String>): Unit =
|
||||
List.forEach(items, fn(x: String): Unit => Console.print(x))
|
||||
let result = "ok"
|
||||
"#;
|
||||
let result = eval(source);
|
||||
assert!(result.is_ok(), "Effectful callback should type-check: {:?}", result);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_effectful_callback_in_map() {
|
||||
// Effectful callback in List.map should propagate effects
|
||||
let source = r#"
|
||||
fn readAll(paths: List<String>): List<String> =
|
||||
List.map(paths, fn(p: String): String => File.read(p))
|
||||
let result = "ok"
|
||||
"#;
|
||||
let result = eval(source);
|
||||
assert!(result.is_ok(), "Effectful callback in map should type-check: {:?}", result);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -279,6 +279,12 @@ impl ModuleLoader {
|
||||
}
|
||||
Declaration::Type(t) if t.visibility == Visibility::Public => {
|
||||
exports.insert(t.name.name.clone());
|
||||
// Also export constructors for ADT types
|
||||
if let crate::ast::TypeDef::Enum(variants) = &t.definition {
|
||||
for variant in variants {
|
||||
exports.insert(variant.name.name.clone());
|
||||
}
|
||||
}
|
||||
}
|
||||
Declaration::Effect(e) => {
|
||||
// Effects are always exported
|
||||
|
||||
@@ -846,6 +846,7 @@ impl Parser {
|
||||
/// Parse function parameters
|
||||
fn parse_params(&mut self) -> Result<Vec<Parameter>, ParseError> {
|
||||
let mut params = Vec::new();
|
||||
self.skip_newlines();
|
||||
|
||||
while !self.check(TokenKind::RParen) {
|
||||
let start = self.current_span();
|
||||
@@ -855,9 +856,11 @@ impl Parser {
|
||||
let span = start.merge(self.previous_span());
|
||||
|
||||
params.push(Parameter { name, typ, span });
|
||||
self.skip_newlines();
|
||||
|
||||
if !self.check(TokenKind::RParen) {
|
||||
self.expect(TokenKind::Comma)?;
|
||||
self.skip_newlines();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1919,9 +1922,27 @@ impl Parser {
|
||||
TokenKind::Ident(name) => {
|
||||
// Check if it starts with uppercase (constructor) or lowercase (variable)
|
||||
if name.chars().next().map_or(false, |c| c.is_uppercase()) {
|
||||
self.parse_constructor_pattern()
|
||||
self.parse_constructor_pattern_with_module(None)
|
||||
} else {
|
||||
let ident = self.parse_ident()?;
|
||||
// Check for module-qualified constructor: module.Constructor
|
||||
if self.check(TokenKind::Dot) {
|
||||
// Peek ahead to see if next is an uppercase identifier
|
||||
let dot_pos = self.pos;
|
||||
self.advance(); // skip dot
|
||||
if let TokenKind::Ident(next_name) = self.peek_kind() {
|
||||
if next_name
|
||||
.chars()
|
||||
.next()
|
||||
.map_or(false, |c| c.is_uppercase())
|
||||
{
|
||||
return self
|
||||
.parse_constructor_pattern_with_module(Some(ident));
|
||||
}
|
||||
}
|
||||
// Not a module-qualified constructor, backtrack
|
||||
self.pos = dot_pos;
|
||||
}
|
||||
Ok(Pattern::Var(ident))
|
||||
}
|
||||
}
|
||||
@@ -1931,25 +1952,40 @@ impl Parser {
|
||||
}
|
||||
}
|
||||
|
||||
fn parse_constructor_pattern(&mut self) -> Result<Pattern, ParseError> {
|
||||
let start = self.current_span();
|
||||
fn parse_constructor_pattern_with_module(
|
||||
&mut self,
|
||||
module: Option<Ident>,
|
||||
) -> Result<Pattern, ParseError> {
|
||||
let start = module
|
||||
.as_ref()
|
||||
.map(|m| m.span)
|
||||
.unwrap_or_else(|| self.current_span());
|
||||
let name = self.parse_ident()?;
|
||||
|
||||
if self.check(TokenKind::LParen) {
|
||||
self.advance();
|
||||
self.skip_newlines();
|
||||
let mut fields = Vec::new();
|
||||
while !self.check(TokenKind::RParen) {
|
||||
fields.push(self.parse_pattern()?);
|
||||
self.skip_newlines();
|
||||
if !self.check(TokenKind::RParen) {
|
||||
self.expect(TokenKind::Comma)?;
|
||||
self.skip_newlines();
|
||||
}
|
||||
}
|
||||
self.expect(TokenKind::RParen)?;
|
||||
let span = start.merge(self.previous_span());
|
||||
Ok(Pattern::Constructor { name, fields, span })
|
||||
} else {
|
||||
let span = name.span;
|
||||
Ok(Pattern::Constructor {
|
||||
module,
|
||||
name,
|
||||
fields,
|
||||
span,
|
||||
})
|
||||
} else {
|
||||
let span = start.merge(name.span);
|
||||
Ok(Pattern::Constructor {
|
||||
module,
|
||||
name,
|
||||
fields: Vec::new(),
|
||||
span,
|
||||
@@ -1960,12 +1996,15 @@ impl Parser {
|
||||
fn parse_tuple_pattern(&mut self) -> Result<Pattern, ParseError> {
|
||||
let start = self.current_span();
|
||||
self.expect(TokenKind::LParen)?;
|
||||
self.skip_newlines();
|
||||
|
||||
let mut elements = Vec::new();
|
||||
while !self.check(TokenKind::RParen) {
|
||||
elements.push(self.parse_pattern()?);
|
||||
self.skip_newlines();
|
||||
if !self.check(TokenKind::RParen) {
|
||||
self.expect(TokenKind::Comma)?;
|
||||
self.skip_newlines();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2095,6 +2134,7 @@ impl Parser {
|
||||
|
||||
fn parse_lambda_params(&mut self) -> Result<Vec<Parameter>, ParseError> {
|
||||
let mut params = Vec::new();
|
||||
self.skip_newlines();
|
||||
|
||||
while !self.check(TokenKind::RParen) {
|
||||
let start = self.current_span();
|
||||
@@ -2110,9 +2150,11 @@ impl Parser {
|
||||
|
||||
let span = start.merge(self.previous_span());
|
||||
params.push(Parameter { name, typ, span });
|
||||
self.skip_newlines();
|
||||
|
||||
if !self.check(TokenKind::RParen) {
|
||||
self.expect(TokenKind::Comma)?;
|
||||
self.skip_newlines();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2200,6 +2242,7 @@ impl Parser {
|
||||
fn parse_tuple_or_paren_expr(&mut self) -> Result<Expr, ParseError> {
|
||||
let start = self.current_span();
|
||||
self.expect(TokenKind::LParen)?;
|
||||
self.skip_newlines();
|
||||
|
||||
if self.check(TokenKind::RParen) {
|
||||
self.advance();
|
||||
@@ -2210,16 +2253,19 @@ impl Parser {
|
||||
}
|
||||
|
||||
let first = self.parse_expr()?;
|
||||
self.skip_newlines();
|
||||
|
||||
if self.check(TokenKind::Comma) {
|
||||
// Tuple
|
||||
let mut elements = vec![first];
|
||||
while self.check(TokenKind::Comma) {
|
||||
self.advance();
|
||||
self.skip_newlines();
|
||||
if self.check(TokenKind::RParen) {
|
||||
break;
|
||||
}
|
||||
elements.push(self.parse_expr()?);
|
||||
self.skip_newlines();
|
||||
}
|
||||
self.expect(TokenKind::RParen)?;
|
||||
let span = start.merge(self.previous_span());
|
||||
|
||||
@@ -981,6 +981,13 @@ impl TypeChecker {
|
||||
if !fields.is_empty() {
|
||||
self.env.bind(&name, TypeScheme::mono(Type::Record(fields)));
|
||||
}
|
||||
|
||||
// Also copy type definitions so imported types are usable
|
||||
for (type_name, type_def) in &module_checker.env.types {
|
||||
if !self.env.types.contains_key(type_name) {
|
||||
self.env.types.insert(type_name.clone(), type_def.clone());
|
||||
}
|
||||
}
|
||||
}
|
||||
ImportKind::Direct => {
|
||||
// Import a specific name directly
|
||||
@@ -1951,6 +1958,17 @@ impl TypeChecker {
|
||||
let func_type = self.infer_expr(func);
|
||||
let arg_types: Vec<Type> = args.iter().map(|a| self.infer_expr(a)).collect();
|
||||
|
||||
// Propagate effects from callback arguments to enclosing scope
|
||||
for arg_type in &arg_types {
|
||||
if let Type::Function { effects, .. } = arg_type {
|
||||
for effect in &effects.effects {
|
||||
if self.inferring_effects {
|
||||
self.inferred_effects.insert(effect.clone());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Check property constraints from where clauses
|
||||
if let Expr::Var(func_id) = func {
|
||||
if let Some(constraints) = self.property_constraints.get(&func_id.name).cloned() {
|
||||
@@ -2061,6 +2079,18 @@ impl TypeChecker {
|
||||
if let Some((_, field_type)) = fields.iter().find(|(n, _)| n == &operation.name) {
|
||||
// It's a function call on a module field
|
||||
let arg_types: Vec<Type> = args.iter().map(|a| self.infer_expr(a)).collect();
|
||||
|
||||
// Propagate effects from callback arguments to enclosing scope
|
||||
for arg_type in &arg_types {
|
||||
if let Type::Function { effects, .. } = arg_type {
|
||||
for effect in &effects.effects {
|
||||
if self.inferring_effects {
|
||||
self.inferred_effects.insert(effect.clone());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let result_type = Type::var();
|
||||
let expected_fn = Type::function(arg_types, result_type.clone());
|
||||
|
||||
@@ -2120,6 +2150,17 @@ impl TypeChecker {
|
||||
// Check argument types
|
||||
let arg_types: Vec<Type> = args.iter().map(|a| self.infer_expr(a)).collect();
|
||||
|
||||
// Propagate effects from callback arguments to enclosing scope
|
||||
for arg_type in &arg_types {
|
||||
if let Type::Function { effects, .. } = arg_type {
|
||||
for effect in &effects.effects {
|
||||
if self.inferring_effects {
|
||||
self.inferred_effects.insert(effect.clone());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if arg_types.len() != op.params.len() {
|
||||
self.errors.push(TypeError {
|
||||
message: format!(
|
||||
@@ -2442,7 +2483,7 @@ impl TypeChecker {
|
||||
Vec::new()
|
||||
}
|
||||
|
||||
Pattern::Constructor { name, fields, span } => {
|
||||
Pattern::Constructor { name, fields, span, .. } => {
|
||||
// Look up constructor
|
||||
// For now, handle Option specially
|
||||
match name.name.as_str() {
|
||||
|
||||
28
src/types.rs
28
src/types.rs
@@ -956,6 +956,14 @@ impl TypeEnv {
|
||||
params: vec![("path".to_string(), Type::String)],
|
||||
return_type: Type::Unit,
|
||||
},
|
||||
EffectOpDef {
|
||||
name: "copy".to_string(),
|
||||
params: vec![
|
||||
("source".to_string(), Type::String),
|
||||
("dest".to_string(), Type::String),
|
||||
],
|
||||
return_type: Type::Unit,
|
||||
},
|
||||
],
|
||||
},
|
||||
);
|
||||
@@ -1543,6 +1551,26 @@ impl TypeEnv {
|
||||
Type::Unit,
|
||||
),
|
||||
),
|
||||
(
|
||||
"sort".to_string(),
|
||||
Type::function(
|
||||
vec![Type::List(Box::new(Type::var()))],
|
||||
Type::List(Box::new(Type::var())),
|
||||
),
|
||||
),
|
||||
(
|
||||
"sortBy".to_string(),
|
||||
{
|
||||
let elem = Type::var();
|
||||
Type::function(
|
||||
vec![
|
||||
Type::List(Box::new(elem.clone())),
|
||||
Type::function(vec![elem.clone(), elem], Type::Int),
|
||||
],
|
||||
Type::List(Box::new(Type::var())),
|
||||
)
|
||||
},
|
||||
),
|
||||
]);
|
||||
env.bind("List", TypeScheme::mono(list_module_type));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user