alf-core 0.14.0 → 0.15.0

data/lib/{alf-database/alf → alf}/database/options.rb

@@ -8,11 +8,8 @@ module Alf
       # What viewpoint to use by default?
       option :viewpoint, Module, Viewpoint::NATIVE
 
-      # Path to a folder where debugging graphs can be found
-      option :debug_folder, Path, nil
-
-      # A lambda that names .dot files
-      option :debug_naming, Proc, lambda{|x| Time.now.strftime("%Y%m%d-%H%M%S-%6N") }
+      # What parser (class) to use for parsing expressions
+      option :parser, Class, Lang::Parser::Lispy
 
       # Where migrations are located
       option :migrations_folder, Path, nil

data/lib/{alf-core → alf}/dsl.rb

@@ -7,16 +7,16 @@ module Alf
     DEE      = Alf::Relation::DEE
 
     def Relation(*args, &bl)
-      Alf::Relation(*args, &bl)
+      ::Alf::Relation(*args, &bl)
     end
 
     def Tuple(*args, &bl)
-      Alf::Tuple(*args, &bl)
+      ::Alf::Tuple(*args, &bl)
     end
 
     def Heading(*args, &bl)
-      Alf::Heading(*args, &bl)
+      ::Alf::Heading(*args, &bl)
     end
 
   end # module Dsl
-end # module Alf
+end # module Alf

data/lib/{alf-engine/alf → alf}/engine.rb

@@ -36,5 +36,3 @@ require_relative 'engine/ungroup'
 require_relative 'engine/infer_heading'
 require_relative 'engine/type_safe'
 require_relative 'engine/to_array'
-require_relative 'engine/compiler'
-require_relative 'engine/to_dot'

data/lib/{alf-engine/alf → alf}/engine/aggregate.rb

@@ -27,8 +27,8 @@ module Alf
       attr_reader :summarization
 
       # Creates an Aggregate instance
-      def initialize(operand, summarization, expr = nil)
-        super(expr)
+      def initialize(operand, summarization, expr = nil, compiler = nil)
+        super(expr, compiler)
         @operand = operand
         @summarization = summarization
       end
@@ -42,6 +42,10 @@ module Alf
         yield @summarization.finalize(agg)
       end
 
+      def arguments
+        [ summarization ]
+      end
+
     end # class Aggregate
   end # module Engine
 end # module Alf

data/lib/{alf-engine/alf → alf}/engine/autonum.rb

@@ -26,8 +26,8 @@ module Alf
       attr_reader :as
 
       # Creates an Autonum instance
-      def initialize(operand, as, expr = nil)
-        super(expr)
+      def initialize(operand, as, expr = nil, compiler = nil)
+        super(expr, compiler)
         @operand = operand
         @as = as
       end
@@ -41,6 +41,10 @@ module Alf
         end
       end
 
+      def arguments
+        [ as ]
+      end
+
     end # class Autonum
   end # module Engine
 end # module Alf

data/lib/{alf-engine/alf → alf}/engine/clip.rb

@@ -35,8 +35,8 @@ module Alf
       attr_reader :allbut
 
       # Creates an Clip instance
-      def initialize(operand, attributes, allbut, expr = nil)
-        super(expr)
+      def initialize(operand, attributes, allbut, expr = nil, compiler = nil)
+        super(expr, compiler)
         @operand = operand
         @attributes = attributes
         @allbut = allbut
@@ -49,6 +49,14 @@ module Alf
         end
       end
 
+      def arguments
+        [attributes]
+      end
+
+      def options
+        {allbut: allbut}
+      end
+
     end # class Clip
   end # module Engine
 end # module Alf

data/lib/{alf-engine/alf → alf}/engine/coerce.rb

@@ -27,8 +27,8 @@ module Alf
       attr_reader :coercions
 
       # Creates an Coerce instance
-      def initialize(operand, coercions, expr = nil)
-        super(expr)
+      def initialize(operand, coercions, expr = nil, compiler = nil)
+        super(expr, compiler)
         @operand = operand
         @coercions = coercions
       end
@@ -42,6 +42,10 @@ module Alf
         end
       end
 
+      def arguments
+        [ coercions ]
+      end
+
     end # class Coerce
   end # module Engine
 end # module Alf

data/lib/alf/engine/cog.rb

