Commit 8318437

@@ -12,20 +12,12 @@ module Spandx
         rule(:eol) { whitespace? >> crlf.repeat }
         rule(:hyphen) { str('-') }
         rule(:lcurly) { str('{') }
-        rule(:major) { number }
-        rule(:major_minor) { (number >> dot >> number) }
-        rule(:major_minor_patch) { number >> dot >> number >> dot >> number }
         rule(:number) { digit.repeat }
-        rule(:pre_release) { hyphen >> (alpha | digit).repeat }
-        rule(:pre_release?) { pre_release.maybe }
         rule(:quote) { str('"') }
         rule(:rcurly) { str('}') }
         rule(:space) { match('\s') }
-        rule(:tilda_wacka) { str("~>") }
-        rule(:version) { number >> dot >> number >> dot >> number >> pre_release? }
         rule(:whitespace) { space.repeat }
         rule(:whitespace?) { whitespace.maybe }
-        rule(:greater_than_or_equal_to) { str('>=') }
 
         rule :attribute_name do
           alpha.repeat
@@ -39,34 +31,6 @@ module Spandx
           match('[0-9A-Za-z.~> ]').repeat
         end
 
-        rule(:version_constraint) do
-          pessimistic_version_constraint | greater_than_or_equal_to_version
-        end
-
-        rule :version_assignment do
-          str('version') >> whitespace >> assign >> whitespace >> quote >> version.as(:version) >> quote
-        end
-
-        rule :constraint_assignment do
-          str("constraints") >> whitespace >> assign >> whitespace >> quote >> version_constraint.as(:constraints) >> quote
-        end
-
-        rule(:pessimistic_version_constraint) do
-          tilda_wacka >> whitespace >> (
-            major_minor_patch |
-            major_minor |
-            major
-          )
-        end
-
-        rule(:greater_than_or_equal_to_version) do
-          greater_than_or_equal_to >> whitespace >> (
-            major_minor_patch |
-            major_minor |
-            major
-          )
-        end
-
         rule :argument do
           alpha.repeat.as(:name) >> whitespace >> assign >> whitespace >> quote >> value.as(:value) >> quote
         end
@@ -75,8 +39,12 @@ module Spandx
           (argument >> eol).repeat
         end
 
+        rule :block_body do
+          arguments.as(:arguments)
+        end
+
         rule :block do
-          (alpha.repeat).as(:type) >> identifier >> whitespace >> lcurly >> eol >> arguments.as(:arguments) >> rcurly >> eol
+          (alpha.repeat).as(:type) >> identifier >> whitespace >> lcurly >> eol >> block_body >> rcurly >> eol
         end
 
         rule :identifier do