Align runnable lowering with v0.5 signatures

Author: olwang

core/fs/file.rssi

@@ -6,7 +6,6 @@ pub fn File.open_read(path: read Path) -> fresh File
 
 pub fn File.open_write(path: read Path) -> fresh File
 
-pub fn File.read_all(file: mut File) -> fresh Bytes
-
-pub fn File.write(file: mut File, data: read Bytes) -> Unit
+pub fn File.read_all(file: mut File) -> Result<fresh Bytes, FileError>
 
+pub fn File.write(file: mut File, data: read Bytes) -> Result<Unit, FileError>

core/image/image.rssi

@@ -1,10 +1,9 @@
 struct Image
 
-pub fn Image.load(path: read Path) -> fresh Image
+pub fn Image.load(path: read Path) -> Result<fresh Image, ImageError>
 
 pub fn Image.resize(image: mut Image, width: Int, height: Int) -> Unit
 
-pub fn Image.save(image: read Image, path: read Path) -> Unit
+pub fn Image.save(image: read Image, path: read Path) -> Result<Unit, ImageError>
 
 pub fn Image.inspect(image: read Image) -> Unit
-

src/hir.rs

@@ -1541,7 +1541,7 @@ fn builtin_signatures() -> Vec<FunctionSig> {
             "Image",
             "load",
             &[param("path", ParamEffect::Read, "Path")],
-            Some("Image"),
+            Some("Result<Image, ImageError>"),
             true,
             &[],
         ),
@@ -1580,7 +1580,7 @@ fn builtin_signatures() -> Vec<FunctionSig> {
                 param("image", ParamEffect::Read, "Image"),
                 param("path", ParamEffect::Read, "Path"),
             ],
-            Some("Unit"),
+            Some("Result<Unit, ImageError>"),
             false,
             &[],
         ),
@@ -1631,7 +1631,7 @@ fn builtin_signatures() -> Vec<FunctionSig> {
             "File",
             "read_all",
             &[param("file", ParamEffect::Mut, "File")],
-            Some("Bytes"),
+            Some("Result<Bytes, FileError>"),
             true,
             &[],
         ),
@@ -1642,7 +1642,7 @@ fn builtin_signatures() -> Vec<FunctionSig> {
                 param("file", ParamEffect::Mut, "File"),
                 param("data", ParamEffect::Read, "Bytes"),
             ],
-            Some("Unit"),
+            Some("Result<Unit, FileError>"),
             false,
             &[],
         ),
@@ -1697,7 +1697,7 @@ fn builtin_signatures() -> Vec<FunctionSig> {
             "Json",
             "parse",
             &[param("text", ParamEffect::Read, "String")],
-            Some("JsonValue"),
+            Some("Result<JsonValue, JsonError>"),
             true,
             &[],
         ),
@@ -1708,8 +1708,8 @@ fn builtin_signatures() -> Vec<FunctionSig> {
                 param("value", ParamEffect::Read, "JsonValue"),
                 param("name", ParamEffect::Read, "String"),
             ],
-            Some("String"),
-            true,
+            Some("Result<String, JsonError>"),
+            false,
             &[],
         ),
         builtin(
@@ -1719,15 +1719,15 @@ fn builtin_signatures() -> Vec<FunctionSig> {
                 param("file", ParamEffect::Mut, "File"),
                 param("buffer", ParamEffect::Mut, "RowBuffer"),
             ],
-            Some("Unit"),
+            Some("Result<Unit, CsvError>"),
             false,
             &[],
         ),
         builtin(
             "Csv",
             "parse_row",
             &[param("buffer", ParamEffect::Read, "RowBuffer")],
-            Some("Row"),
+            Some("Result<Row, CsvError>"),
             true,
             &[],
         ),
@@ -1789,7 +1789,7 @@ fn builtin_signatures() -> Vec<FunctionSig> {
                 param("conn", ParamEffect::Mut, "DbConnection"),
                 param("sql", ParamEffect::Read, "String"),
             ],
