fix class defs

2015-10-09 17:32:05 +03:00
parent 60746383ee
commit 3651856fc5
9 changed files with 70 additions and 96 deletions
--- a/lib/parser/class_definition.rb
+++ b/lib/parser/class_definition.rb
@ -2,9 +2,14 @@ module Parser
  module ModuleDef
    include Parslet

+    rule(:class_field) { keyword_field >> field_def }
+
+    rule(:class_body) {
+      function_definition | class_field
+    }
    rule(:class_definition) do
-      keyword_class >> class_name >> (smaller >> class_name).maybe.as(:derived_name) >>
-      ( (keyword_end.absent? >> root_body).repeat()).as(:class_expressions) >> keyword_end
+      keyword_class >> class_name >> (str("<") >> space >> class_name).maybe.as(:derived_name) >>
+      ( (keyword_end.absent? >> class_body).repeat()).as(:class_statements) >> keyword_end
    end

  end