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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe82bfca3c074a12655b24a87c75e7418b38962c86e035acc6035961f52381d1
-  data.tar.gz: 83a7de4ec884aa2d7a244ee25e9a8d55e665e14fdf2469ab190a29792c199c57
+  metadata.gz: 2aaea645cf34677efc2185362e2073872096124d6026431188f0424098bffdda
+  data.tar.gz: ef43f25fb99bdeeca8fc84188f2fdd470576a485700681156e0a412e7e4c0fe7
 SHA512:
-  metadata.gz: a884c7bb42c2f7f8de99f40f44079ed644d07c204c49fd2321b6b96aab6eb9b33eb197ff642a5e87b0d8718f55c3e622d9eebd1c4ec9bef206b45fa0445f0bf0
-  data.tar.gz: 1abf14d71cab30e93f7ea0024514f1a62536109148e0107dc7007ea9502423374f2b037eaff7369f0bf2b3e88d1ffb0b1d57db81fc373cfcff255c2ce18375e5
+  metadata.gz: 22d9a834752150107d06667301eb3d1e02be0a8795cf32c12bb01083ffcf020f8bce7c6e245cd0bbf48dcf7f919b038ba5c4ae4e945a6908b73e3f1c3d6f4797
+  data.tar.gz: fe3338ce08dc5de0f18e982bc11eeb5db31fb5c8eb4cbb82a168e9952ba46752db6222796cd488295b0ac586bce1fe64f30c0a99d27d2cfd2e7d1e5f15f8fbc1

data/.github/workflows/ci.yml

@@ -18,7 +18,6 @@ jobs:
     strategy:
       matrix:
         ruby-version:
-          - '2.4'
           - '2.5'
           - '2.6'
           - '2.7'

data/CHANGELOG-v2.md

@@ -1,8 +1,8 @@
 # Release Notes for Extended Ruby Classes v2.x
 
-## v2.0.0 [unreleased]
+## v2.0.0
 
 - Removed deprecated `Array.resolve_range_str`.
 - Removed deprecated `String.resolve_range`.
-- Drop Ruby version 2.3 support.
+- Dropped support for Ruby version 2.3.
 - Added Range Resolver class.

data/CHANGELOG-v3.md

@@ -0,0 +1,6 @@
+# Release Notes for Extended Ruby Classes v2.x
+
+## v3.0.0 [unreleased]
+
+- Dropped support for Ruby version 2.4.
+- Range Resolver v2

data/README.md

@@ -21,7 +21,7 @@ gem install thefox-ext
 or via `Gemfile`:
 
 ```ruby
-gem 'thefox-ext', '~>1.10'
+gem 'thefox-ext', '~>2.0'
 ```
 
 Use it in your sources:
