b48d3a3 | plum

git clone https://git.pyrossh.dev/plum

A statically typed, imperative programming language inspired by rust, python

b48d3a3 — Peter John 2026-08-09T18:35:29+05:30

test: migrate embedded plum fixtures to `fun` keyword syntax

Files changed (5) hide show

plum-checker/tests/checker_tests.rs +63 -63
plum-core/tests/formatter_test.rs +3 -3
plum-core/tests/loader_test.rs +17 -17
plum-core/tests/parser_test.rs +6 -6
plum-wasm-codegen/tests/codegen_tests.rs +145 -145

plum-checker/tests/checker_tests.rs CHANGED Viewed

@@ -53,14 +53,14 @@ fn mono_scheme() {
 #[test]
 fn valid_add_fn_passes() {
-    let src = "add(a: Int, b: Int) -> Int =\n  a + b\n";
+    let src = "fun add(a: Int, b: Int) -> Int =\n  a + b\n";
     let source = parse(src);
     assert!(check_source(&source).is_ok(), "expected Ok");
 }
 #[test]
 fn wrong_return_type_is_error() {
-    let src = "bad() -> Int =\n  True\n";
+    let src = "fun bad() -> Int =\n  True\n";
     let source = parse(src);
     let result = check_source(&source);
     assert!(result.is_err());
@@ -70,7 +70,7 @@ fn wrong_return_type_is_error() {
 #[test]
 fn undeclared_var_is_error() {
-    let src = "bad() -> Int =\n  x\n";
+    let src = "fun bad() -> Int =\n  x\n";
     let source = parse(src);
     let result = check_source(&source);
     assert!(result.is_err());
@@ -78,7 +78,7 @@ fn undeclared_var_is_error() {
 #[test]
 fn type_mismatch_in_binary_op_is_error() {
-    let src = "bad() -> Int =\n  1 + 2.0\n";
+    let src = "fun bad() -> Int =\n  1 + 2.0\n";
     let source = parse(src);
     let result = check_source(&source);
     assert!(result.is_err());
@@ -86,14 +86,14 @@ fn type_mismatch_in_binary_op_is_error() {
 #[test]
 fn bool_literal_true_false_are_bool() {
-    let src = "isTrue() -> Bool =\n  True\n";
+    let src = "fun isTrue() -> Bool =\n  True\n";
     let source = parse(src);
     assert!(check_source(&source).is_ok(), "expected Ok, got {:?}", check_source(&source).err());
 }
 #[test]
 fn bool_literal_wrong_return_type_is_error() {
-    let src = "bad() -> Int =\n  False\n";
+    let src = "fun bad() -> Int =\n  False\n";
     let source = parse(src);
     let result = check_source(&source);
     assert!(result.is_err());
@@ -101,7 +101,7 @@ fn bool_literal_wrong_return_type_is_error() {
 #[test]
 fn method_self_field_access_passes() {
-    let src = "type Cat =\n  name: Str\n  age: Int\n\ngetName<Cat>() -> Str =\n  self.name\n";
+    let src = "type Cat =\n  name: Str\n  age: Int\n\nfun getName<Cat>() -> Str =\n  self.name\n";
     let source = parse(src);
     let result = check_source(&source);
     assert!(result.is_ok(), "expected Ok, got {:?}", result.err());
@@ -109,7 +109,7 @@ fn method_self_field_access_passes() {
 #[test]
 fn method_self_unknown_field_is_error() {
-    let src = "type Cat =\n  name: Str\n\ngetAge<Cat>() -> Int =\n  self.age\n";
+    let src = "type Cat =\n  name: Str\n\nfun getAge<Cat>() -> Int =\n  self.age\n";
     let source = parse(src);
     let result = check_source(&source);
     assert!(result.is_err());
@@ -117,7 +117,7 @@ fn method_self_unknown_field_is_error() {
 #[test]
 fn self_outside_method_is_error() {
-    let src = "bad() -> Int =\n  self\n";
+    let src = "fun bad() -> Int =\n  self\n";
     let source = parse(src);
     let result = check_source(&source);
     assert!(result.is_err());
@@ -125,7 +125,7 @@ fn self_outside_method_is_error() {
 #[test]
 fn class_call_checks_field_types() {
-    let src = "type Cat =\n  name: Str\n  age: Int\n\nmakeCat() -> Cat =\n  Cat(name: \"x\", age: 1)\n";
+    let src = "type Cat =\n  name: Str\n  age: Int\n\nfun makeCat() -> Cat =\n  Cat(name: \"x\", age: 1)\n";
     let source = parse(src);
     let result = check_source(&source);
     assert!(result.is_ok(), "expected Ok, got {:?}", result.err());
@@ -133,7 +133,7 @@ fn class_call_checks_field_types() {
 #[test]
 fn class_call_wrong_field_type_is_error() {
-    let src = "type Cat =\n  name: Str\n  age: Int\n\nmakeCat() -> Cat =\n  Cat(name: \"x\", age: \"y\")\n";
+    let src = "type Cat =\n  name: Str\n  age: Int\n\nfun makeCat() -> Cat =\n  Cat(name: \"x\", age: \"y\")\n";
     let source = parse(src);
     let result = check_source(&source);
     assert!(result.is_err());
@@ -141,7 +141,7 @@ fn class_call_wrong_field_type_is_error() {
 #[test]
 fn class_call_unknown_field_is_error() {
-    let src = "type Cat =\n  name: Str\n\nmakeCat() -> Cat =\n  Cat(name: \"x\", age: 1)\n";
+    let src = "type Cat =\n  name: Str\n\nfun makeCat() -> Cat =\n  Cat(name: \"x\", age: 1)\n";
     let source = parse(src);
     let result = check_source(&source);
     assert!(result.is_err());
@@ -149,7 +149,7 @@ fn class_call_unknown_field_is_error() {
 #[test]
 fn method_call_via_attribute_type_checks_args() {
-    let src = "type Cat =\n  name: Str\n\nrename<Cat>(n: Str) -> Str =\n  n\n\nuse(c: Cat) -> Str =\n  c.rename(\"x\")\n";
+    let src = "type Cat =\n  name: Str\n\nfun rename<Cat>(n: Str) -> Str =\n  n\n\nfun use(c: Cat) -> Str =\n  c.rename(\"x\")\n";
     let source = parse(src);
     let result = check_source(&source);
     assert!(result.is_ok(), "expected Ok, got {:?}", result.err());
@@ -157,7 +157,7 @@ fn method_call_via_attribute_type_checks_args() {
 #[test]
 fn match_binds_name_pattern_to_subject_type() {
-    let src = "main(a: Int) -> Int =\n  match a\n    x =>\n      x\n    _ =>\n      0\n";
+    let src = "fun main(a: Int) -> Int =\n  match a\n    x =>\n      x\n    _ =>\n      0\n";
     let source = parse(src);
     let result = check_source(&source);
     assert!(result.is_ok(), "expected Ok, got {:?}", result.err());
@@ -166,7 +166,7 @@ fn match_binds_name_pattern_to_subject_type() {
 #[test]
 fn match_inline_case_body_type_checks() {
     // Case bodies can be a single inline expression, not just an indented block.
-    let src = "main(a: Int) -> Int =\n  match a\n    1 => 10\n    _ => 0\n";
+    let src = "fun main(a: Int) -> Int =\n  match a\n    1 => 10\n    _ => 0\n";
     let source = parse(src);
     let result = check_source(&source);
     assert!(result.is_ok(), "expected Ok, got {:?}", result.err());
@@ -178,7 +178,7 @@ fn match_true_false_are_variant_patterns_not_bindings_without_enum_decl() {
     // comparisons even when the source doesn't redeclare `enum Bool`, so a
     // later `_` wildcard arm remains reachable (each pattern binds/compares,
     // it doesn't just re-bind the subject under the name "True").
-    let src = "pick(a: Bool) -> Int =\n  match a\n    True =>\n      1\n    False =>\n      0\n";
+    let src = "fun pick(a: Bool) -> Int =\n  match a\n    True =>\n      1\n    False =>\n      0\n";
     let source = parse(src);
     let result = check_source(&source);
     assert!(result.is_ok(), "expected Ok, got {:?}", result.err());
@@ -186,7 +186,7 @@ fn match_true_false_are_variant_patterns_not_bindings_without_enum_decl() {
 #[test]
 fn match_int_pattern_against_str_subject_is_error() {
-    let src = "main(a: Str) -> Int =\n  match a\n    1 =>\n      1\n    _ =>\n      0\n";
+    let src = "fun main(a: Str) -> Int =\n  match a\n    1 =>\n      1\n    _ =>\n      0\n";
     let source = parse(src);
     let result = check_source(&source);
     assert!(result.is_err());
@@ -202,7 +202,7 @@ enum Option =
   | Some(Int)
   | None
-isNone(o: Option) -> Bool = o == None
+fun isNone(o: Option) -> Bool = o == None
 ";
     let source = parse(src);
     let result = check_source(&source);
@@ -216,7 +216,7 @@ enum Option =
   | Some[Int]
   | None
-makeSome(v: Int) -> Option =
+fun makeSome(v: Int) -> Option =
   Some(v)
 ";
     let source = parse(src);
@@ -231,7 +231,7 @@ enum Option =
   | Some(Int)
   | None
-bad() -> Option =
+fun bad() -> Option =
   Some(\"x\")
 ";
     let source = parse(src);
@@ -246,7 +246,7 @@ enum Shape =
   | Rect[Float, Float]
   | Circle[Float]
-bad() -> Shape =
+fun bad() -> Shape =
   Rect(1.0)
 ";
     let source = parse(src);
@@ -261,7 +261,7 @@ enum Shape =
   | Rect[Float, Float]
   | Circle[Float]
-area(s: Shape) -> Float =
+fun area(s: Shape) -> Float =
   match s
     Rect(w, h) =>
       w * h
@@ -280,7 +280,7 @@ enum Shape =
   | Rect[Float, Float]
   | Circle[Float]
-bad(s: Shape) -> Float =
+fun bad(s: Shape) -> Float =
   match s
     Rect(w) =>
       w
@@ -322,10 +322,10 @@ fn generic_class_instantiated_at_two_concrete_types_type_checks() {
 type Box[T] =
   value: T
-makeIntBox() -> Box =
+fun makeIntBox() -> Box =
   Box(value: 5)
-makeStrBox() -> Box =
+fun makeStrBox() -> Box =
   Box(value: \"x\")
 ";
     let source = parse(src);
@@ -336,13 +336,13 @@ makeStrBox() -> Box =
 #[test]
 fn generic_function_called_with_different_concrete_types_per_site_type_checks() {
     let src = "\
-wrap(value: T) -> Bool =
+fun wrap(value: T) -> Bool =
   True
-useInt() -> Bool =
+fun useInt() -> Bool =
   wrap(5)
-useStr() -> Bool =
+fun useStr() -> Bool =
   wrap(\"x\")
 ";
     let source = parse(src);
@@ -353,10 +353,10 @@ useStr() -> Bool =
 #[test]
 fn generic_function_with_two_independent_type_params_type_checks() {
     let src = "\
-pair(first: T, second: U) -> Bool =
+fun pair(first: T, second: U) -> Bool =
   True
-use() -> Bool =
+fun use() -> Bool =
   pair(1, \"x\")
 ";
     let source = parse(src);
@@ -372,10 +372,10 @@ fn generic_function_with_internally_inconsistent_body_is_rejected_after_speciali
     // behavior — rewriting `wrong$Str`'s `-> Int` to `-> Str` — would make the
     // whole program type-check, masking the real `expected Int, found Str` error.
     let src = "\
-wrong(x: T) -> Int =
+fun wrong(x: T) -> Int =
   \"hello\"
-useIt() -> Str =
+fun useIt() -> Str =
   wrong(\"s\")
 ";
     let source = parse(src);
@@ -395,7 +395,7 @@ enum Option =
   | Some[T]
   | None
-get() -> Int =
+fun get() -> Int =
   o = Some(5)
   match o
     Some(v) =>
@@ -438,7 +438,7 @@ enum Option =
   | Some[T]
   | None
-useInt() -> Int =
+fun useInt() -> Int =
   o = Some(5)
   match o
     Some(v) =>
@@ -446,7 +446,7 @@ useInt() -> Int =
     None =>
       0
-useStr() -> Str =
+fun useStr() -> Str =
   o = Some(\"x\")
   match o
     Some(v) =>
@@ -476,10 +476,10 @@ fn generic_method_on_generic_class_type_checks() {
 type Box[T] =
   value: T
-getValue<Box>() -> T =
+fun getValue<Box>() -> T =
   self.value
-use() -> Int =
+fun use() -> Int =
   b = Box(value: 5)
   b.getValue()
 ";
@@ -502,11 +502,11 @@ fn unbounded_recursive_generic_instantiation_is_a_clear_error() {
 type Box[T] =
   value: T
-recurse(v: T) -> Int =
+fun recurse(v: T) -> Int =
   b = Box(value: v)
   recurse(b)
-use() -> Int =
+fun use() -> Int =
   recurse(5)
 ";
     let source = parse(src);
@@ -528,14 +528,14 @@ enum Option =
   | Some[T]
   | None
-unwrapOr(o: Option, default: Int) -> Int =
+fun unwrapOr(o: Option, default: Int) -> Int =
   match o
     Some(v) =>
       v
     None =>
       default
-use() -> Int =
+fun use() -> Int =
   unwrapOr(Some(5), 0)
 ";
     let source = parse(src);
@@ -559,13 +559,13 @@ fn ordinary_function_with_bare_generic_class_param_type_checks() {
 type Box[T] =
   value: T
-getBoxValue<Box>() -> T =
+fun getBoxValue<Box>() -> T =
   self.value
-sumBox(b: Box) -> Int =
+fun sumBox(b: Box) -> Int =
   b.getBoxValue()
-use() -> Int =
+fun use() -> Int =
   sumBox(Box(value: 5))
 ";
     let source = parse(src);
@@ -576,7 +576,7 @@ use() -> Int =
 #[test]
 fn closure_literal_infers_as_a_function_type() {
     let src = "\
-useClosure() -> Bool =
+fun useClosure() -> Bool =
   cb = |v|
     True
   cb(5)
@@ -589,7 +589,7 @@ useClosure() -> Bool =
 #[test]
 fn fn_value_typed_param_can_be_called() {
     let src = "\
-each(cb: fn(Int) -> Bool) -> Bool =
+fun each(cb: fn(Int) -> Bool) -> Bool =
   cb(5)
 ";
     let source = parse(src);
@@ -604,7 +604,7 @@ type Cat =
   name: Str
   age: Int
-haveBirthday<Cat>() =
+fun haveBirthday<Cat>() =
   self.age = self.age + 1
 ";
     let source = parse(src);
@@ -618,7 +618,7 @@ type Cat =
   name: Str
   age: Int
-breakCat<Cat>() =
+fun breakCat<Cat>() =
   self.age = \"oops\"
 ";
     let source = parse(src);
@@ -633,7 +633,7 @@ type Cat =
   name: Str
   age: Int
-breakCat<Cat>() =
+fun breakCat<Cat>() =
   self.nope = 1
 ";
     let source = parse(src);
@@ -644,10 +644,10 @@ breakCat<Cat>() =
 #[test]
 fn closure_passed_to_fn_value_typed_param_type_checks() {
     let src = "\
-each(cb: fn(Int) -> Bool) -> Bool =
+fun each(cb: fn(Int) -> Bool) -> Bool =
   cb(5)
-use() -> Bool =
+fun use() -> Bool =
   each(|v|
     True)
 ";
@@ -659,10 +659,10 @@ use() -> Bool =
 #[test]
 fn variadic_call_with_zero_trailing_args_passes() {
     let src = "\
-sumAll(nums: ...Int) -> Int =
+fun sumAll(nums: ...Int) -> Int =
   0
-useSumAll() -> Int =
+fun useSumAll() -> Int =
   sumAll()
 ";
     let source = parse(src);
@@ -672,10 +672,10 @@ useSumAll() -> Int =
 #[test]
 fn variadic_call_with_several_trailing_args_passes() {
     let src = "\
-sumAll(nums: ...Int) -> Int =
+fun sumAll(nums: ...Int) -> Int =
   0
-useSumAll() -> Int =
+fun useSumAll() -> Int =
   sumAll(1, 2, 3)
 ";
     let source = parse(src);
@@ -685,10 +685,10 @@ useSumAll() -> Int =
 #[test]
 fn variadic_call_with_mismatched_trailing_arg_type_is_error() {
     let src = "\
-sumAll(nums: ...Int) -> Int =
+fun sumAll(nums: ...Int) -> Int =
   0
-useSumAll() -> Int =
+fun useSumAll() -> Int =
   sumAll(1, \"two\")
 ";
     let source = parse(src);
@@ -698,10 +698,10 @@ useSumAll() -> Int =
 #[test]
 fn variadic_call_with_fixed_prefix_passes() {
     let src = "\
-combine(prefix: Int, rest: ...Int) -> Int =
+fun combine(prefix: Int, rest: ...Int) -> Int =
   prefix
-useCombine() -> Int =
+fun useCombine() -> Int =
   combine(1, 2, 3)
 ";
     let source = parse(src);
@@ -711,7 +711,7 @@ useCombine() -> Int =
 #[test]
 fn two_variadic_params_is_error() {
     let src = "\
-bad(a: ...Int, b: ...Int) -> Int =
+fun bad(a: ...Int, b: ...Int) -> Int =
   0
 ";
     let source = parse(src);
@@ -721,7 +721,7 @@ bad(a: ...Int, b: ...Int) -> Int =
 #[test]
 fn variadic_param_not_last_is_error() {
     let src = "\
-bad(a: ...Int, b: Int) -> Int =
+fun bad(a: ...Int, b: Int) -> Int =
   0
 ";
     let source = parse(src);
@@ -731,7 +731,7 @@ bad(a: ...Int, b: Int) -> Int =
 #[test]
 fn for_loop_over_variadic_binds_element_type() {
     let src = "\
-sumAll(nums: ...Int) -> Int =
+fun sumAll(nums: ...Int) -> Int =
   total = 0
   for v in nums
     total = total + v
@@ -744,7 +744,7 @@ sumAll(nums: ...Int) -> Int =
 #[test]
 fn for_loop_over_variadic_with_two_vars_is_error() {
     let src = "\
-bad(nums: ...Int) -> Int =
+fun bad(nums: ...Int) -> Int =
   for v, i in nums
     v
   0

plum-core/tests/formatter_test.rs CHANGED Viewed

@@ -2,7 +2,7 @@ use plum_core::format_source;
 #[test]
 fn formats_simple_function() {
-    let input = "main() =\n  x = 1\n";
+    let input = "fun main() =\n  x = 1\n";
     let result = format_source(input).expect("format_source should succeed");
     assert!(result.contains("main()"));
     assert!(result.contains("x ="));
@@ -10,7 +10,7 @@ fn formats_simple_function() {
 #[test]
 fn formats_binary_operator_spacing() {
-    let input = "add<Int>(a: Int, b: Int) -> Int =\n  a+b\n";
+    let input = "fun add<Int>(a: Int, b: Int) -> Int =\n  a+b\n";
     let result = format_source(input).expect("format_source should succeed");
     assert!(result.contains("a + b"));
 }
@@ -24,7 +24,7 @@ fn rejects_syntax_error() {
 #[test]
 fn idempotent_on_already_formatted() {
-    let input = "main() =\n  x = 1 + 2\n";
+    let input = "fun main() =\n  x = 1 + 2\n";
     let first = format_source(input).expect("first pass");
     let second = format_source(&first).expect("second pass");
     assert_eq!(first, second, "formatting should be idempotent");

plum-core/tests/loader_test.rs CHANGED Viewed

@@ -16,8 +16,8 @@ fn write_lib_file(lib_path: &std::path::Path, name: &str, contents: &str) -> std
 fn import_sees_imported_declarations() {
     let dir = TempDir::new().unwrap();
     let lib_path = dir.path().join("libs");
-    write_lib_file(&lib_path, "helper", "module fixtures\n\nhelperFn() -> Int =\n  42\n");
+    write_lib_file(&lib_path, "helper", "module fixtures\n\nfun helperFn() -> Int =\n  42\n");
-    let entry = write_lib_file(&lib_path, "main", "module fixtures\n\nimport helper\n\nmain() -> Int =\n  helperFn()\n");
+    let entry = write_lib_file(&lib_path, "main", "module fixtures\n\nimport helper\n\nfun main() -> Int =\n  helperFn()\n");
     let merged = load_and_merge(&entry, &lib_path).expect("load_and_merge failed");
     let names: Vec<&str> = merged.items.iter().filter_map(|i| match i {
@@ -32,9 +32,9 @@ fn import_sees_imported_declarations() {
 fn transitive_import_surfaces_grandchild_declarations() {
     let dir = TempDir::new().unwrap();
     let lib_path = dir.path().join("libs");
-    write_lib_file(&lib_path, "c", "module fixtures\n\ncFn() -> Int =\n  3\n");
+    write_lib_file(&lib_path, "c", "module fixtures\n\nfun cFn() -> Int =\n  3\n");
-    write_lib_file(&lib_path, "b", "module fixtures\n\nimport c\n\nbFn() -> Int =\n  cFn()\n");
+    write_lib_file(&lib_path, "b", "module fixtures\n\nimport c\n\nfun bFn() -> Int =\n  cFn()\n");
-    let entry = write_lib_file(&lib_path, "a", "module fixtures\n\nimport b\n\nmain() -> Int =\n  bFn()\n");
+    let entry = write_lib_file(&lib_path, "a", "module fixtures\n\nimport b\n\nfun main() -> Int =\n  bFn()\n");
     let merged = load_and_merge(&entry, &lib_path).expect("load_and_merge failed");
     let names: Vec<&str> = merged.items.iter().filter_map(|i| match i {
@@ -48,10 +48,10 @@ fn transitive_import_surfaces_grandchild_declarations() {
 fn diamond_import_includes_shared_dependency_once() {
     let dir = TempDir::new().unwrap();
     let lib_path = dir.path().join("libs");
-    write_lib_file(&lib_path, "d", "module fixtures\n\ndFn() -> Int =\n  4\n");
+    write_lib_file(&lib_path, "d", "module fixtures\n\nfun dFn() -> Int =\n  4\n");
-    write_lib_file(&lib_path, "b", "module fixtures\n\nimport d\n\nbFn() -> Int =\n  dFn()\n");
+    write_lib_file(&lib_path, "b", "module fixtures\n\nimport d\n\nfun bFn() -> Int =\n  dFn()\n");
-    write_lib_file(&lib_path, "c", "module fixtures\n\nimport d\n\ncFn() -> Int =\n  dFn()\n");
+    write_lib_file(&lib_path, "c", "module fixtures\n\nimport d\n\nfun cFn() -> Int =\n  dFn()\n");
-    let entry = write_lib_file(&lib_path, "a", "module fixtures\n\nimport b\nimport c\n\nmain() -> Int =\n  bFn() + cFn()\n");
+    let entry = write_lib_file(&lib_path, "a", "module fixtures\n\nimport b\nimport c\n\nfun main() -> Int =\n  bFn() + cFn()\n");
     let merged = load_and_merge(&entry, &lib_path).expect("load_and_merge failed");
     let d_count = merged.items.iter().filter(|i| matches!(i, plum_core::ast::Item::Fn(f) if f.name == "dFn")).count();
@@ -62,8 +62,8 @@ fn diamond_import_includes_shared_dependency_once() {
 fn import_cycle_resolves_without_hanging_or_erroring() {
     let dir = TempDir::new().unwrap();
     let lib_path = dir.path().join("libs");
-    write_lib_file(&lib_path, "b", "module fixtures\n\nimport a\n\nbFn() -> Int =\n  1\n");
+    write_lib_file(&lib_path, "b", "module fixtures\n\nimport a\n\nfun bFn() -> Int =\n  1\n");
-    let entry = write_lib_file(&lib_path, "a", "module fixtures\n\nimport b\n\nmain() -> Int =\n  bFn()\n");
+    let entry = write_lib_file(&lib_path, "a", "module fixtures\n\nimport b\n\nfun main() -> Int =\n  bFn()\n");
     let merged = load_and_merge(&entry, &lib_path).expect("import cycle should resolve, not error");
     let names: Vec<&str> = merged.items.iter().filter_map(|i| match i {
@@ -78,7 +78,7 @@ fn import_cycle_resolves_without_hanging_or_erroring() {
 fn unresolvable_import_is_a_clear_error() {
     let dir = TempDir::new().unwrap();
     let lib_path = dir.path().join("libs");
-    let entry = write_lib_file(&lib_path, "main", "module fixtures\n\nimport does_not_exist\n\nmain() -> Int =\n  0\n");
+    let entry = write_lib_file(&lib_path, "main", "module fixtures\n\nimport does_not_exist\n\nfun main() -> Int =\n  0\n");
     let result = load_and_merge(&entry, &lib_path);
     assert!(result.is_err());
@@ -90,8 +90,8 @@ fn unresolvable_import_is_a_clear_error() {
 fn duplicate_top_level_name_across_files_is_a_clear_error() {
     let dir = TempDir::new().unwrap();
     let lib_path = dir.path().join("libs");
-    write_lib_file(&lib_path, "helper", "module fixtures\n\nsharedFn() -> Int =\n  1\n");
+    write_lib_file(&lib_path, "helper", "module fixtures\n\nfun sharedFn() -> Int =\n  1\n");
-    let entry = write_lib_file(&lib_path, "main", "module fixtures\n\nimport helper\n\nsharedFn() -> Int =\n  2\n");
+    let entry = write_lib_file(&lib_path, "main", "module fixtures\n\nimport helper\n\nfun sharedFn() -> Int =\n  2\n");
     let result = load_and_merge(&entry, &lib_path);
     assert!(result.is_err());
@@ -109,7 +109,7 @@ module fixtures
 type Cat =
   age: Int
-length<Cat>(self) -> Int =
+fun length<Cat>(self) -> Int =
   self.age
 ");
     let entry = write_lib_file(&lib_path, "main", "\
@@ -120,10 +120,10 @@ import cat
 type Box =
   items: Int
-length<Box>(self) -> Int =
+fun length<Box>(self) -> Int =
   self.items
-main() -> Int =
+fun main() -> Int =
   0
 ");

plum-core/tests/parser_test.rs CHANGED Viewed

@@ -21,7 +21,7 @@ fn only_trait(source: &Source) -> &Trait {
 #[test]
 fn closure_literal_parses_with_params_and_body() {
     let src = "\
-useClosure() -> Bool =
+fun useClosure() -> Bool =
   cb = |v|
     True
   cb(5)
@@ -38,7 +38,7 @@ useClosure() -> Bool =
 #[test]
 fn closure_literal_parses_with_no_params() {
     let src = "\
-useClosure() -> Bool =
+fun useClosure() -> Bool =
   cb = ||
     True
   cb()
@@ -53,7 +53,7 @@ useClosure() -> Bool =
 #[test]
 fn fn_without_receiver_but_with_return_type_has_no_type_param() {
-    let src = "main() -> Int =\n  0\n";
+    let src = "fun main() -> Int =\n  0\n";
     let source = parse(src);
     let f = only_fn(&source);
     assert_eq!(f.type_param, None, "return type must not be mistaken for a method receiver");
@@ -62,7 +62,7 @@ fn fn_without_receiver_but_with_return_type_has_no_type_param() {
 #[test]
 fn fn_with_receiver_and_return_type_has_correct_type_param() {
-    let src = "toStr<Cat>() -> Str =\n  \"x\"\n";
+    let src = "fun toStr<Cat>() -> Str =\n  \"x\"\n";
     let source = parse(src);
     let f = only_fn(&source);
     assert_eq!(f.type_param, Some("Cat".to_string()));
@@ -71,7 +71,7 @@ fn fn_with_receiver_and_return_type_has_correct_type_param() {
 #[test]
 fn fn_value_type_param_parses_with_positional_types_and_return() {
-    let src = "each(cb: fn(Int) -> Bool) -> Bool =\n  True\n";
+    let src = "fun each(cb: fn(Int) -> Bool) -> Bool =\n  True\n";
     let source = parse(src);
     let f = only_fn(&source);
     let ParamType::Fn(param_types, ret) = &f.params[0].ty else { panic!("expected ParamType::Fn, got {:?}", f.params[0].ty) };
@@ -96,7 +96,7 @@ fn trait_method_return_type_is_not_mangled_to_arrow_token() {
 #[test]
 fn fn_value_type_param_parses_with_no_return() {
-    let src = "each(cb: fn(Int)) -> Bool =\n  True\n";
+    let src = "fun each(cb: fn(Int)) -> Bool =\n  True\n";
     let source = parse(src);
     let f = only_fn(&source);
     let ParamType::Fn(param_types, ret) = &f.params[0].ty else { panic!("expected ParamType::Fn") };

plum-wasm-codegen/tests/codegen_tests.rs CHANGED Viewed

@@ -12,7 +12,7 @@ fn parse(src: &str) -> plum_core::ast::Source {
 #[test]
 fn compiles_to_valid_wasm() {
-    let src = "add(a: Int, b: Int) -> Int =\n  a + b\n";
+    let src = "fun add(a: Int, b: Int) -> Int =\n  a + b\n";
     let source = parse(src);
     let bytes = compile_source(&source).expect("compile failed");
     // Valid WASM starts with the magic number
@@ -22,7 +22,7 @@ fn compiles_to_valid_wasm() {
 #[test]
 fn output_validates() {
-    let src = "add(a: Int, b: Int) -> Int =\n  a + b\n";
+    let src = "fun add(a: Int, b: Int) -> Int =\n  a + b\n";
     let source = parse(src);
     let bytes = compile_source(&source).expect("compile failed");
     // wasmparser should accept the output
@@ -33,7 +33,7 @@ fn output_validates() {
 #[test]
 fn factorial_compiles() {
     let src = "\
-factorial(x: Int) -> Int =
+fun factorial(x: Int) -> Int =
   if x < 2
     return 1
   return x * factorial(x - 1)
@@ -47,7 +47,7 @@ factorial(x: Int) -> Int =
 #[test]
 fn give42_compiles_and_exports() {
-    let src = "give42() -> Int =\n  42\n";
+    let src = "fun give42() -> Int =\n  42\n";
     let source = parse(src);
     let bytes = compile_source(&source).expect("compile failed");
     assert_eq!(&bytes[0..4], b"\0asm");
@@ -65,23 +65,23 @@ fn assert_valid(src: &str) -> Vec<u8> {
 #[test]
 fn bool_literals_compile() {
-    assert_valid("main() -> Bool =\n  True\n");
+    assert_valid("fun main() -> Bool =\n  True\n");
-    assert_valid("main() -> Bool =\n  False\n");
+    assert_valid("fun main() -> Bool =\n  False\n");
 }
 #[test]
 fn string_literal_compiles() {
-    assert_valid("main() -> Str =\n  \"hello\"\n");
+    assert_valid("fun main() -> Str =\n  \"hello\"\n");
 }
 #[test]
 fn empty_string_literal_compiles() {
-    assert_valid("main() -> Str =\n  \"\"\n");
+    assert_valid("fun main() -> Str =\n  \"\"\n");
 }
 #[test]
 fn string_interpolation_of_an_int_runs_correctly() {
-    let src = "main() -> Str =\n  x = 42\n  \"{x}\"\n";
+    let src = "fun main() -> Str =\n  x = 42\n  \"{x}\"\n";
     let source = parse(src);
     let bytes = compile_source(&source).expect("compile failed");
     assert_eq!(run_main_str(&bytes), "42");
@@ -89,7 +89,7 @@ fn string_interpolation_of_an_int_runs_correctly() {
 #[test]
 fn string_interpolation_of_a_negative_int_runs_correctly() {
-    let src = "main() -> Str =\n  x = -7\n  \"{x}\"\n";
+    let src = "fun main() -> Str =\n  x = -7\n  \"{x}\"\n";
     let source = parse(src);
     let bytes = compile_source(&source).expect("compile failed");
     assert_eq!(run_main_str(&bytes), "-7");
@@ -97,7 +97,7 @@ fn string_interpolation_of_a_negative_int_runs_correctly() {
 #[test]
 fn string_interpolation_of_zero_runs_correctly() {
-    let src = "main() -> Str =\n  x = 0\n  \"{x}\"\n";
+    let src = "fun main() -> Str =\n  x = 0\n  \"{x}\"\n";
     let source = parse(src);
     let bytes = compile_source(&source).expect("compile failed");
     assert_eq!(run_main_str(&bytes), "0");
@@ -105,7 +105,7 @@ fn string_interpolation_of_zero_runs_correctly() {
 #[test]
 fn string_interpolation_with_surrounding_text_and_multiple_interps_runs_correctly() {
-    let src = "main() -> Str =\n  count = 3\n  total = 10\n  \"{count} of {total} complete\"\n";
+    let src = "fun main() -> Str =\n  count = 3\n  total = 10\n  \"{count} of {total} complete\"\n";
     let source = parse(src);
     let bytes = compile_source(&source).expect("compile failed");
     assert_eq!(run_main_str(&bytes), "3 of 10 complete");
@@ -113,7 +113,7 @@ fn string_interpolation_with_surrounding_text_and_multiple_interps_runs_correctl
 #[test]
 fn string_interpolation_of_a_str_runs_correctly() {
-    let src = "greet(name: Str) -> Str =\n  \"Hello, {name}!\"\n\nmain() -> Str =\n  greet(\"World\")\n";
+    let src = "fun greet(name: Str) -> Str =\n  \"Hello, {name}!\"\n\nfun main() -> Str =\n  greet(\"World\")\n";
     let source = parse(src);
     let bytes = compile_source(&source).expect("compile failed");
     assert_eq!(run_main_str(&bytes), "Hello, World!");
@@ -121,7 +121,7 @@ fn string_interpolation_of_a_str_runs_correctly() {
 #[test]
 fn string_interpolation_of_a_bool_runs_correctly() {
-    let src = "main() -> Str =\n  b = True\n  \"is {b}\"\n";
+    let src = "fun main() -> Str =\n  b = True\n  \"is {b}\"\n";
     let source = parse(src);
     let bytes = compile_source(&source).expect("compile failed");
     assert_eq!(run_main_str(&bytes), "is True");
@@ -132,7 +132,7 @@ fn string_interpolation_of_a_float_is_a_clear_error() {
     // Float-to-decimal-string formatting is a substantial separate undertaking
     // (correct rounding needs something like Grisu/Ryu); scoped out for now with
     // an explicit error rather than emitting an incorrect conversion.
-    let src = "main() -> Str =\n  x = 1.5\n  \"{x}\"\n";
+    let src = "fun main() -> Str =\n  x = 1.5\n  \"{x}\"\n";
     let source = parse(src);
     let err = compile_source(&source).expect_err("float interpolation should not silently compile");
     assert!(err.contains("Float"), "got: {}", err);
@@ -140,7 +140,7 @@ fn string_interpolation_of_a_float_is_a_clear_error() {
 #[test]
 fn float_arithmetic_and_negation_compile() {
-    assert_valid("main(x: Float) -> Float =\n  y = -x\n  y + 1.5\n");
+    assert_valid("fun main(x: Float) -> Float =\n  y = -x\n  y + 1.5\n");
 }
 #[test]
@@ -150,10 +150,10 @@ type Cat =
   name: Str
   age: Int
-getAge<Cat>() -> Int =
+fun getAge<Cat>() -> Int =
   self.age
-makeCat() -> Int =
+fun makeCat() -> Int =
   c = Cat(name: \"x\", age: 3)
   c.getAge()
 ";
@@ -171,7 +171,7 @@ type Wrapper =
   inner: Pair
   tag: Int
-make() -> Int =
+fun make() -> Int =
   w = Wrapper(inner: Pair(a: 1, b: 2), tag: 9)
   w.tag
 ";
@@ -180,32 +180,32 @@ make() -> Int =
 #[test]
 fn match_with_int_and_wildcard_compiles() {
-    let src = "main(a: Int) -> Int =\n  match a\n    1 =>\n      return 10\n    _ =>\n      return 0\n";
+    let src = "fun main(a: Int) -> Int =\n  match a\n    1 =>\n      return 10\n    _ =>\n      return 0\n";
     assert_valid(src);
 }
 #[test]
 fn match_binding_pattern_compiles() {
-    let src = "main(a: Int) -> Int =\n  match a\n    x =>\n      return x\n";
+    let src = "fun main(a: Int) -> Int =\n  match a\n    x =>\n      return x\n";
     assert_valid(src);
 }
 #[test]
 fn match_inline_case_body_compiles() {
     // Case bodies can be a single inline expression, not just an indented block.
-    let src = "main(a: Int) =\n  match a\n    1 => 10\n    _ => 0\n";
+    let src = "fun main(a: Int) =\n  match a\n    1 => 10\n    _ => 0\n";
     assert_valid(src);
 }
 #[test]
 fn match_bool_variant_pattern_compiles() {
-    let src = "main(a: Bool) -> Int =\n  match a\n    True =>\n      return 1\n    False =>\n      return 0\n";
+    let src = "fun main(a: Bool) -> Int =\n  match a\n    True =>\n      return 1\n    False =>\n      return 0\n";
     assert_valid(src);
 }
 #[test]
 fn match_string_pattern_is_a_clear_error() {
-    let src = "main(a: Str) -> Int =\n  match a\n    \"x\" =>\n      1\n    _ =>\n      0\n";
+    let src = "fun main(a: Str) -> Int =\n  match a\n    \"x\" =>\n      1\n    _ =>\n      0\n";
     let source = parse(src);
     let err = compile_source(&source).expect_err("string match patterns are not yet supported");
     assert!(err.contains("string match"), "got: {}", err);
@@ -222,7 +222,7 @@ enum Nested =
   | Wrap[Option]
   | Empty
-f(n: Nested) -> Int =
+fun f(n: Nested) -> Int =
   match n
     Wrap(Some(v)) =>
       return v
@@ -231,7 +231,7 @@ f(n: Nested) -> Int =
     Empty =>
       return 0
-main() -> Int =
+fun main() -> Int =
   f(Wrap(Some(5)))
 ";
     let source = parse(src);
@@ -252,7 +252,7 @@ enum Nested =
   | Wrap[Option]
   | Empty
-f(n: Nested) -> Int =
+fun f(n: Nested) -> Int =
   match n
     Wrap(Some(v)) =>
       return v
@@ -261,7 +261,7 @@ f(n: Nested) -> Int =
     Empty =>
       return 0
-main() -> Int =
+fun main() -> Int =
   f(Wrap(None))
 ";
     let source = parse(src);
@@ -285,13 +285,13 @@ enum Box =
   | Full[T]
   | Empty
-unwrap(b: Box) -> Int =
+fun unwrap(b: Box) -> Int =
   match b
     Full(Some(v)) => v
     Full(None) => -1
     Empty => 0
-main() -> Int =
+fun main() -> Int =
   unwrap(Full(Some(7)))
 ";
     let source = parse(src);
@@ -308,14 +308,14 @@ enum Option =
   | Some[Option]
   | None
-unwrapTwice(o: Option) -> Int =
+fun unwrapTwice(o: Option) -> Int =
   match o
     Some(Some(None)) => 1
     Some(None) => 2
     None => 3
     _ => 0
-main() -> Int =
+fun main() -> Int =
   unwrapTwice(Some(Some(None)))
 ";
     let source = parse(src);
@@ -371,12 +371,12 @@ fn run_main_str(bytes: &[u8]) -> String {
 #[test]
 fn factorial_runs_correctly() {
     let src = "\
-factorial(x: Int) -> Int =
+fun factorial(x: Int) -> Int =
   if x < 2
     return 1
   return x * factorial(x - 1)
-main() -> Int =
+fun main() -> Int =
   factorial(5)
 ";
     let source = parse(src);
@@ -391,10 +391,10 @@ type Cat =
   name: Str
   age: Int
-getAge<Cat>() -> Int =
+fun getAge<Cat>() -> Int =
   self.age
-main() -> Int =
+fun main() -> Int =
   c = Cat(name: \"x\", age: 7)
   c.getAge()
 ";
@@ -414,7 +414,7 @@ type Wrapper =
   inner: Pair
   tag: Int
-main() -> Int =
+fun main() -> Int =
   w = Wrapper(inner: Pair(a: 11, b: 22), tag: 99)
   w.inner.b
 ";
@@ -433,14 +433,14 @@ fn repeated_class_call_in_a_loop_does_not_alias() {
 type Box =
   v: Int
-sumBoxes() -> Int =
+fun sumBoxes() -> Int =
   total = 0
   for i in 0..5
     b = Box(v: i)
     total = total + b.v
   return total
-main() -> Int =
+fun main() -> Int =
   sumBoxes()
 ";
     let source = parse(src);
@@ -451,7 +451,7 @@ main() -> Int =
 #[test]
 fn match_int_and_wildcard_run_correctly() {
     let src = "\
-classify(a: Int) -> Int =
+fun classify(a: Int) -> Int =
   match a
     1 =>
       return 100
@@ -460,7 +460,7 @@ classify(a: Int) -> Int =
     _ =>
       return 0
-main() -> Int =
+fun main() -> Int =
   classify(2)
 ";
     let source = parse(src);
@@ -475,14 +475,14 @@ fn match_bool_variant_pattern_runs_correctly() {
     // source file — otherwise the first arm always "matches" (as a rebinding) and
     // `pick(False)` would wrongly return 1.
     let src = "\
-pick(a: Bool) -> Int =
+fun pick(a: Bool) -> Int =
   match a
     True =>
       return 1
     False =>
       return 0
-main() -> Int =
+fun main() -> Int =
   pick(False)
 ";
     let source = parse(src);
@@ -497,10 +497,10 @@ fn lowercase_single_word_function_call_runs_correctly() {
     // matched its text and the grammar's lexer would nondeterministically commit to
     // `var_identifier`, breaking every such call site.
     let src = "\
-double(n: Int) -> Int =
+fun double(n: Int) -> Int =
   n * 2
-main() -> Int =
+fun main() -> Int =
   double(21)
 ";
     let source = parse(src);
@@ -511,11 +511,11 @@ main() -> Int =
 #[test]
 fn assert_traps_on_false_and_passes_through_on_true() {
     let src_ok = "\
-check(n: Int) -> Int =
+fun check(n: Int) -> Int =
   assert n > 0
   n
-main() -> Int =
+fun main() -> Int =
   check(5)
 ";
     let source = parse(src_ok);
@@ -523,11 +523,11 @@ main() -> Int =
     assert_eq!(run_main(&bytes), 5);
     let src_trap = "\
-check(n: Int) -> Int =
+fun check(n: Int) -> Int =
   assert n > 0
   n
-main() -> Int =
+fun main() -> Int =
   check(-1)
 ";
     let source = parse(src_trap);
@@ -545,10 +545,10 @@ main() -> Int =
 fn todo_traps_at_runtime() {
     // `todo` marks an unimplemented body — it must trap, not silently do nothing.
     let src = "\
-notDoneYet() -> Int =
+fun notDoneYet() -> Int =
   todo
-main() -> Int =
+fun main() -> Int =
   notDoneYet()
 ";
     let source = parse(src);
@@ -570,7 +570,7 @@ enum Color =
   | Green
   | Blue
-main() -> Int =\n  x = Green\n  0\n";
+fun main() -> Int =\n  x = Green\n  0\n";
     assert_valid(src);
 }
@@ -581,14 +581,14 @@ enum Option =
   | Some[Int]
   | None
-unwrapOr(o: Option, default: Int) -> Int =
+fun unwrapOr(o: Option, default: Int) -> Int =
   match o
     Some(v) =>
       return v
     None =>
       return default
-main() -> Int =
+fun main() -> Int =
   unwrapOr(Some(7), 0)
 ";
     let source = parse(src);
@@ -603,14 +603,14 @@ enum Shape =
   | Rect[Int, Int]
   | Circle[Int]
-area(s: Shape) -> Int =
+fun area(s: Shape) -> Int =
   match s
     Rect(w, h) =>
       return w * h
     Circle(r) =>
       return r * r
-main() -> Int =
+fun main() -> Int =
   area(Rect(3, 4))
 ";
     let source = parse(src);
@@ -626,7 +626,7 @@ enum Color =
   | Green
   | Blue
-code(c: Color) -> Int =
+fun code(c: Color) -> Int =
   match c
     Red =>
       return 1
@@ -635,7 +635,7 @@ code(c: Color) -> Int =
     Blue =>
       return 3
-main() -> Int =
+fun main() -> Int =
   code(Green)
 ";
     let source = parse(src);
@@ -650,14 +650,14 @@ enum Option =
   | Some[Int]
   | None
-isSome(o: Option) -> Int =
+fun isSome(o: Option) -> Int =
   match o
     Some(_) =>
       return 1
     None =>
       return 0
-main() -> Int =
+fun main() -> Int =
   isSome(Some(99))
 ";
     let source = parse(src);
@@ -675,14 +675,14 @@ enum Option =
   | Some[Int]
   | None
-unwrapOr(o: Option, default: Int) -> Int =
+fun unwrapOr(o: Option, default: Int) -> Int =
   match o
     Some(v) =>
       return v
     None =>
       return default
-main() -> Int =
+fun main() -> Int =
   unwrapOr(None, 5)
 ";
     let source = parse(src);
@@ -702,14 +702,14 @@ enum Option =
 type Box =
   value: Option
-unwrap<Box>(default: Int) -> Int =
+fun unwrap<Box>(default: Int) -> Int =
   match self.value
     Some(v) =>
       return v
     None =>
       return default
-main() -> Int =
+fun main() -> Int =
   b = Box(value: Some(42))
   b.unwrap(0)
 ";
@@ -721,12 +721,12 @@ main() -> Int =
 #[test]
 fn tail_match_without_return_runs_correctly() {
     let src = "\
-bindExample(n: Int) -> Int =
+fun bindExample(n: Int) -> Int =
   match n
     x =>
       x
-main() -> Int =
+fun main() -> Int =
   bindExample(5)
 ";
     let source = parse(src);
@@ -737,13 +737,13 @@ main() -> Int =
 #[test]
 fn tail_if_without_return_runs_correctly() {
     let src = "\
-abs(n: Int) -> Int =
+fun abs(n: Int) -> Int =
   if n < 0
     -n
   else
     n
-main() -> Int =
+fun main() -> Int =
   abs(-7)
 ";
     let source = parse(src);
@@ -754,7 +754,7 @@ main() -> Int =
 #[test]
 fn tail_if_nested_inside_match_arm_without_return_runs_correctly() {
     let src = "\
-classify(n: Int) -> Int =
+fun classify(n: Int) -> Int =
   match n
     0 =>
       1
@@ -764,7 +764,7 @@ classify(n: Int) -> Int =
       else
         2
-main() -> Int =
+fun main() -> Int =
   classify(-5)
 ";
     let source = parse(src);
@@ -775,14 +775,14 @@ main() -> Int =
 #[test]
 fn tail_match_mixing_return_and_bare_expr_arms_runs_correctly() {
     let src = "\
-describe(n: Int) -> Int =
+fun describe(n: Int) -> Int =
   match n
     0 =>
       return 100
     x =>
       x * 2
-main() -> Int =
+fun main() -> Int =
   describe(21)
 ";
     let source = parse(src);
@@ -797,14 +797,14 @@ enum Option =
   | Some[Int]
   | None
-unwrapOr(o: Option, default: Int) -> Int =
+fun unwrapOr(o: Option, default: Int) -> Int =
   match o
     Some(v) =>
       v
     None =>
       default
-main() -> Int =
+fun main() -> Int =
   unwrapOr(Some(9), 0)
 ";
     let source = parse(src);
@@ -815,7 +815,7 @@ main() -> Int =
 #[test]
 fn tail_if_without_else_is_a_clear_error() {
     let src = "\
-bad(n: Int) -> Int =
+fun bad(n: Int) -> Int =
   if n < 0
     return 1
 ";
@@ -827,7 +827,7 @@ bad(n: Int) -> Int =
 #[test]
 fn tail_match_non_exhaustive_is_a_clear_error() {
     let src = "\
-bad(n: Int) -> Int =
+fun bad(n: Int) -> Int =
   match n
     0 =>
       1
@@ -840,7 +840,7 @@ bad(n: Int) -> Int =
 #[test]
 fn tail_match_arm_ending_in_non_value_statement_is_a_clear_error() {
     let src = "\
-bad(n: Int) -> Int =
+fun bad(n: Int) -> Int =
   match n
     x =>
       y = x
@@ -856,14 +856,14 @@ fn generic_class_specialized_at_two_types_does_not_alias() {
 type Box[T] =
   value: T
-getIntValue<Box>() -> Int =
+fun getIntValue<Box>() -> Int =
   self.value
-useInt() -> Int =
+fun useInt() -> Int =
   b = Box(value: 7)
   b.getIntValue()
-main() -> Int =
+fun main() -> Int =
   useInt()
 ";
     let source = parse(src);
@@ -874,10 +874,10 @@ main() -> Int =
 #[test]
 fn generic_function_called_at_multiple_concrete_types_runs_correctly() {
     let src = "\
-identity(value: T) -> T =
+fun identity(value: T) -> T =
   value
-main() -> Int =
+fun main() -> Int =
   identity(5) + identity(37)
 ";
     let source = parse(src);
@@ -891,10 +891,10 @@ fn generic_method_on_generic_class_runs_correctly() {
 type Box[T] =
   value: T
-getValue<Box>() -> Int =
+fun getValue<Box>() -> Int =
   self.value
-main() -> Int =
+fun main() -> Int =
   b = Box(value: 9)
   b.getValue()
 ";
@@ -906,13 +906,13 @@ main() -> Int =
 #[test]
 fn transitively_generic_call_chain_runs_correctly() {
     let src = "\
-identity(value: T) -> T =
+fun identity(value: T) -> T =
   value
-doubled(value: T) -> Int =
+fun doubled(value: T) -> Int =
   identity(value) + identity(value)
-main() -> Int =
+fun main() -> Int =
   doubled(21)
 ";
     let source = parse(src);
@@ -927,14 +927,14 @@ enum Option =
   | Some[T]
   | None
-unwrapOr(o: Option, default: Int) -> Int =
+fun unwrapOr(o: Option, default: Int) -> Int =
   match o
     Some(v) =>
       v
     None =>
       default
-main() -> Int =
+fun main() -> Int =
   unwrapOr(Some(13), 0)
 ";
     let source = parse(src);
@@ -956,21 +956,21 @@ enum Option =
   | Some[T]
   | None
-unwrapIntOr(o: Option, default: Int) -> Int =
+fun unwrapIntOr(o: Option, default: Int) -> Int =
   match o
     Some(v) =>
       v
     None =>
       default
-unwrapStrOr(o: Option, default: Int) -> Int =
+fun unwrapStrOr(o: Option, default: Int) -> Int =
   match o
     Some(v) =>
       4
     None =>
       default
-main() -> Int =
+fun main() -> Int =
   unwrapIntOr(Some(13), 0) + unwrapStrOr(Some(\"abcd\"), 0)
 ";
     let source = parse(src);
@@ -989,14 +989,14 @@ enum Option =
   | Some[T]
   | None
-unwrapOr(o: Option, default: Int) -> Int =
+fun unwrapOr(o: Option, default: Int) -> Int =
   match o
     Some(v) =>
       v
     None =>
       default
-main() -> Int =
+fun main() -> Int =
   unwrapOr(Some(5), 0) + unwrapOr(Some(37), 0)
 ";
     let source = parse(src);
@@ -1010,13 +1010,13 @@ fn ordinary_function_with_bare_generic_class_param_runs_correctly() {
 type Box[T] =
   value: T
-getBoxValue<Box>() -> Int =
+fun getBoxValue<Box>() -> Int =
   self.value
-sumBox(b: Box) -> Int =
+fun sumBox(b: Box) -> Int =
   b.getBoxValue()
-main() -> Int =
+fun main() -> Int =
   sumBox(Box(value: 11))
 ";
     let source = parse(src);
@@ -1069,10 +1069,10 @@ fn wasm_module_with_a_table_element_validates_and_call_indirect_works() {
 #[test]
 fn non_capturing_closure_passed_and_called_runs_correctly() {
     let src = "\
-each(cb: fn(Int) -> Int) -> Int =
+fun each(cb: fn(Int) -> Int) -> Int =
   cb(5)
-main() -> Int =
+fun main() -> Int =
   each(|v| v)
 ";
     let source = parse(src);
@@ -1086,10 +1086,10 @@ fn multi_line_closure_call_argument_with_closing_paren_on_last_statement_line_ru
     // multi-line closure body immediately followed by `)` on the same line as the
     // body's last statement, so this shape didn't parse at all before.
     let src = "\
-each(cb: fn(Int) -> Int) -> Int =
+fun each(cb: fn(Int) -> Int) -> Int =
   cb(5)
-main() -> Int =
+fun main() -> Int =
   each(|v|
     x = v + 1
     x * 2)
@@ -1102,17 +1102,17 @@ main() -> Int =
 #[test]
 fn capturing_closure_snapshots_value_at_creation_time_runs_correctly() {
     let src = "\
-each(cb: fn(Int) -> Int) -> Int =
+fun each(cb: fn(Int) -> Int) -> Int =
   cb(0)
-useClosure() -> Int =
+fun useClosure() -> Int =
   x = 10
   cb = |v|
     x + v
   x = 999
   each(cb)
-main() -> Int =
+fun main() -> Int =
   useClosure()
 ";
     let source = parse(src);
@@ -1132,16 +1132,16 @@ fn closure_assigned_then_called_at_float_type_runs_correctly() {
     // Float param silently defaulted to Int, producing a `call_indirect` signature
     // mismatch between the compiled closure body and its call site.
     let src = "\
-eachF(cb: fn(Float) -> Float) -> Float =
+fun eachF(cb: fn(Float) -> Float) -> Float =
   cb(0.0)
-useClosure() -> Float =
+fun useClosure() -> Float =
   offset = 2.5
   cb = |v|
     offset + v
   eachF(cb)
-main() -> Float =
+fun main() -> Float =
   useClosure()
 ";
     let source = parse(src);
@@ -1155,15 +1155,15 @@ fn closure_assigned_then_called_at_class_type_runs_correctly() {
 type Cat =
   age: Int
-eachCat(cb: fn(Cat) -> Int) -> Int =
+fun eachCat(cb: fn(Cat) -> Int) -> Int =
   cb(Cat(age: 7))
-useClosure() -> Int =
+fun useClosure() -> Int =
   cb = |c|
     c.age
   eachCat(cb)
-main() -> Int =
+fun main() -> Int =
   useClosure()
 ";
     let source = parse(src);
@@ -1174,13 +1174,13 @@ main() -> Int =
 #[test]
 fn closure_passed_through_already_generic_higher_order_function_runs_correctly() {
     let src = "\
-identity(value: T) -> T =
+fun identity(value: T) -> T =
   value
-each(cb: fn(Int) -> Int) -> Int =
+fun each(cb: fn(Int) -> Int) -> Int =
   cb(identity(7))
-main() -> Int =
+fun main() -> Int =
   each(|v| v * 2)
 ";
     let source = parse(src);
@@ -1198,10 +1198,10 @@ fn nested_closure_literal_runs_correctly() {
     // exercises the multi-level capture chain: `outer` must itself capture `offset`
     // purely because `inner` needs it, not because `outer` uses it.
     let src = "\
-each(cb: fn(Int) -> Int) -> Int =
+fun each(cb: fn(Int) -> Int) -> Int =
   cb(5)
-useNested() -> Int =
+fun useNested() -> Int =
   offset = 100
   outer = |v|
     inner = |w|
@@ -1209,7 +1209,7 @@ useNested() -> Int =
     inner(v)
   each(outer)
-main() -> Int =
+fun main() -> Int =
   useNested()
 ";
     let source = parse(src);
@@ -1220,10 +1220,10 @@ main() -> Int =
 #[test]
 fn nested_closure_literal_passed_directly_as_call_argument_runs_correctly() {
     let src = "\
-each(cb: fn(Int) -> Int) -> Int =
+fun each(cb: fn(Int) -> Int) -> Int =
   cb(5)
-main() -> Int =
+fun main() -> Int =
   each(|v|
     each(|w| w + v))
 ";
@@ -1238,13 +1238,13 @@ fn named_function_used_as_a_closure_typed_value_runs_correctly() {
     // wherever a `fn(...)`-typed value is expected — no closure literal involved at
     // the call site at all.
     let src = "\
-double(x: Int) -> Int =
+fun double(x: Int) -> Int =
   x * 2
-each(cb: fn(Int) -> Int) -> Int =
+fun each(cb: fn(Int) -> Int) -> Int =
   cb(21)
-main() -> Int =
+fun main() -> Int =
   each(double)
 ";
     let source = parse(src);
@@ -1255,10 +1255,10 @@ main() -> Int =
 #[test]
 fn named_function_used_as_a_value_assigned_then_called_runs_correctly() {
     let src = "\
-double(x: Int) -> Int =
+fun double(x: Int) -> Int =
   x * 2
-main() -> Int =
+fun main() -> Int =
   f = double
   f(21)
 ";
@@ -1273,13 +1273,13 @@ fn named_function_used_as_a_value_alongside_a_closure_at_the_same_call_type_runs
     // closure of the same signature (both must resolve to the same wasm function
     // type, since both flow through the exact same `cb(...)` call site).
     let src = "\
-double(x: Int) -> Int =
+fun double(x: Int) -> Int =
   x * 2
-each(cb: fn(Int) -> Int) -> Int =
+fun each(cb: fn(Int) -> Int) -> Int =
   cb(10)
-main() -> Int =
+fun main() -> Int =
   each(double) + each(|v| v + 1)
 ";
     let source = parse(src);
@@ -1292,14 +1292,14 @@ fn multi_subject_match_with_enum_tags_runs_correctly() {
     // Mirrors libs/std/bool.plum's `and`/`or`: `match self, o` against two Bool
     // subjects, each case naming a tag pattern per position.
     let src = "\
-and(a: Bool, b: Bool) -> Bool =
+fun and(a: Bool, b: Bool) -> Bool =
   match a, b
     True, True => True
     True, False => False
     False, True => False
     False, False => False
-main() -> Int =
+fun main() -> Int =
   x = and(True, True)
   y = and(True, False)
   match x, y
@@ -1317,13 +1317,13 @@ fn multi_subject_match_falls_through_to_next_case_when_only_first_position_match
     // doesn't (b is 2) — codegen must fall through to the *next case* (trying its
     // own position 0 again), not just "move on" within the first case.
     let src = "\
-classify(a: Int, b: Int) -> Int =
+fun classify(a: Int, b: Int) -> Int =
   match a, b
     1, 1 => 100
     1, 2 => 200
     _, _ => 0
-main() -> Int =
+fun main() -> Int =
   classify(1, 2)
 ";
     let source = parse(src);
@@ -1334,13 +1334,13 @@ main() -> Int =
 #[test]
 fn multi_subject_match_with_binding_and_wildcard_runs_correctly() {
     let src = "\
-combine(a: Int, b: Int) -> Int =
+fun combine(a: Int, b: Int) -> Int =
   match a, b
     0, y => y
     x, 0 => x
     x, y => x + y
-main() -> Int =
+fun main() -> Int =
   combine(3, 4)
 ";
     let source = parse(src);
@@ -1357,12 +1357,12 @@ enum Option =
   | Some[T]
   | None
-both(a: Option, b: Option) -> Int =
+fun both(a: Option, b: Option) -> Int =
   match a, b
     Some(x), Some(y) => x + y
     _, _ => 0
-main() -> Int =
+fun main() -> Int =
   both(Some(3), Some(4))
 ";
     let source = parse(src);
@@ -1376,10 +1376,10 @@ fn field_assignment_target_runs_correctly() {
 type Counter =
   value: Int
-bump<Counter>() =
+fun bump<Counter>() =
   self.value = self.value + 1
-main() -> Int =
+fun main() -> Int =
   c = Counter(value: 41)
   c.bump()
   c.value
@@ -1398,10 +1398,10 @@ type Inner =
 type Outer =
   inner: Inner
-bump<Outer>() =
+fun bump<Outer>() =
   self.inner.value = self.inner.value + 1
-main() -> Int =
+fun main() -> Int =
   o = Outer(inner: Inner(value: 9))
   o.bump()
   o.inner.value
@@ -1417,7 +1417,7 @@ fn mixed_multi_assign_with_field_target_runs_correctly() {
 type Counter =
   value: Int
-main() -> Int =
+fun main() -> Int =
   c = Counter(value: 5)
   a, c.value = 100, 7
   a + c.value
@@ -1430,10 +1430,10 @@ main() -> Int =
 #[test]
 fn variadic_call_with_varying_trailing_arg_counts_runs_correctly() {
     let src = "\
-combine(prefix: Int, rest: ...Int) -> Int =
+fun combine(prefix: Int, rest: ...Int) -> Int =
   prefix
-main() -> Int =
+fun main() -> Int =
   a = combine(10)
   b = combine(20, 1)
   c = combine(30, 1, 2, 3)
@@ -1447,13 +1447,13 @@ main() -> Int =
 #[test]
 fn sum_all_variadic_int_runs_correctly() {
     let src = "\
-sumAll(nums: ...Int) -> Int =
+fun sumAll(nums: ...Int) -> Int =
   total = 0
   for v in nums
     total = total + v
   total
-main() -> Int =
+fun main() -> Int =
   sumAll(1, 2, 3, 4)
 ";
     let source = parse(src);
@@ -1464,13 +1464,13 @@ main() -> Int =
 #[test]
 fn sum_all_variadic_int_with_zero_args_runs_correctly() {
     let src = "\
-sumAll(nums: ...Int) -> Int =
+fun sumAll(nums: ...Int) -> Int =
   total = 0
   for v in nums
     total = total + v
   total
-main() -> Int =
+fun main() -> Int =
   sumAll()
 ";
     let source = parse(src);