Updated tests and fixed grammar

mist-test/src/items/attribute_test.mist

@@ -2,22 +2,22 @@ pub module attribute_test;
 
 #[derive(Debug)]
 pub struct Debuggable {
-    value i32,
+    i32 value,
 }
 
-pub fn void test_derive_attribute() {
+pub void test_derive_attribute() {
     let d = Debuggable { value: 42 };
     assert_eq!(d.value, 42);
 }
 
 #[allow(unused_variables)]
-pub fn void test_allow_attribute() {
+pub void test_allow_attribute() {
     let x = 42;
     let y = "unused";
     assert_eq!(x, 42);
 }
 
-pub fn void run_tests() {
+pub void run_tests() {
     test_derive_attribute();
     test_allow_attribute();
 }

mist-test/src/items/class_test.mist

@@ -1,21 +1,21 @@
 pub module class_test;
 
 pub class Animal {
-    pub name String;
+    pub String name;
 
     constructor() {
         self.name = "Rex".to_string();
     }
 
-    pub fn String speak(*self) {
+    pub String speak(&self) {
         "Unknown".to_string()
     }
 
-    pub fn void test_speak(*self) {
+    pub void test_speak(&self) {
         assert_eq!(self.speak(), "Woof!");
     }
 
-    pub fn void static_method() {}
+    pub void static_method() {}
 }
 
 pub class Mammal : Animal {
@@ -23,7 +23,7 @@ pub class Mammal : Animal {
         super = Super::new();
     }
 
-    pub fn void args_test(*self, x i32, y *str) {
+    pub void args_test(&self, i32 x, str& y) {
         assert_eq!(x, 10);
         assert_eq!(y, "hello");
     }
@@ -34,18 +34,18 @@ pub class Dog : Mammal {
         super = Super::new();
     }
 
-    pub fn String speak(*self) override(Animal) {
+    pub String speak(&self) override(Animal) {
         "Woof!".to_string()
     }
 
     impl std::fmt::Display {
-        fn Result<(), std::fmt::Error> fmt(*self, f *mut std::fmt::Formatter<'_>) {
+     Result<(), std::fmt::Error> fmt(&self, std::fmt::Formatter<'_> mut& f) {
             write!(f, "🐾 {}", self.name)
         }
     }
 }
 
-pub fn void run_tests() {
+pub void run_tests() {
     let dawg = Dog::new();
 
     dawg.args_test(10, "hello");

mist-test/src/items/enum_test.mist

@@ -5,7 +5,7 @@ enum OptionInt {
     Some(i32),
 }
 
-pub fn void test_enum_named() {
+pub void test_enum_named() {
     let x = OptionInt::None;
     match x {
         OptionInt::None => { assert_eq!(1, 1); }
@@ -13,7 +13,7 @@ pub fn void test_enum_named() {
     }
 }
 
-pub fn void test_enum_tuple() {
+pub void test_enum_tuple() {
     let x = OptionInt::Some(42);
     match x {
         OptionInt::None => { assert_eq!(0, 1); }
@@ -22,11 +22,11 @@ pub fn void test_enum_tuple() {
 }
 
 enum Shape {
-    Circle { radius i32 },
-    Rect { w i32, h i32 },
+    Circle { i32 radius },
+    Rect { i32 w, i32 h },
 }
 
-pub fn void test_enum_struct() {
+pub void test_enum_struct() {
     let c = Shape::Circle { radius: 5 };
     match c {
         Shape::Circle { radius } => { assert_eq!(radius, 5); }
@@ -46,7 +46,7 @@ enum Color {
     Blue,
 }
 
-pub fn void test_enum_eq() {
+pub void test_enum_eq() {
     let c = Color::Red;
     match c {
         Color::Red => { assert_eq!(1, 1); }
@@ -54,7 +54,7 @@ pub fn void test_enum_eq() {
     }
 }
 
-pub fn void run_tests() {
+pub void run_tests() {
     test_enum_named();
     test_enum_tuple();
     test_enum_struct();

mist-test/src/items/function_test.mist

@@ -1,60 +1,60 @@
 pub module function_test;
 
-fn void greet() {
+void greet() {
     let mut x = 1;
     x++;
 }
 
-pub fn void test_basic_function() {
+pub void test_basic_function() {
     greet();
 }
 
-fn i32 add(a i32, b i32) {
+i32 add(i32 a, i32 b) {
     a + b
 }
 
-pub fn void test_fn_params() {
+pub void test_fn_params() {
     assert_eq!(add(2, 3), 5);
 }
 
-pub fn i32 test_fn_return() {
+pub i32 test_fn_return() {
     42
 }
 
-pub fn i32 test_fn_early_return() {
+pub i32 test_fn_early_return() {
     return 100;
     0
 }
 
-pub fn i32 test_fn_mut_param(mut x i32) {
+pub i32 test_fn_mut_param(i32 mut x) {
     x = x + 10;
     x
 }
 
-pub fn void test_method_call() {
+pub void test_method_call() {
     let s = "hello";
     assert_eq!(s.len(), 5);
     assert_eq!(s.to_uppercase(), "HELLO");
 }
 
-fn i32 triple(x i32) {
+i32 triple(i32 x) {
     add(x, add(x, x))
 }
 
-pub fn void test_nested_fn_calls() {
+pub void test_nested_fn_calls() {
     assert_eq!(triple(5), 15);
 }
 
-fn i32 factorial(n i32) {
+i32 factorial(i32 n) {
     if n <= 1 { 1 }
     else { n * factorial(n - 1) }
 }
 
-pub fn void test_recursive_fn() {
+pub void test_recursive_fn() {
     assert_eq!(factorial(5), 120);
 }
 
-pub fn void run_tests() {
+pub void run_tests() {
     test_basic_function();
     test_fn_params();
     assert_eq!(test_fn_return(), 42);

mist-test/src/items/impl_test.mist

@@ -1,39 +1,39 @@
 pub module impl_test;
 
 struct Vector2 {
-    x i32,
-    y i32,
+    i32 x,
+    i32 y,
 }
 
 impl Vector2 {
-    pub fn i32 magnitude(*self) {
+    pub i32 magnitude(&self) {
         self.x * self.x + self.y * self.y
     }
 }
 
-pub fn void test_inherent_impl() {
+pub void test_inherent_impl() {
     let v = Vector2 { x: 3, y: 4 };
     assert_eq!(v.magnitude(), 25);
 }
 
 trait Display {
-    fn String display(*self);
+    String display(&self);
 }
 
 impl Display for Vector2 {
-    fn String display(*self) {
+    String display(&self) {
         format!("({}, {})", self.x, self.y)
     }
 }
 
-pub fn void test_trait_impl_block() {
+pub void test_trait_impl_block() {
     let v = Vector2 { x: 1, y: 2 };
     let s = v.display();
     assert_eq!(s.len() > 0, true);
 }
 
 impl Vector2 {
-    pub fn Vector2 add(*self, other Vector2) {
+    pub Vector2 add(&self, Vector2 other) {
         Vector2 {
             x: self.x + other.x,
             y: self.y + other.y,
@@ -41,7 +41,7 @@ impl Vector2 {
     }
 }
 
-pub fn void test_multiple_impls() {
+pub void test_multiple_impls() {
     let a = Vector2 { x: 1, y: 2 };
     let b = Vector2 { x: 3, y: 4 };
     let c = a.add(b);
@@ -49,7 +49,7 @@ pub fn void test_multiple_impls() {
     assert_eq!(c.y, 6);
 }
 
-pub fn void run_tests() {
+pub void run_tests() {
     test_inherent_impl();
     test_trait_impl_block();
     test_multiple_impls();

mist-test/src/items/struct_test.mist

@@ -1,23 +1,23 @@
 pub module struct_test;
 
 struct Point {
-    x i32,
-    y i32,
+    i32 x,
+    i32 y,
 }
 
-pub fn void test_struct_create_access() {
+pub void test_struct_create_access() {
     let p = Point { x: 10, y: 20 };
     assert_eq!(p.x, 10);
     assert_eq!(p.y, 20);
 }
 
-pub fn void test_struct_mut_field() {
+pub void test_struct_mut_field() {
     let mut p = Point { x: 1, y: 2 };
     p.x = 100;
     assert_eq!(p.x, 100);
 }
 
-pub fn void test_struct_destructure() {
+pub void test_struct_destructure() {
     let p = Point { x: 3, y: 4 };
     let Point { x, y } = p;
     assert_eq!(x, 3);
@@ -25,11 +25,11 @@ pub fn void test_struct_destructure() {
 }
 
 struct Line {
-    start Point,
-    end Point,
+    Point start,
+    Point end,
 }
 
-pub fn void test_struct_nested() {
+pub void test_struct_nested() {
     let l = Line {
         start: Point { x: 0, y: 0 },
         end: Point { x: 5, y: 10 },
@@ -38,7 +38,7 @@ pub fn void test_struct_nested() {
     assert_eq!(l.end.y, 10);
 }
 
-pub fn void run_tests() {
+pub void run_tests() {
     test_struct_create_access();
     test_struct_mut_field();
     test_struct_destructure();

mist-test/src/items/trait_test.mist

@@ -1,41 +1,41 @@
 pub module trait_test;
 
 trait Speak {
-    fn String speak(*self);
+    String speak(&self);
 }
 
 trait Greet : Speak {
-    fn String greet(*self);
+    String greet(&self);
 }
 
 struct Dog {
-    name String,
+    String name,
 }
 
 impl Speak for Dog {
-    fn String speak(*self) {
+    String speak(&self) {
         "woof".to_string()
     }
 }
 
 impl Greet for Dog {
-    fn String greet(*self) {
+    String greet(&self) {
         "hello".to_string()
     }
 }
 
-pub fn void test_trait_impl() {
+pub void test_trait_impl() {
     let d = Dog { name: "Rex".to_string() };
     assert_eq!(d.speak(), "woof");
 }
 
-pub fn void test_trait_with_requirement() {
+pub void test_trait_with_requirement() {
     let d = Dog { name: "Buddy".to_string() };
     assert_eq!(d.speak(), "woof");
     assert_eq!(d.greet(), "hello");
 }
 
-pub fn void run_tests() {
+pub void run_tests() {
     test_trait_impl();
     test_trait_with_requirement();
 }