alf-core 0.14.0 → 0.15.0

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

@@ -2,6 +2,7 @@ module Alf
   module Algebra
     module Operator
       include Operand
+      include TypeCheck
 
     ### Class-based tools
 
@@ -48,18 +49,42 @@ module Alf
         signature.parse_args(args, self)
       end
 
-      # Binds to a connection
-      def bind(connection)
-        super{|c| c.operands = operands.map{|op| op.bind(connection) } }
-      end
-
       # @return [Signature] the operator signature.
       def signature
         self.class.signature
       end
 
+    ### heading, keys, and others
+
+      def type_check(options = {strict: false})
+        operands.each{|op| op.type_check(options) }
+        _type_check(options)
+        heading
+      end
+
     ### -> to_xxx
 
+      def to_cog(plan = nil)
+        plan ? plan.compile(self) : Alf::Compiler::Default.new.call(self)
+      end
+
+      def to_s
+        label = ""
+        label << self.class.rubycase_name.to_s
+        label << "(..."
+        datasets, arguments, options = signature.collect_on(self)
+        arguments.each_with_index do |arg,i|
+          label << ", "
+          label << Alf::Support.to_lispy(arg, "[native]")
+        end
+        unless options.nil? or options.empty?
+          label << ", "
+          label << Alf::Support.to_lispy(options, "[native]")
+        end
+        label << ")"
+        label
+      end
+
       def to_lispy
         cmdname  = self.class.rubycase_name
         oper, args, opts = signature.collect_on(self)
@@ -67,7 +92,6 @@ module Alf
         args = args.map{|arg| Support.to_lispy(arg) }
         "#{cmdname}(#{args.join(', ')})"
       end
-      alias :to_s :to_lispy
 
       def to_relvar
         Relvar::Virtual.new(self)
@@ -86,16 +110,22 @@ module Alf
         bl.nil? ? super : super.tap(&bl)
       end
 
+      def hash
+        @hash ||= [ self.class,
+                    operands,
+                    signature.collect_on(self) ].hash
+      end
+
       def ==(other)
-        (other.object_id == self.object_id) ||
-        ((other.class == self.class) &&
-         (other.operands == self.operands) &&
-         (other.signature.collect_on(self) == self.signature.collect_on(self)))
+        super || ((other.class == self.class) &&
+                  (other.signature.collect_on(other) == self.signature.collect_on(self)))
       end
+      alias :eql? :==
 
     protected
 
       def clean_computed_attributes!
+        @hash = nil
         @heading = nil
         @common_heading = nil
         @common_attributes = nil
@@ -111,7 +141,6 @@ require_relative 'operator/compact'
 require_relative 'operator/sort'
 require_relative 'operator/clip'
 require_relative 'operator/coerce'
-require_relative 'operator/type_safe'
 require_relative 'operator/generator'
 
 require_relative 'operator/extend'
@@ -134,4 +163,3 @@ require_relative 'operator/summarize'
 require_relative 'operator/rank'
 require_relative 'operator/page'
 require_relative 'operator/quota'
-require_relative 'operator/infer_heading'

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

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

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

@@ -1,7 +1,9 @@
 module Alf
   module Algebra
     class Clip
-      include Operator, NonRelational, Unary
+      include Operator
+      include NonRelational
+      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 Clip
   end # module Algebra
 end # module Alf

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

@@ -1,7 +1,9 @@
 module Alf
   module Algebra
     class Coerce
-      include Operator, NonRelational, Unary
+      include Operator
+      include NonRelational
+      include Unary
 
       signature do |s|
         s.argument :coercions, Heading, {}
@@ -15,6 +17,12 @@ module Alf
         @keys ||= operand.keys
       end
 
+    private
+
+      def _type_check(options)
+        no_unknown!(coercions.to_attr_list - operand.attr_list)
+      end
+
     end # class Coerce
   end # module Algebra
 end # module Alf

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