-            None,
+            Some("Result<Unit, DbError>"),
             false,
             &[],
         ),
@@ -1805,7 +1805,7 @@ fn builtin_signatures() -> Vec<FunctionSig> {
             "RuleLoader",
             "load_rules",
             &[param("path", ParamEffect::Read, "Path")],
-            Some("List"),
+            Some("Result<List<Rule>, ConfigError>"),
             true,
             &[],
         ),
@@ -1987,7 +1987,10 @@ fn cache_put(cache: mut Cache, value: read Image) -> Unit
         let load = hir
             .resolve_function(Some("Image"), "load")
             .expect("builtin signature exists");
-        assert_eq!(load.return_type.as_deref(), Some("Image"));
+        assert_eq!(
+            load.return_type.as_deref(),
+            Some("Result<Image, ImageError>")
+        );
     }
 
     #[test]
@@ -2011,8 +2014,8 @@ fn Image(path: read Path) -> Image {
 
         assert_eq!(duplicate.kind, DuplicateSymbolKind::Constructor);
         assert_eq!(duplicate.name, "Image");
-        assert_eq!(duplicate.first_span.line, 4);
-        assert_eq!(duplicate.duplicate_span.line, 8);
+        assert_eq!(duplicate.first_span.line, 3);
+        assert_eq!(duplicate.duplicate_span.line, 7);
     }
 
     #[test]
@@ -2034,8 +2037,8 @@ struct Response {
 
         assert_eq!(duplicate.kind, DuplicateSymbolKind::Field);
         assert_eq!(duplicate.name, "Response.status");
-        assert_eq!(duplicate.first_span.line, 5);
-        assert_eq!(duplicate.duplicate_span.line, 6);
+        assert_eq!(duplicate.first_span.line, 4);
+        assert_eq!(duplicate.duplicate_span.line, 5);
     }
 
     #[test]