@@ -0,0 +1,58 @@
+module Alf
+  module Engine
+    module Cog
+      include Compiler::Cog
+      include Enumerable
+
+      EMPTY_CHILDREN = [].freeze
+
+      EMPTY_OPTIONS = {}.freeze
+
+      def each(&bl)
+        return to_enum unless block_given?
+        _each(&bl)
+      end
+
+      def children
+        return operands  if respond_to?(:operands)
+        return [operand] if respond_to?(:operand)
+        EMPTY_CHILDREN
+      end
+
+      def to_s
+        label = ""
+        label << self.class.name.to_s[/Engine::(.*?)$/, 1].to_s
+        label << " ..."
+        unless (args = arguments).empty?
+          label << ", "
+          label << args.map{|arg| Support.to_lispy(arg, "[unsupported]") }.join(', ')
+        end
+        unless (opts = options).empty?
+          label << ", "
+          label << Support.to_lispy(options, "[unsupported]")
+        end
+        label
+      end
+
+      def arguments
+        EMPTY_CHILDREN
+      end
+
+      def options
+        EMPTY_OPTIONS
+      end
+
+    protected
+
+      def tuple_scope(tuple = nil)
+        Support::TupleScope.new tuple, []
+      end
+
+      def symbolize(tuple)
+        tuple = Support.symbolize_keys(tuple) if tuple.keys.any?{|k| String===k }
+        tuple
+      end
+
+    end # module Cog
+  end # module Engine
+end # module Alf

data/lib/{alf-engine/alf → alf}/engine/compact.rb

@@ -10,8 +10,8 @@ module Alf
       attr_reader :operand
 
       # Creates a Compact instance
-      def initialize(operand, expr = nil)
-        super(expr)
+      def initialize(operand, expr = nil, compiler = nil)
+        super(expr, compiler)
         @operand = operand
       end
 

data/lib/{alf-engine/alf → alf}/engine/compact/set.rb

@@ -10,8 +10,8 @@ module Alf
       attr_reader :operand
 
       # Creates a Compact::Set instance
-      def initialize(operand, expr = nil)
-        super(expr)
+      def initialize(operand, expr = nil, compiler = nil)
+        super(expr, compiler)
         @operand = operand
       end
 

data/lib/{alf-engine/alf → alf}/engine/compact/uniq.rb

@@ -10,8 +10,8 @@ module Alf
       attr_reader :operand
 
       # Creates a Compact::Uniq instance
-      def initialize(operand, expr = nil)
-        super(expr)
+      def initialize(operand, expr = nil, compiler = nil)
+        super(expr, compiler)
         @operand = operand
       end
 

data/lib/{alf-engine/alf → alf}/engine/concat.rb

@@ -10,8 +10,8 @@ module Alf
       attr_reader :operands
 
       # Creates a Concat instance
-      def initialize(operands, expr = nil)
-        super(expr)
+      def initialize(operands, expr = nil, compiler = nil)
+        super(expr, compiler)
         @operands = operands
       end
 

data/lib/{alf-engine/alf → alf}/engine/defaults.rb

@@ -25,8 +25,8 @@ module Alf
       attr_reader :defaults
 
       # Creates a Defaults instance
-      def initialize(operand, defaults, expr = nil)
-        super(expr)
+      def initialize(operand, defaults, expr = nil, compiler = nil)
+        super(expr, compiler)
         @operand = operand
         @defaults = defaults
       end
@@ -40,6 +40,10 @@ module Alf
         end
       end
 
+      def arguments
+        [ defaults ]
+      end
+
     end # class Defaults
   end # module Engine
 end # module Alf

data/lib/{alf-engine/alf → alf}/engine/filter.rb

@@ -24,8 +24,8 @@ module Alf
       attr_reader :predicate
 
       # Creates a Filter instance
-      def initialize(operand, predicate, expr = nil)
-        super(expr)
+      def initialize(operand, predicate, expr = nil, compiler = nil)
+        super(expr, compiler)
         @operand = operand
         @predicate = predicate
       end
@@ -34,11 +34,15 @@ module Alf
       def _each
         scope = tuple_scope
         operand.each do |tuple|
-          t, c = scope.__set_tuple(tuple), expr && expr.connection
-          yield(tuple) if @predicate.evaluate(t, c)
+          t = scope.__set_tuple(tuple)
+          yield(tuple) if @predicate.evaluate(t)
         end
       end
 
+      def arguments
+        [ predicate ]
+      end
+
     end # class Filter
   end # module Engine
 end # module Alf

data/lib/{alf-engine/alf → alf}/engine/generator.rb

@@ -29,8 +29,8 @@ module Alf
       attr_reader :count
 
       # Creates an Generator instance