@@ -1,7 +1,9 @@
 module Alf
   module Algebra
     class Compact
-      include Operator, NonRelational, Unary
+      include Operator
+      include NonRelational
+      include Unary
 
       signature do |s|
       end
@@ -14,6 +16,11 @@ module Alf
         @keys ||= operand.keys.if_empty{ Keys[ heading.to_attr_list ] }
       end
 
+    private
+
+      def _type_check(options)
+      end
+
     end # class Compact
   end # module Algebra
 end # module Alf

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

@@ -1,7 +1,9 @@
 module Alf
   module Algebra
     class Defaults
-      include Operator, NonRelational, Unary
+      include Operator
+      include NonRelational
+      include Unary
 
       signature do |s|
         s.argument :defaults, TupleComputation, {}
@@ -19,6 +21,11 @@ module Alf
         @keys ||= operand.keys
       end
 
+    private
+
+      def _type_check(options)
+      end
+
     end # class Defaults
   end # module Algebra
 end # module Alf

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

@@ -1,7 +1,9 @@
 module Alf
   module Algebra
     class Extend
-      include Operator, Relational, Unary
+      include Operator
+      include Relational
+      include Unary
 
       signature do |s|
         s.argument :ext, TupleComputation, {}
@@ -18,6 +20,12 @@ module Alf
         end
       end
 
+    private
+
+      def _type_check(options)
+        no_name_clash!(operand.attr_list, ext.to_attr_list)
+      end
+
     end # class Extend
   end # module Algebra
 end # module Alf

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

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

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

@@ -1,7 +1,9 @@
 module Alf
   module Algebra
     class Generator
-      include Operator, NonRelational, Nullary
+      include Operator
+      include NonRelational
+      include Nullary
 
       signature do |s|
         s.argument :size, Size, 10
@@ -16,6 +18,11 @@ module Alf
         @keys ||= Keys[ [as] ]
       end
 
+    private
+
+      def _type_check(options)
+      end
+
     end # class Generator
   end # module Algebra
 end # module Alf

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

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

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

@@ -17,6 +17,14 @@ module Alf
         operand.keys
       end
 
+    private
+
+      def _type_check(options)
+        no_unknown!(id - operand.attr_list)
+        no_unknown!(parent - operand.attr_list)
+        no_name_clash!(operand.attr_list, AttrList[as])
+      end
+
     end # class Hierarchize
   end # module Algebra
 end # module Alf

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

@@ -1,7 +1,9 @@
 module Alf
   module Algebra
     class Intersect
-      include Operator, Relational, Binary
+      include Operator
+      include Relational
+      include Binary
 
       signature do |s|
       end
@@ -19,6 +21,12 @@ module Alf
         end
       end
 
+    private
+
+      def _type_check(options)
+        same_heading!(left.heading, right.heading)
+      end
+
     end # class Intersect
   end # module Algebra
 end # module Alf

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

@@ -1,7 +1,9 @@
 module Alf
   module Algebra
     class Join
-      include Operator, Relational, Binary
+      include Operator
+      include Relational
+      include Binary
 
       signature do |s|
       end
@@ -22,6 +24,12 @@ module Alf
         end
       end
 
+    private
+
+      def _type_check(options)
+        joinable_headings!(left.heading, right.heading, options)
+      end
+
     end # class Join
   end # module Algebra
 end # module Alf

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

@@ -1,7 +1,9 @@
 module Alf
   module Algebra
     class Matching
-      include Operator, Relational, Binary
+      include Operator
+      include Relational
+      include Binary
 
       signature do |s|
       end
@@ -11,7 +13,13 @@ module Alf
       end
 
       def keys
-        @keys ||= (left.keys + right.keys.select{|k| k.subset?(common_attributes) })
+        @keys ||= left.keys
+      end
+
+    private
+
+      def _type_check(options)
+        joinable_headings!(left.heading, right.heading, options)
       end
 
     end # class Matching

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

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

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

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