alf-core 0.14.0 → 0.15.0

data/lib/{alf-algebra/alf → alf}/algebra/operator/page.rb

@@ -1,7 +1,10 @@
 module Alf
   module Algebra
     class Page
-      include Operator, Relational, Unary, WithOrdering
+      include Operator
+      include Relational
+      include Unary
+      include WithOrdering
 
       signature do |s|
         s.argument :ordering, Ordering, []
@@ -17,6 +20,13 @@ module Alf
         operand.keys
       end
 
+    private
+
+      def _type_check(options)
+        valid_ordering!(ordering, operand.attr_list)
+        type_check_error!("invalid page size `#{page_size}`")   unless page_size >= 0
+      end
+
     end # class Page
   end # module Algebra
 end # module Alf

data/lib/{alf-algebra/alf → alf}/algebra/operator/project.rb

@@ -1,7 +1,9 @@
 module Alf
   module Algebra
     class Project
-      include Operator, Relational, Unary
+      include Operator
+      include Relational
+      include Unary
 
       signature do |s|
         s.argument :attributes, AttrList, []
@@ -26,6 +28,12 @@ module Alf
         allbut ? heading.to_attr_list : attributes
       end
 
+    private
+
+      def _type_check(options)
+        no_unknown!(attributes - operand.attr_list)
+      end
+
     end # class Project
   end # module Algebra
 end # module Alf

data/lib/{alf-algebra/alf → alf}/algebra/operator/quota.rb

@@ -1,7 +1,10 @@
 module Alf
   module Algebra
     class Quota
-      include Operator, Relational, Unary, Experimental
+      include Operator
+      include Relational
+      include Unary
+      include Experimental
 
       signature do |s|
         s.argument :by,            AttrList, []
@@ -17,6 +20,14 @@ module Alf
         @keys ||= operand.keys
       end
 
+    private
+
+      def _type_check(options)
+        no_unknown!(by - operand.attr_list)
+        valid_ordering!(order, operand.attr_list)
+        no_name_clash!(operand.attr_list, summarization.to_attr_list)
+      end
+
     end # class Quota
   end # module Algebra
 end # module Alf

data/lib/{alf-algebra/alf → alf}/algebra/operator/rank.rb

@@ -1,7 +1,9 @@
 module Alf
   module Algebra
     class Rank
-      include Operator, Relational, Unary
+      include Operator
+      include Relational
+      include Unary
 
       signature do |s|
         s.argument :order, Ordering, []
@@ -15,7 +17,7 @@ module Alf
       def keys
         @keys ||= begin
           keys, selectors = operand.keys, order.to_attr_list
-          if keys.any?{|k| k.subsetOf?(selectors) }
+          if keys.any?{|k| k.subset_of?(selectors) }
             keys + [ AttrList[as] ]
           else
             keys
@@ -23,6 +25,13 @@ module Alf
         end
       end
 
+    private
+
+      def _type_check(options)
+        valid_ordering!(order, operand.attr_list)
+        no_name_clash!(operand.attr_list, AttrList[as])
+      end
+
     end # class Rank
   end # module Algebra
 end # module Alf

data/lib/{alf-algebra/alf → alf}/algebra/operator/rename.rb

@@ -1,7 +1,9 @@
 module Alf
   module Algebra
     class Rename
-      include Operator, Relational, Unary
+      include Operator
+      include Relational
+      include Unary
 
       signature do |s|
         s.argument :renaming, Renaming, {}
@@ -19,6 +21,13 @@ module Alf
         renaming.complete(operand.heading.to_attr_list)
       end
 
+    private
+
+      def _type_check(options)
+        no_unknown!(renaming.to_attr_list - operand.attr_list)
+        no_name_clash!(renaming.invert.to_attr_list, operand.attr_list)
+      end
+
     end # class Rename
   end # module Algebra
 end # module Alf

data/lib/{alf-algebra/alf → alf}/algebra/operator/restrict.rb

@@ -1,7 +1,9 @@
 module Alf
   module Algebra
     class Restrict
-      include Operator, Relational, Unary
+      include Operator
+      include Relational
+      include Unary
 
       signature do |s|
         s.argument :predicate, Predicate, Predicate.tautology
@@ -15,12 +17,20 @@ module Alf
         @keys ||= begin
           keys = operand.keys
           unless (cv = predicate.constant_variables).empty?
