thefox-ext 2.0.0.pre.rc.2 → 3.0.0.pre.rc.2

data/lib/thefox-ext/range/lexer/scope.rb

@@ -3,6 +3,263 @@ module TheFox
 module Range
 module Lexer
   class Scope < Base
+    def initialize(items = nil, parent_scope = nil, level = 0)
+      super()
+
+      @item_collection = Collection.new(items)
+      @parent_scope = parent_scope
+      @level = level
+      @ref_item = nil
+
+      # puts '%s-> Scope(#%s).initialize(p=%s lev=%d)'.colorize(:red) % [' ' * (@level * 2), @instance_id, @parent_scope.inspect, @level]
+    end
+
+    # :nocov:
+    def name()
+      'Scope(#%s)' % [@instance_id]
+    end
+    def inspect()
+      'Scope(#%s len=%d)' % [@instance_id, @item_collection.length]
+    end
+    # :nocov:
+
+    def push(item)
+      # puts '%s-> %s.push(%s) -> PS=%s PRI=%s'.colorize(:green) % [' ' * (@level * 2),
+      #   inspect,
+      #   item.inspect,
+      #   @parent_scope.inspect,
+      #   @parent_scope.ref_item.inspect,
+      # ]
+      @item_collection.push(item)
+    end
+
+    def items()
+      @item_collection.items
+    end
+
+    def curr()
+      @item_collection.curr
+    end
+
+    def prev()
+      @item_collection.prev
+    end
+
+    def parent_scope()
+      @parent_scope
+    end
+    def parent_scope=(parent_scope)
+      @parent_scope = parent_scope
+    end
+
+    def ref_item()
+      @ref_item
+    end
+    def ref_item=(ref_item)
+      # puts '%s--> Set Ref Item: %s'.colorize(:green) % [' ' * (@level * 2), inspect]
+      ref_item.is_ref_item = true
+      @ref_item = ref_item
+    end
+
+    def resolve()
+      # puts '-> %s.resolve(%d)' % [self.inspect, @level]
+
+      # puts '%s-> SL1: %s P=%s' % [' ' * (@level * 2), inspect, @parent_item.inspect]
+
+      scopes = Collection.new([Scope.new(nil, self, @level + 1)])
+      block_stack = Collection.new()
+      parent_item = nil
+      @item_collection.items.each do |item|
+        # puts '%s-> SL1 Item: %s' % [' ' * (@level * 2), item.inspect]
+
+        push_to_scope = false
+
+        case item
+        when Separator
+          if block_stack.length == 0
+            scopes.push(Scope.new(nil, self, @level + 1))
+          else
+            push_to_scope = true
+          end
+        when BlockDown
+          if block_stack.length == 0
+            # puts '%s--> BlockDown: Curr=%s'.colorize(:green) % [' ' * (@level * 2),
+            #   scopes.curr.curr.inspect,
+            # ]
+
+            prev_item = scopes.curr.curr
+
+            scopes.push(Scope.new(nil, self, @level + 1))
+            # scopes.curr.ref_item = item.prev_item
+            scopes.curr.ref_item = prev_item
+
+            # puts '%s--> BlockDown: PrevItem=%s'.colorize(:green) % [' ' * (@level * 2),
+            #   scopes.curr.ref_item.inspect,
+            # ]
+          else
+            push_to_scope = true
+          end
+
+          # Block Stack
+          block_stack.push(item)
+        when BlockUp
+          block_stack.pop
+
+          prev_ref_item = scopes.curr.ref_item
+          # puts '-> BlockUp: %s' % [prev_ref_item.inspect]
+
+          # TODO: THIS!!!!
+          scopes.push(Scope.new(nil, self, @level + 1))
+          scopes.curr.ref_item = prev_ref_item
+        else
+          push_to_scope = true
+        end # case item
+
+        if push_to_scope
+          # puts '%s--> Push Item: %s PS=%s PI=%s RI=%s,%s' % [' ' * (@level * 2),
+          #   item.inspect,
+          #   scopes.curr.parent_scope.inspect,
+          #   scopes.curr.parent_item.inspect,
+          #   @ref_item.inspect,
+          #   scopes.curr.ref_item.inspect,
+          # ]
+          scopes.curr.push(item)
+          scopes.curr.curr.parent_item = self
+          # puts '%s--> Pushed Item: %s' % [' ' * (@level * 2), item.inspect]
+        end
+      end # @item_collection.items
+
+      # puts
+      # puts '%s-> Scopes: %s'.colorize(:blue) % [' ' * (@level * 2), scopes.inspect]
+      # scopes.items.each do |scope|
+      #   puts scope.inspect.colorize(:blue)
+      #   puts scope.items.map{ |i| i.inspect }.to_s.colorize(:blue)
+      # end
+
+      if scopes.length > 1
+        resolved = []
+        scopes.items.each do |scope|
+          resolved.push(scope.resolve)
+        end
+        resolved
+      else
+        # puts
+        # puts '%s-> SL1 Items' % [' ' * (@level * 2)]
+        # pp scopes.curr.items.map{ |item| item.inspect }
+
+        # puts '%s-> SL2 ' % [' ' * (@level * 2)]
+        item_collection1 = Collection.new
+        scopes.curr.items.each do |item|
+          # puts '%s-> SL2 Item: %s (P=%s)' % [
+          #   ' ' * (@level * 2),
+          #   item.inspect,
+          #   item.parent_item.inspect,
+          # ]
+
+          case item
+          when Number
+            # puts '--> Its %s' % [item.inspect]
+            if item.next_item.is_a?(Range) || item.prev_item.is_a?(Range)
+              # Skip Range
+              # puts '--> Skip Range'
+            elsif item.prev_item.is_a?(Interval)
+              # Skip Interval
+              # puts '%s--> Skip Interval' % [' ' * (@level * 2)]
+              # item.prev_item.next_item = nil
+              # item.parent_item = item.prev_item
+              # item.prev_item = nil
+              # item.next_item = nil
+            elsif item.next_item.is_a?(Operator)
+              # Skip Operator
+              # puts '--> Skip Operator'
+            elsif item.has_children
+              # Skip
+              # puts '--> Skip Has Children'
+            elsif item.is_ref_item
+              # puts '--> Skip Ref Item'
+            else
+              # puts '--> Push'
+              # puts '--> Push: %s' % [item.inspect]
+              item_collection1.push(item)
+            end
+          when Range
+            if item.prev_item.is_a?(Number) && item.next_item.is_a?(Number)
+              # puts '--> Range normal'
+              item_collection1.push(item)
+              item_collection1.curr.left_item = item.prev_item
+              item_collection1.curr.right_item = item.next_item
+
+              # 1-10/3
+              # item.prev_item                       Number
+              # item                                 Range
+              # item.next_item                       Number
+              # item.next_item.next_item             Interval
+              # item.next_item.next_item.next_item   Number
+
+              interval_item = item.next_item.next_item
+              if interval_item.is_a?(Interval)
+                item_collection1.curr.interval = interval_item
+                item_collection1.curr.interval.number = item.next_item.next_item.next_item
+                item_collection1.curr.interval.number.parent_item = item_collection1.curr.interval
+              end
+            else
+              raise 'Invalid Range: %s %s' % [
+                item.prev_item.inspect,
+                item.next_item.inspect,
+              ]
+            end
+          when Interval
+            # Skip
+          when Operator
+            if item_collection1.curr.is_a?(Range)
+              # puts '%s-> Operator, Curr Range'.colorize(:cyan) % [' ' * (@level * 2)]
+
+              if item_collection1.curr.right_item.is_a?(Number)
+                item_collection1.curr.right_item.inc
+              end
+            elsif item.prev_item.is_a?(Number)
+              # puts '%s-> Operator, Number'.colorize(:cyan) % [' ' * (@level * 2)]
+
+              item_collection1.push(Range.new(item.symbole))
+              item_collection1.curr.left_item = item.prev_item
+              item_collection1.curr.right_item = item.prev_item
+              item_collection1.curr.right_item.inc
+            elsif item.prev_item.is_a?(Operator)
+              # puts '%s-> Operator, Prev Operator'.colorize(:cyan) % [' ' * (@level * 2)]
+
+              if item_collection1.curr.is_a?(Range)
+                if item_collection1.curr.right_item.is_a?(Number)
+                  item_collection1.curr.right_item.inc
+                end
+              end
+            # else
+            #   puts '%s-> Operator ELSE: %s' % [' ' * (@level * 2), item.prev_item.inspect]
+            end
+          else
+            item_collection1.push(item)
+          end # case item
+        end # scopes.curr.items.each
+
+        # puts '%s-> L3 Items' % [' ' * (@level * 2)]
+        # pp item_collection1.items.map{ |item| item.inspect }
+
+        # puts '%s-> L4 [convert to int]'.colorize(:blue) % [' ' * (@level * 2)]
+        items2 = []
+        item_collection1.items.each do |item|
+          items2.push(item.resolve)
+        end
+        items2
+      end
+    end
+
+    class << self
+      def keep_nonce_on_dup()
+        true
+      end
+      def keep_instance_id_on_dup()
+        true
+      end
+    end
   end # Scope
 end # Lexer
 end # Range