@@ -2124,7 +2127,7 @@ fn render(body: read String) -> Result<fresh Response, HttpError> {
 features: local
 
 fn load(path: read Path) -> Unit {
-    local image = Image.load(path: read path)
+    local image = Image.load(path: read path)?
 }
 "#;
 
@@ -2309,7 +2312,7 @@ struct Config {
 }
 
 fn update(cache: mut ImageCache, config: mut Config, path: read Path) -> Unit {
-    local image = Image.load(path: read path)
+    local image = Image.load(path: read path)?
     ImageCache.store(cache: mut cache, image: read image)
     List.consume(list: take config.rules)
 }
@@ -2324,7 +2327,7 @@ fn update(cache: mut ImageCache, config: mut Config, path: read Path) -> Unit {
         let HirStmt::Let {
             kind: HirBindingKind::LocalLet,
             name,
-            value: Some(HirExpr::Call { type_name, .. }),
+            value: Some(HirExpr::Try { type_name, .. }),
             type_name: Some(binding_type),
             ..
         } = &block.statements[0]

src/review.rs

@@ -455,6 +455,7 @@ fn review_map_region_draft(
         reasons.push("ResourcePool usage".to_string());
     }
 
+    let had_review_reason = !reasons.is_empty();
     let classification = if !facts.unresolved_calls.is_empty() {
         let calls = facts
             .unresolved_calls
@@ -463,7 +464,11 @@ fn review_map_region_draft(
             .collect::<Vec<_>>()
             .join(", ");
         reasons.push(format!("unresolved call(s): {calls}"));
-        ReviewMapClassification::Unknown
+        if had_review_reason {
+            ReviewMapClassification::ReviewRequired
+        } else {
+            ReviewMapClassification::Unknown
+        }
     } else if reasons.is_empty() {
         reasons.push("private pure helper with no retention or resource boundary".to_string());
         ReviewMapClassification::Foldable

src/rust_lower.rs

@@ -320,12 +320,14 @@ impl<'a> RustLowerer<'a> {
         }
         out.push('\n');
 
-        for item in &self.program.items {
+        for (index, item) in self.program.items.iter().enumerate() {
             match item {
                 Item::Type(ty) => self.lower_type_decl(ty, &mut out),
                 Item::Function(function) => self.lower_function(function, &mut out),
             }
-            out.push('\n');
+            if index + 1 < self.program.items.len() {
+                out.push('\n');
+            }
         }
 
         LoweredRust {
@@ -398,9 +400,10 @@ impl<'a> RustLowerer<'a> {
     fn lower_function(&mut self, function: &FunctionDecl, out: &mut String) {
         self.record_source_marker(out, 0, "function", &function.span);
         let async_prefix = if function.is_async { "async " } else { "" };
+        let is_public = function.is_public || is_runnable_main(function);
         out.push_str(&format!(
             "{}{}fn {}{}(",
-            visibility(function.is_public),
+            visibility(is_public),
             async_prefix,
             rust_ident(&function.name),
             lower_generic_params(&function.type_params)
@@ -1095,14 +1098,30 @@ fn rust_ident(name: &str) -> String {
 fn cargo_package_name(name: &str) -> String {
     let mut out = String::new();
     let mut previous_was_dash = false;
+    let mut previous_was_lower_or_digit = false;
 
     for character in name.chars() {
         if character.is_ascii_alphanumeric() {
+            if character.is_ascii_uppercase()
+                && previous_was_lower_or_digit
+                && !previous_was_dash
+                && !out.is_empty()
+            {
+                out.push('-');
+            }
             out.push(character.to_ascii_lowercase());
             previous_was_dash = false;
-        } else if matches!(character, '-' | '_' | '.') && !out.is_empty() && !previous_was_dash {
+            previous_was_lower_or_digit =
+                character.is_ascii_lowercase() || character.is_ascii_digit();
+        } else if (character.is_ascii_whitespace() || matches!(character, '-' | '_' | '.'))
+            && !out.is_empty()
+            && !previous_was_dash
+        {
             out.push('-');
             previous_was_dash = true;
+            previous_was_lower_or_digit = false;
+        } else {
+            previous_was_lower_or_digit = false;
         }
     }
 

src/syntax/parser.rs

@@ -90,8 +90,14 @@ impl Parser<'_> {
             self.index = close + 1;
             parse_fields(self.tokens, open + 1, close)
         } else {
-            let end = declaration_line_end(self.tokens, self.index);
-            self.index = end;
+            if self
+                .tokens
+                .get(self.index)
+                .is_some_and(|token| token.span.line == span.line)
+            {
+                let end = declaration_line_end(self.tokens, self.index);
+                self.index = end;
+            }
             Vec::new()
         };
 
@@ -121,7 +127,7 @@ impl Parser<'_> {
             return None;
         }
         self.index += 1;
-        let name = self.take_ident_name()?;
+        let name = self.take_function_name()?;
         let type_params = self.parse_generic_params();
 
         let mut params = Vec::new();
@@ -639,7 +645,15 @@ fn parse_expr(tokens: &[Token], start: usize, end: usize) -> Option<Expr> {
 
     if tokens[start].symbol("|") && tokens.get(start + 1).is_some_and(|token| token.symbol("|")) {
         let Some(open) = (start + 2..end).find(|index| tokens[*index].symbol("{")) else {
-            return Some(Expr::Unknown(tokens[start].span.clone()));
+            let value = parse_expr(tokens, start + 2, end)
+                .unwrap_or_else(|| Expr::Unknown(tokens[start].span.clone()));
+            return Some(Expr::Closure {
+                body: Block {
+                    statements: vec![Stmt::Expr(value)],
+                    span: tokens[start].span.clone(),
+                },
+                span: tokens[start].span.clone(),
+            });
         };
         let close = find_matching(tokens, open, "{", "}").unwrap_or(open);
         return Some(Expr::Closure {