rfunk 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6579f662e130f4cdabcc91e46617cedb9a497ec6
-  data.tar.gz: 21584e48ad127ceb7f776f36da1a2d9b88cd3176
+  metadata.gz: 62eadf99b770f0a7b858ec63d74bbf43a2e0fcd9
+  data.tar.gz: 43c0275f0e81ab6802c9f7acf4b37d6c05254800
 SHA512:
-  metadata.gz: 253bb8ffe3a96eedad4d3006323e0d8a6d2d57a5c07510e60a751f9d4d79c853ebb9229fb5652580cdc95037e08f57539c8614c5d1958fd1434ca68019e7f937
-  data.tar.gz: 433b260802c1c656791119b5812e91d191b7d34578abc4728de7b6a8dff3628cf543f274e5fb3d9e4c10e5fa162f050d89a418679be99c5f56af1c241e06391b
+  metadata.gz: 7c8b2e6b5c23fee2d9359aa0a60e38ed798cab3992eb5708a569d90b8fc788c1a689ec490c5228bf835367b139ce60d67589d0927b1a03ae91d96b6a19f550f9
+  data.tar.gz: b7b1866df97a5e3ba8b241dc1822460516a507ae007f139e8d31a759f93a1f91eeacb35fb443432a189037f183bef6d664042e7fe4d66ff839d2e9d76954c296

data/lib/rfunk/attribute/attribute.rb

@@ -31,7 +31,7 @@ module RFunk
     end
 
     def set_variable(attribute, key, value)
-      ErrorChecking.new.raise_expected_type(key, value, attribute.type)
+      ErrorChecking.new.raise_expected_attribute_type(key, value, attribute.type)
       self.instance_variable_set(variable_name(key), value)
     end
 

data/lib/rfunk/attribute/attribute_definition.rb

@@ -8,7 +8,7 @@ module RFunk
 
       define_method(name) { |value = nil|
         if value
-          ErrorChecking.new.raise_expected_type(name, value, type)
+          ErrorChecking.new.raise_expected_attribute_type(name, value, type)
           Immutable.new.create(instance: self,
                                variable_name: variable_name(name),
                                value: value)

data/lib/rfunk/attribute/attribute_function.rb

@@ -1,23 +1,21 @@
 module RFunk
   module AttributeFunction
     def fun(definition, &block)
-      method_definition = method_definition(definition)
+      function_definition = function_definition(definition)
+      lambda = -> (*args) { Function.new(self, function_definition, &block).execute(*args) }
 
-      lambda = lambda { |*args|
-        Function.new(self, method_definition, &block).execute(*args)
-      }
-
-      define_method method_definition.value(0).value, &lambda
+      define_method function_definition.value(0).value, &lambda
     end
 
     [:fn, :func, :defn].each { |m| alias_method m, :fun }
 
     private
 
-    def method_definition(definition)
+    def function_definition(definition)
       case definition
       when Hash
-        Tuple(definition.keys.first, definition.values.first)
+        return_type = TypeAnnotation.new(definition.values.first.to_s)
+        Tuple(definition.keys.first, return_type)
       else
         Tuple(definition, None())
       end

data/lib/rfunk/attribute/error_checking.rb

@@ -8,10 +8,14 @@ module RFunk
       raise_return_type_with_message name, value, type, 'return'
     end
 
-    def raise_expected_type(name, value, type)
+    def raise_expected_attribute_type(name, value, type)
       raise_return_type_with_message name, value, type, 'attribute'
     end
 
+    def raise_expected_parameter_type(name, value, type)
+      raise_return_type_with_message name, value, type, 'parameter'
+    end
+
     def raise_not_found(key, attributes)
       unless attributes.key?(key)
         message = "Attribute with name '#{key}' does not exist. The only available attributes are '#{attributes.keys}'"

data/lib/rfunk/attribute/function.rb

@@ -2,9 +2,9 @@ module RFunk
   class Function
     attr_reader :this
 
-    def initialize(this, method_definition, &block)
+    def initialize(this, function_definition, &block)
       @this = this
-      @method_definition = method_definition
+      @function_definition = function_definition
       @block = block
       @variables = {}
     end
@@ -43,7 +43,8 @@ module RFunk
     end
 
     def execute(*args)
-      result = instance_exec(*args, &block)
+      validate_parameter_types *args
+      return_value = instance_exec(*args, &block)
 
       if body_block
         if pre_block
@@ -62,8 +63,8 @@ module RFunk
           validate_return_type(body)
         }
       else
-        validate_return_type(result)
-        Option(result)
+        validate_return_type(return_value)
+        Option(return_value)
       end
     end
 
@@ -73,17 +74,33 @@ module RFunk
 
     private
 
-    attr_reader :block, :pre_block, :post_block, :body_block, :method_definition
+    attr_reader :block, :pre_block, :post_block, :body_block, :function_definition
     attr_accessor :variables
 
     def error_checking
-      @error_checking ||= ErrorChecking.new
+      Lazy(-> { ErrorChecking.new }).value
     end
 
-    def validate_return_type(result)
-      error_checking.raise_expected_return_type method_definition.value(0).value,
-                                                result,
-                                                method_definition.value(1)
+    def validate_return_type(return_value)
+      error_checking.raise_expected_return_type(function_name.value,
+                                                return_value,
+                                                type_annotation.return)
+    end
+
+    def validate_parameter_types(*args)
+      values = args.zip(type_annotation.parameters)
+      values.each_with_index { |v, i|
+        tuple = Tuple(*v)
+        error_checking.raise_expected_parameter_type(i + 1, tuple.value(0), tuple.value(1))
+      }
+    end
+
+    def function_name
+      function_definition.value(0)
+    end
+
+    def type_annotation
+      function_definition.value(1)
     end
   end
 end

data/lib/rfunk/attribute/type_annotation.rb

@@ -0,0 +1,25 @@
+module RFunk
+  class TypeAnnotation
+    attr_reader :parameters, :return
+
+    def initialize(annotation)
+      case Option(annotation)
+      when Some
+        @annotation = annotation.split('->')
+        @parameters = if @annotation.count == 2
+                        @annotation[0].split(',').map { |p| Object.const_get(p.strip) }
+                      else
+                        []
+                      end
+        @return = if @annotation.count == 2
+                    Object.const_get(@annotation[1].strip)
+                  else
+                    Object.const_get(@annotation[0].strip)
+                  end
+      else
+        @parameters = []
+        @return = None()
+      end
+    end
+  end
+end

data/lib/rfunk/version.rb

@@ -1,3 +1,3 @@
 module RFunk
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

data/lib/rfunk.rb

@@ -17,6 +17,7 @@ require 'rfunk/attribute/function'
 require 'rfunk/attribute/attribute_definition'
 require 'rfunk/attribute/attribute_function'
 require 'rfunk/attribute/attribute'
+require 'rfunk/attribute/type_annotation'
 require 'rfunk/maybe/option'
 require 'rfunk/maybe/none'
 require 'rfunk/maybe/some'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rfunk
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Alex Falkowski
@@ -115,6 +115,7 @@ files:
 - lib/rfunk/attribute/not_found_error.rb
 - lib/rfunk/attribute/post_condition_error.rb
 - lib/rfunk/attribute/pre_condition_error.rb
+- lib/rfunk/attribute/type_annotation.rb
 - lib/rfunk/either/either.rb
 - lib/rfunk/either/failure.rb
 - lib/rfunk/either/success.rb