-            keys = keys.map{|k| k - cv}
+            keys = keys.map{|k| k - cv }
           end
           keys
         end
       end
 
+    private
+
+      def _type_check(options)
+        no_unknown!(predicate.free_variables - operand.attr_list)
+      rescue NotSupportedError => ex
+        raise ex if options[:strict]
+      end
+
     end # class Restrict
   end # module Algebra
 end # module Alf

data/lib/{alf-algebra/alf → alf}/algebra/operator/sort.rb

@@ -1,7 +1,9 @@
 module Alf
   module Algebra
     class Sort
-      include Operator, NonRelational, Unary
+      include Operator
+      include NonRelational
+      include Unary
 
       signature do |s|
         s.argument :ordering, Ordering, []
@@ -15,6 +17,12 @@ module Alf
         @keys ||= operand.keys
       end
 
+    private
+
+      def _type_check(options)
+        valid_ordering!(ordering, operand.attr_list)
+      end
+
     end # class Sort
   end # module Algebra
 end # module Alf

data/lib/{alf-algebra/alf → alf}/algebra/operator/summarize.rb

@@ -1,7 +1,9 @@
 module Alf
   module Algebra
     class Summarize
-      include Operator, Relational, Unary
+      include Operator
+      include Relational
+      include Unary
 
       signature do |s|
         s.argument :by,            AttrList, []
@@ -23,6 +25,13 @@ module Alf
         end
       end
 
+    private
+
+      def _type_check(options)
+        no_unknown!(by - operand.attr_list)
+        no_name_clash!(operand.attr_list, summarization.to_attr_list)
+      end
+
     end # class Summarize
   end # module Algebra
 end # module Alf

data/lib/{alf-algebra/alf → alf}/algebra/operator/ungroup.rb

@@ -1,7 +1,9 @@
 module Alf
   module Algebra
     class Ungroup
-      include Operator, Relational, Unary
+      include Operator
+      include Relational
+      include Unary
 
       signature do |s|
         s.argument :attribute, AttrName, :grouped
@@ -26,6 +28,14 @@ module Alf
         op_h[attribute].heading
       end
 
+      def _type_check(options)
+        ungrouped = operand.heading[attribute]
+        unless ungrouped.ancestors.include?(Relation)
+          type_check_error!("not a relation-valued attribute `#{attribute}` (#{ungrouped})")
+        end
+        no_name_clash!(operand.attr_list, ungrouped.heading.to_attr_list)
+      end
+
     end # class Ungroup
   end # module Algebra
 end # module Alf

data/lib/{alf-algebra/alf → alf}/algebra/operator/union.rb

@@ -1,7 +1,9 @@
 module Alf
   module Algebra
     class Union
-      include Operator, Relational, Binary
+      include Operator
+      include Relational
+      include Binary
 
       signature do |s|
       end
@@ -14,6 +16,12 @@ module Alf
         @keys ||= Keys[ heading.to_attr_list ]
       end
 
+    private
+
+      def _type_check(options)
+        same_heading!(left.heading, right.heading)
+      end
+
     end # class Union
   end # module Algebra
 end # module Alf

data/lib/{alf-algebra/alf → alf}/algebra/operator/unwrap.rb

@@ -1,7 +1,9 @@
 module Alf
   module Algebra
     class Unwrap
-      include Operator, Relational, Unary
+      include Operator
+      include Relational
+      include Unary
 
       signature do |s|
         s.argument :attribute, AttrName, :wrapped
@@ -18,6 +20,16 @@ module Alf
         operand.keys
       end
 
+    private
+
+      def _type_check(options)
+        ungrouped = operand.heading[attribute]
+        unless ungrouped.ancestors.include?(Tuple)
+          type_check_error!("not a tuple-valued attribute `#{attribute}` (#{ungrouped})")
+        end
+        no_name_clash!(operand.attr_list, ungrouped.heading.to_attr_list)
+      end
+
     end # class Unwrap
   end # module Algebra
 end # module Alf

data/lib/{alf-algebra/alf → alf}/algebra/operator/wrap.rb

@@ -1,7 +1,9 @@
 module Alf
   module Algebra
     class Wrap
-      include Operator, Relational, Unary
+      include Operator
+      include Relational
+      include Unary
 
       signature do |s|
         s.argument :attributes, AttrList, []
