Fix methods #58 and #55

crates/parser/src/grammar.pest

@@ -281,8 +281,12 @@ self_param = {
     "self" ~ mutable? ~ deref_px?
 }
 
+method_args = _{
+    ((self_param ~ ("," ~ param_list)?) | param_list) ~ ","?
+}
+
 method = {
-    visibility? ~ type_expr ~ identifier ~ generics_decl? ~ "(" ~ self_param? ~ ("," ~ param_list)? ~ ")" ~ block
+    visibility? ~ type_expr ~ identifier ~ generics_decl? ~ "(" ~ method_args ~ ")" ~ (block | semicolon)
 }
 
 class_item = _{
@@ -310,13 +314,8 @@ impl_decl = {
 // ======================================================
 trait_requirements = { ":" ~ type_expr_param ~ ("+" ~ type_expr_param)* }
 
-method_no_body = {
-    visibility? ~ type_expr ~ identifier ~ generics_decl? ~ "(" ~ self_param? ~ ("," ~ param_list)? ~ ")" ~ semicolon
-}
-
 trait_item = _{
     method
-  | method_no_body
 }
 
 trait_decl = {

crates/parser/src/parser/items/function.rs

@@ -10,7 +10,7 @@ impl<'a> TryFrom<pest::iterators::Pair<'a, Rule>> for FunctionDecl {
     type Error = AstError<'a, Self>;
 
     fn try_from(pair: pest::iterators::Pair<'a, Rule>) -> Result<Self, Self::Error> {
-        ast_ensure!(pair, Rule::function_decl, Rule::method, Rule::method_no_body => {
+        ast_ensure!(pair, Rule::function_decl, Rule::method => {
         let mut inner = pair.into_inner();
             let visibility = Visibility::try_from(&mut inner);
             let return_type = TypeExpr::try_from(inner.next().unwrap());