-      def initialize(as, offset, step, count, expr = nil)
-        super(expr)
+      def initialize(as, offset, step, count, expr = nil, compiler = nil)
+        super(expr, compiler)
         @as = as
         @offset = offset
         @step = step
@@ -46,6 +46,10 @@ module Alf
         end
       end
 
+      def arguments
+        [ offset, step, count ]
+      end
+
     end # class Generator
   end # module Engine
 end # module Alf

data/lib/alf/engine/group.rb

@@ -0,0 +1,7 @@
+module Alf
+  module Engine
+    module Group
+    end
+  end
+end
+require_relative 'group/hash'

data/lib/{alf-engine/alf → alf}/engine/group/hash.rb

@@ -4,6 +4,7 @@ module Alf
     # Provides hash-based grouping.
     #
     class Group::Hash
+      include Group
       include Cog
 
       # @return [Enumerable] The operand
@@ -19,8 +20,8 @@ module Alf
       attr_reader :allbut
 
       # Creates a Group::Hash instance
-      def initialize(operand, attributes, as, allbut, expr = nil)
-        super(expr)
+      def initialize(operand, attributes, as, allbut, expr = nil, compiler = nil)
+        super(expr, compiler)
         @operand = operand
         @attributes = attributes
         @as = as
@@ -37,6 +38,14 @@ module Alf
         end
       end
 
+      def arguments
+        [ attributes, as ]
+      end
+
+      def options
+        {allbut: allbut}
+      end
+
     end # class Group::Hash
   end # module Engine
 end # module Alf

data/lib/{alf-engine/alf → alf}/engine/hierarchize.rb

@@ -22,8 +22,8 @@ module Alf
       attr_reader :tuple_type
 
       # Creates a Hierarchize instance
-      def initialize(operand, id, parent, children, expr = nil)
-        super(expr)
+      def initialize(operand, id, parent, children, expr = nil, compiler = nil)
+        super(expr, compiler)
         @operand = operand
         @id = id
         @parent = parent
@@ -59,6 +59,10 @@ module Alf
         end
       end
 
+      def arguments
+        [ id, parent, children ]
+      end
+
       def to_relation
         tuples = to_set
         relation_type.new(tuples)

data/lib/{alf-engine/alf → alf}/engine/infer_heading.rb

@@ -9,8 +9,8 @@ module Alf
       # @return [Enumerable] The operand
       attr_reader :operand
 
-      def initialize(operand, expr = nil)
-        super(expr)
+      def initialize(operand, expr = nil, compiler = nil)
+        super(expr, compiler)
         @operand = operand
       end
 

data/lib/{alf-engine/alf → alf}/engine/join/hash.rb

@@ -14,8 +14,8 @@ module Alf
       attr_reader :right
 
       # Creates a Join::Hash instance
-      def initialize(left, right, expr = nil)
-        super(expr)
+      def initialize(left, right, expr = nil, compiler = nil)
+        super(expr, compiler)
         @left = left
         @right = right
       end

data/lib/{alf-engine/alf → alf}/engine/leaf.rb

@@ -10,8 +10,8 @@ module Alf
       attr_reader :operand
 
       # Creates a Concat instance
-      def initialize(operand, expr = nil)
-        super(expr)
+      def initialize(operand, expr = nil, compiler = nil)
+        super(expr, compiler)
         @operand = operand
       end
 
@@ -21,7 +21,11 @@ module Alf
       end
 
       def to_s
-        "Engine::Leaf(#{operand})"
+        "Leaf"
+      end
+
+      def inspect
+        "Engine::Leaf(#{operand.inspect})"
       end
 
     end # class Leaf

data/lib/{alf-engine/alf → alf}/engine/materialize.rb

@@ -1,4 +1,8 @@
-module Alf::Engine::Materialize
+module Alf
+  module Engine
+    module Materialize
+    end
+  end
 end
 require_relative 'materialize/hash'
 require_relative 'materialize/array'

data/lib/{alf-engine/alf → alf}/engine/materialize/array.rb

@@ -28,6 +28,7 @@ module Alf
     #          ]
     #
     class Materialize::Array
+      include Materialize
       include Cog
 
       # @return [Enumerable] The operand
@@ -37,8 +38,8 @@ module Alf
       attr_reader :ordering
 
       # Creates a Materialize::Array instance
-      def initialize(operand, ordering = nil, expr = nil)
-        super(expr)
+      def initialize(operand, ordering = nil, expr = nil, compiler = nil)
+        super(expr, compiler)
         @operand = operand
         @ordering = ordering
         @materialized = nil