@@ -36,6 +38,13 @@ module Alf
         @stay_attrs ||= wrapped_heading.to_attr_list
       end
 
+    private
+
+      def _type_check(options)
+        no_unknown!(attributes - operand.attr_list)
+        no_name_clash!(operand.attr_list - attributes, AttrList[as])
+      end
+
     end # class Wrap
   end # module Algebra
 end # module Alf

data/lib/alf/algebra/shortcut.rb

@@ -0,0 +1,40 @@
+module Alf
+  module Algebra
+    module Shortcut
+
+      module DelegationMethods
+
+        def type_check(options = {})
+          expand.type_check(options = {})
+        end
+
+        def heading
+          expand.heading
+        end
+
+        def keys
+          expand.keys
+        end
+
+        Algebra::Operator.listen do |name, clazz|
+          define_method(name) do |*args|
+            operands, arguments = args[0...clazz.arity], args[clazz.arity..-1]
+            clazz.new(operands, *arguments)
+          end
+        end
+
+      end # module DelegationMethods
+
+      def self.included(mod)
+        super
+        mod.instance_eval{
+          include(Operator)
+          include(Relational)
+          include(DelegationMethods)
+        }
+      end
+
+    end # module Shortcut
+  end # module Algebra
+end # module Alf
+require_relative 'shortcut/allbut'

data/lib/alf/algebra/shortcut/allbut.rb

@@ -0,0 +1,25 @@
+module Alf
+  module Algebra
+    class Allbut
+      include Shortcut
+      include Unary
+
+      signature do |s|
+        s.argument :attributes, AttrList, []
+      end
+
+      def expand
+        project(operand, attributes, allbut: true)
+      end
+
+      def key_preserving?
+        expand.key_preserving?
+      end
+
+      def stay_attributes
+        expand.stay_attributes
+      end
+
+    end # class Allbut
+  end # module Algebra
+end # module Alf

data/lib/{alf-algebra/alf → alf}/algebra/support.rb

@@ -9,9 +9,10 @@ require_relative 'support/experimental'
 require_relative 'support/classification'
 require_relative 'support/signature'
 
+require_relative 'support/type_check'
+
 require_relative 'support/with_ordering'
 
 require_relative 'support/visitor'
 require_relative 'support/compiler'
 require_relative 'support/rewriter'
-require_relative 'support/to_dot'

data/lib/{alf-algebra/alf → alf}/algebra/support/rewriter.rb

@@ -19,6 +19,10 @@ module Alf
         expr
       end
 
+      def on_shortcut(expr, *args, &bl)
+        apply(expr.expand, *args, &bl)
+      end
+
       def on_missing(expr, *args, &bl)
         copy_and_apply(expr, *args, &bl)
       end

data/lib/{alf-algebra/alf → alf}/algebra/support/signature.rb

@@ -143,26 +143,25 @@ module Alf
       #     # => "(project operand, attributes:AttrList, {allbut: Boolean})"
       def to_lispy
         cmd  = operator.rubycase_name
-        oper = operator.nullary? ? "" :
-              (operator.unary? ? "operand" : "left, right")
+        oper = operator.nullary? ? "" : (operator.unary? ? "operand" : "left, right")
 
         args = arguments.map{|name,dom,_|
-          dom.to_s =~ /::([A-Za-z]+)$/
-          "#{name}:#{$1}"
+          dom = dom.to_s[/::([A-Za-z]+)$/, 1] || dom.to_s
+          "#{name}:#{dom}"
         }.join(", ")
         args = (args.empty? ? "#{oper}" : "#{oper}, #{args}").strip
 
         opts = options.map{|name,dom,_|
-          dom.to_s =~ /::([A-Za-z]+)$/
-          "#{name}: #{$1}"
+          dom = dom.to_s[/::([A-Za-z]+)$/, 1] || dom.to_s
+          "#{name}: #{dom}"
         }.join(', ')
         opts = opts.empty? ? "" : "{#{opts}}"
 
         argopt = [args, opts].select{|s| !s.empty?}.join(', ')
-        "(#{cmd} #{argopt}".strip + ")"
+        "#{cmd}(#{argopt}".strip + ")"
       end
 
-      private
+    private
 
       # @return the default options as a Hash
       def default_options