Shorthand function syntax

jac3km4 · Feb 22, 2021 · a6e5def · a6e5def
1 parent b614e31
commit a6e5def
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/compiler/src/lib.rs b/compiler/src/lib.rs
@@ -581,4 +581,21 @@ mod tests {
         compiler.compile(sources)?;
         Ok(())
     }
+
+    #[test]
+    fn compile_class_with_shorthand_funcs() -> Result<(), Error> {
+        let sources = parser::parse(
+            "
+            public class ShorthandTest {
+                public func InstanceVal() -> String = ShorthandTest.StaticVal()
+                public static func StaticVal() -> String = \"static\"
+            }",
+        )
+        .unwrap();
+
+        let mut scripts = ScriptBundle::load(&mut Cursor::new(PREDEF))?;
+        let mut compiler = Compiler::new(&mut scripts.pool)?;
+        compiler.compile(sources)?;
+        Ok(())
+    }
 }
diff --git a/compiler/src/parser.rs b/compiler/src/parser.rs
@@ -203,7 +203,9 @@ peg::parser! {
         pub rule function() -> FunctionSource
             = declaration:decl(<keyword("func")>) _ "(" _ parameters:commasep(<param()>) _ ")" _ type_:func_type()? _ body:function_body()?
             { FunctionSource { declaration, type_, parameters, body } }
-        rule function_body() -> Seq = "{" _ body:seq() _ "}" { body }
+        rule function_body() -> Seq
+            = "{" _ body:seq() _ "}" { body }
+            / pos:position!() "=" _ expr:expr() { Seq::new(vec![Expr::Return(Some(Box::new(expr)), Pos::new(pos))]) }
 
         rule param() -> ParameterSource
             = qualifiers:qualifiers() _ name:ident() _ type_:let_type()