@@ -47,3 +47,9 @@ require 'thefox-ext'
 ## Project Links
 
 - [Gem](https://rubygems.org/gems/thefox-ext)
+
+## Dev
+
+```bash
+bundler exec ./bin/test.rb
+```

data/bin/dev

@@ -1,10 +1,7 @@
 #!/usr/bin/env ruby
-# coding: UTF-8
 
 require 'thefox-ext'
 require 'pp'
 
-s = '99-110/4'
-s = '99-110/*'
-rr = TheFox::Range::Resolver.new(s)
+rr = TheFox::Range::Resolver.new(ARGV.join(' '))
 pp rr.to_a

data/bin/test.rb

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+
+require 'pry'
+require 'thefox-ext'
+require 'pp'
+
+include TheFox::Range::Lexer
+
+n1 = Number.new('123')
+
+binding.pry
+
+puts '-> exit pry'

data/lib/thefox-ext.rb

@@ -10,16 +10,19 @@ require 'thefox-ext/ext/string'
 require 'thefox-ext/ext/true'
 
 require 'thefox-ext/console'
+
+# Resolver
 require 'thefox-ext/range/resolver'
 require 'thefox-ext/range/lexer/lexer'
+require 'thefox-ext/range/lexer/collection'
 require 'thefox-ext/range/lexer/base'
-require 'thefox-ext/range/lexer/scope'
-require 'thefox-ext/range/lexer/separator'
-require 'thefox-ext/range/lexer/operator'
+require 'thefox-ext/range/lexer/block_level'
 require 'thefox-ext/range/lexer/block'
 require 'thefox-ext/range/lexer/block_down'
 require 'thefox-ext/range/lexer/block_up'
-require 'thefox-ext/range/lexer/block_stack'
+require 'thefox-ext/range/lexer/operator'
+require 'thefox-ext/range/lexer/scope'
+require 'thefox-ext/range/lexer/number'
+require 'thefox-ext/range/lexer/separator'
 require 'thefox-ext/range/lexer/range'
 require 'thefox-ext/range/lexer/interval'
-require 'thefox-ext/range/lexer/number'

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

@@ -3,25 +3,63 @@ module TheFox
 module Range
 module Lexer
   class Base
+    @@instance_id = 0
+
     def initialize(symbole = nil)
       # puts '-> Base.initialize'
+
+      @@instance_id += 1
+      @instance_id = @@instance_id
+      @nonce = Base.generate_nonce()
       @symbole = symbole
       @prev_item = nil
+      @org_prev_item = nil
       @next_item = nil
 
       @parent_item = nil
+      #@parent_scope = nil
       @children = []
     end
 
-    def chain(item)
-      self.next_item = item
-      item.prev_item = self
+    # :nocov:
+    def inspect()
+      'Base'
+    end
+    # :nocov:
+
+    def instance_id()
+      @instance_id
+    end
+    def instance_id=(instance_id)
+      @instance_id = instance_id
+    end
+
+    def nonce()
+      @nonce
+    end
+    def nonce=(nonce)
+      @nonce = nonce
+    end
+
+    def chain(prev_item)
+      # puts '%s(%s).chain' % [self.inspect, opts.inspect]
+      self.prev_item = prev_item
+      if !prev_item.nil?
+        prev_item.next_item = self
+      end
     end
 
     def symbole()
       @symbole
     end
 
+    def org_prev_item()
+      @org_prev_item
+    end
+    def org_prev_item=(org_prev_item)
+      @org_prev_item = org_prev_item
+    end
+
     def prev_item()
       @prev_item
     end
@@ -53,16 +91,33 @@ module Lexer
       @children.push(child)
     end
     def has_children()
-      @children.length > 1
+      @children.length > 0
     end
 
     def dup()
       # puts '-> Base.dup'
       o = super()
+      o.nonce = Base.generate_nonce()
       o.prev_item = nil
       o.next_item = nil
       o
     end
+
+    def resolve()
+      puts '-> Base.resolve'
+    end
+
+    class << self
+      def generate_nonce()
+        rand(10 ** 3).to_s.rjust(3, '0')
+      end
+      def keep_nonce_on_dup()
+        false
+      end
+      def keep_instance_id_on_dup()
+        false
+      end
+    end
   end # Base
 end # Lexer
 end # Range

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

@@ -3,7 +3,16 @@ module TheFox
 module Range
 module Lexer
   # { }
-  class Block < Scope
+  class Block < Base
+    def initialize(level)
+      super()
+      # puts '-> Block.initialize(%s)' % [level.inspect]
+      @level = level.dup
+    end
+
+    def level()
+      @level
+    end
   end # Block
 end # Lexer
 end # Range

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

@@ -5,14 +5,18 @@ module Lexer
   # {
   class BlockDown < Block
     def initialize(level)
-      super()
-      # puts '-> BlockDown.initialize(%d)' % [level]
-      @level = level
+      level.inc
+      super(level)
+      # puts '-> BlockDown.initialize(%s)' % [level.inspect]
     end
 
     # :nocov:
     def inspect()
-      'BlockDown(%d)' % [@level]
+      'BlockDown(%s)' % [@level.level]
+      # if @prev_item.nil?
+      # else
+      #   'BlockDown(%s <%s)' % [@level.inspect, @prev_item.inspect]
+      # end
     end
     # :nocov:
   end # BlockDown

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

@@ -0,0 +1,37 @@
+
+module TheFox
+module Range
+module Lexer
+  class BlockLevel
+    def initialize()
+      # puts '-> BlockLevel.initialize()'
+      @level = 0
+    end
+
+    # :nocov:
+    def inspect()
+      'BlockLevel(%d)' % [@level]
+    end
+    # :nocov:
+
+    def inc()
+      @level += 1
+    end
+
+    def dec()
+      @level -= 1
+    end
+
+    def level()
+      @level
+    end
+
+    def ==(other)
+      if other.is_a?(BlockLevel)
+        @level == other.level
+      end
+    end
+  end # BlockLevel
+end # Lexer
+end # Range
+end # TheFox

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

@@ -5,14 +5,16 @@ module Lexer
   # }
   class BlockUp < Block
     def initialize(level)
-      super()
-      # puts '-> BlockUp.initialize(%d)' % [level]
-      @level = level
+      super(level)
+      level.dec
+      # puts '-> BlockUp.initialize(%s)' % [level.inspect]
+      # puts '-> BlockUp.initialize()'
     end
 
     # :nocov:
     def inspect()
-      'BlockUp(%d)' % [@level]
+      'BlockUp(%s)' % [@level.level]
+      # 'BlockUp()'
     end
     # :nocov:
   end # BlockUp

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

@@ -0,0 +1,73 @@
+
+module TheFox
+module Range
+module Lexer
+  class Collection
+    def initialize(items = nil)
+      # puts '-> Collection.initialize()'
+      @items = items.to_a
+      @block_level = 0
+    end
+
+    # :nocov:
+    def inspect()
+      'Collection(L=%d %s)' % [
+        @items.length,
+        @items.map{ |i| i.inspect }
+      ]
+    end
+    # :nocov:
+
+    def items()
+      @items
+    end
+
+    def curr()
+      @items.last
+    end
+
+    def prev()
+      @items[-2]
+    end
+
+    def is_empty()
+      @items.length == 0
+    end
+
+    def length()
+      @items.length
+    end
+
+    def push(item)
+      # puts '-> %s.push(%s)' % [self.inspect, item.inspect]
+      if item.nil?
+        return
+      end
+
+      # Prev
+      org_prev_item = item.prev_item
+      prev_item = @items.last
+
+      # Dup
+      curr_item = item.dup
+      @items.push(curr_item)
+
+      # Chain
+      curr_item.chain(prev_item)
+      curr_item.org_prev_item = org_prev_item
+
+      if curr_item.class.keep_nonce_on_dup
+        curr_item.nonce = item.nonce
+      end
+      if curr_item.class.keep_instance_id_on_dup
+        curr_item.instance_id = item.instance_id
+      end
+    end
+
+    def pop()
+      @items.pop
+    end
+  end # Collection
+end # Lexer
+end # Range
+end # TheFox

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

@@ -1,32 +1,41 @@
 
 module TheFox
-  module Range
-  module Lexer
-    # /n
-    class Interval < Base
-      def initialize()
-        super()
-        puts '-> Interval.initialize()'
-        @number = nil
-      end
+module Range
+module Lexer
+  # x-y/n
+  class Interval < Base
+    def initialize()
+      super()
+      # puts '-> Interval.initialize()'
+      @number = nil
+    end
 
-      # :nocov:
-      def inspect()
-        if @number.nil?
-          'Interval()'
-        else
-          'Interval(%s)' % [@number.inspect]
-        end
+    # :nocov:
+    def inspect()
+      if @number.nil?
+        'Interval()'
+      else
+        'Interval(%s)' % [@number.char]
       end
-      # :nocov:
+    end
+    # :nocov:
 
-      def number=(number)
-        @number = number
-      end
-      def number()
-        @number
+    def number()
+      @number
+    end
+    def number=(number)
+      @number = number.dup
+    end
+
+    def resolve()
+      # puts '-> %s.resolve' % [inspect]
+      if @number.nil?
+        1
+      else
+        @number.resolve
       end
-    end # Interval
-  end # Lexer
-  end # Range
-  end # TheFox
+    end
+  end # Interval
+end # Lexer
+end # Range
+end # TheFox