data/lib/thefox-ext/range/lexer/separator.rb

@@ -2,7 +2,7 @@
 module TheFox
 module Range
 module Lexer
-  class Separator < Scope
+  class Separator < Base
     def initialize()
       super()
       # puts '-> Separator.initialize()'

data/lib/thefox-ext/range/resolver.rb

@@ -1,6 +1,4 @@
 
-require 'pp'
-
 module TheFox
 module Range
   # Resolve a range string to an array.
@@ -15,21 +13,20 @@ module Range
   # '1{5-7}' -> [15, 16, 17]
   # '1{1,02}' -> [11, 102]
   # '2{3{4,5},6}' -> [234, 235, 26]
+  # '1-3/1' -> [1, 2, 3]
+  # '1-10/2' -> [1, 3, 5, 7, 9]
+  # '2{10-20/2}' -> [210, 212, 214, 216, 218, 220]
   class Resolver
     def initialize(original = nil)
       # puts '-> TheFox::Range::Resolver.initialize'
-      @original = original
+      @original = original.to_s
     end
 
     def to_a
       # puts '-> TheFox::Range::Resolver.to_a'
 
-      if @original.is_a?(String)
-        lexer = Lexer::Lexer.new(@original.split(''))
-        lexer.resolve
-      else
-        []
-      end
+      lexer = Lexer::Lexer.new(@original.to_s.split(''))
+      lexer.resolve.flatten
     end
   end # Resolver
 end # Range

