From b4054d7581b4f75ba9d8016aa3d6935c1c082ddd Mon Sep 17 00:00:00 2001
From: greg <greg.shuflin@protonmail.com>
Date: Sun, 8 Oct 2017 14:24:02 -0700
Subject: [PATCH] Impl blocks

---
 src/schala_lang/parsing.rs | 38 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/schala_lang/parsing.rs b/src/schala_lang/parsing.rs
index 9a3096b..0bcf163 100644
--- a/src/schala_lang/parsing.rs
+++ b/src/schala_lang/parsing.rs
@@ -293,6 +293,9 @@ binding_declaration: 'var' IDENTIFIER '=' expression
 
 trait_declaration := 'trait' trait_name decl_block
 impl_declaration := 'impl' IDENTIFIER decl_block | 'impl' trait_name 'for' IDENTIFIER decl_block
+
+decl_block := '{' (func_declaration)* '}'
+
 trait_name := IDENTIFIER
 
 type_anno := (':' type_name)+
@@ -321,7 +324,6 @@ match_arm := pattern '=>' expression
 pattern := identifier //TODO NOT DONE
 
 block := '{' (statement)* '}'
-decl_block := '{' (declaration)* '}'
 
 call_expr := IDENTIFIER '(' expr_list ')' //TODO maybe make this optional? or no, have a bare identifier meant to be used as method taken care of in eval
 index_expr := '[' (expression (',' (expression)* | ε) ']'
@@ -649,7 +651,18 @@ impl Parser {
     } else {
       None
     };
-    Ok(Declaration::Impl { type_name: first, trait_name: None, block: vec![] })
+
+    let block = self.decl_block()?;
+
+    let result = match (first, second) {
+      (first, Some(second)) => Declaration::Impl { type_name: second, trait_name: Some(first), block },
+      (first, None) => Declaration::Impl { type_name: first, trait_name: None, block }
+    };
+    Ok(result)
+  });
+
+  parse_method!(decl_block(&mut self) -> ParseResult<Vec<Declaration>> {
+    Ok(delimited!(self, LCurlyBrace, '{', func_declaration, Newline | Semicolon, RCurlyBrace, '}', nonstrict))
   });
 
   parse_method!(expression(&mut self) -> ParseResult<Expression> {
@@ -1103,6 +1116,27 @@ mod parse_tests {
     );
   }
 
+  #[test]
+  fn parsing_impls() {
+    parse_test!("impl Heh { fn yolo(); fn swagg(); }", AST(vec![
+      Declaration(Impl {
+        type_name: rc!(Heh),
+        trait_name: None,
+        block: vec![
+          FuncDecl { name: rc!(yolo), params: vec![] },
+          FuncDecl { name: rc!(swagg), params: vec![] }
+        ] })]));
+
+    parse_test!("impl Mondai for Lollerino { fn yolo(); fn swagg(); }", AST(vec![
+      Declaration(Impl {
+        type_name: rc!(Lollerino),
+        trait_name: Some(rc!(Mondai)),
+        block: vec![
+          FuncDecl { name: rc!(yolo), params: vec![] },
+          FuncDecl { name: rc!(swagg), params: vec![] }
+        ] })]));
+  }
+
   #[test]
   fn parsing_type_annotations() {
     parse_test!("const a = b : Int", AST(vec![