data/lib/thefox-ext/version.rb

@@ -1,8 +1,8 @@
 
 module TheFox
   module Ext
-    VERSION = '2.0.0-rc.2'
-    DATE = '2021-04-19'
+    VERSION = '3.0.0-rc.2'
+    DATE = '2021-04-25'
     HOMEPAGE = 'https://github.com/TheFox/ext.rb'
   end
 end

data/thefox-ext.gemspec

@@ -19,9 +19,11 @@ Gem::Specification.new do |spec|
 
 	spec.files         = `git ls-files -z`.split("\x0").reject{ |f| f.match(%r{^(test|spec|features)/}) }
 	spec.require_paths = ['lib']
-	spec.required_ruby_version = ['>=2.4.0']
+	spec.required_ruby_version = ['>=2.5.0']
 
 	spec.add_development_dependency 'minitest', '~>5.8'
 	spec.add_development_dependency 'simplecov', '~>0.18'
 	spec.add_development_dependency 'simplecov-phpunit', '~>1.0'
+	spec.add_development_dependency 'colorize', '~>0.8'
+	spec.add_development_dependency 'pry', '~>0.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thefox-ext
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.rc.2
+  version: 3.0.0.pre.rc.2
 platform: ruby
 authors:
 - Christian Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-19 00:00:00.000000000 Z
+date: 2021-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
 description: This gem extents some of the basic Ruby classes by missing functionalities.
 email: christian@fox21.at
 executables: []
@@ -65,6 +93,7 @@ files:
 - ".gitignore"
 - CHANGELOG-v1.md
 - CHANGELOG-v2.md
+- CHANGELOG-v3.md
 - Gemfile
 - LICENSE
 - README.md
@@ -72,6 +101,7 @@ files:
 - bin/install.sh
 - bin/release.sh
 - bin/setup.sh
+- bin/test.rb
 - bin/test.sh
 - bin/uninstall.sh
 - lib/thefox-ext.rb
@@ -86,8 +116,9 @@ files:
 - lib/thefox-ext/range/lexer/base.rb
 - lib/thefox-ext/range/lexer/block.rb
 - lib/thefox-ext/range/lexer/block_down.rb
-- lib/thefox-ext/range/lexer/block_stack.rb
+- lib/thefox-ext/range/lexer/block_level.rb
 - lib/thefox-ext/range/lexer/block_up.rb
+- lib/thefox-ext/range/lexer/collection.rb
 - lib/thefox-ext/range/lexer/interval.rb
 - lib/thefox-ext/range/lexer/lexer.rb
 - lib/thefox-ext/range/lexer/number.rb
@@ -111,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"

data/lib/thefox-ext/range/lexer/block_stack.rb

@@ -1,44 +0,0 @@
-
-require 'pp'
-
-module TheFox
-module Range
-module Lexer
-  # 0123456789
-  class BlockStack
-    def initialize()
-      # puts '-> BlockStack.initialize()'
-      @stack = []
-    end
-
-    # :nocov:
-    def inspect()
-      'BlockStack(%d)' % [@stack.length]
-    end
-    # :nocov:
-
-    def push(item)
-      @stack.push(item)
-    end
-
-    def pop()
-      @stack.pop
-    end
-
-    def curr()
-      @stack.last
-    end
-
-    def length()
-      @stack.length
-    end
-
-    def add_child(item)
-      if !@stack.last.nil? && !item.nil?
-        @stack.last.add_child(item)
-      end
-    end
-  end # BlockStack
-end # Lexer
-end # Range
-end # TheFox