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

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

@@ -1,37 +1,33 @@
 
-require 'pp'
-
 module TheFox
 module Range
 module Lexer
   class Lexer
     def initialize(chars)
-      # puts '-> Lexer.initialize'
+      # puts '-> Lexer2.initialize'
       @chars = chars
-      # pp @chars
     end
 
     def resolve()
       # puts
-      # puts '-> Lexer.resolve L1'
+      # puts '-> Lexer2.resolve L1 [Create Object for each character]'
 
+      block_level = BlockLevel.new
+      item_collection1 = Collection.new
       position = 0
-      prev_item = nil
-      block_level = 0
-      items1 = []
       @chars.each do |char|
         position += 1
-
         curr_item = case char
-          when ','
+          when ' '
+            # Skip space
+          when "\r"
+            # Skip
+          when ',', "\n"
             Separator.new()
           when '{'
-            block_level += 1
             BlockDown.new(block_level)
           when '}'
-            org_level = block_level
-            block_level -= 1
-            BlockUp.new(org_level)
+            BlockUp.new(block_level)
           when '+'
             Operator.new()
           when '-', '.'
@@ -41,242 +37,56 @@ module Lexer
           when '0'..'9'
             Number.new(char)
           else
-            raise 'Unknown character at position %d: %s' % [position, char]
+            raise 'Unknown character at position %d: "%s" (ord=%d)' % [
+              position, char, char.ord
+            ]
           end
 
-        if !prev_item.nil?
-          prev_item.chain(curr_item)
-        end
-        items1.push(curr_item)
-        prev_item = curr_item
+        item_collection1.push(curr_item)
       end
 
-      # pp items1.map{ |item| item.inspect }
+      # puts '-> Lexer2.resolve L1 Items'
+      # pp item_collection1.items.map{ |item| item.inspect }
 
       # puts
-      # puts '-> Lexer.resolve L2'
-      curr_item = nil
-      prev_item = nil
-      items2 = []
-      items1.each do |item|
+      # puts '-> Lexer2.resolve L2 [Append Number]'
+      item_collection2 = Collection.new
+      item_collection1.items.each do |item|
         # puts '--> L2 item: %s' % [item.inspect]
 
-        append_dup = false
-
         case item
         when Number
-          if curr_item.nil?
-            # New Number
-            curr_item = item.dup
-            if !prev_item.nil?
-              prev_item.chain(curr_item)
-            end
-            items2.push(curr_item)
-            prev_item = curr_item
+          if item_collection2.curr.is_a?(Number)
+            item_collection2.curr.append(item)
           else
-            # Append Number
-            if curr_item.is_a?(Number)
-              curr_item.append(item.char)
-            else
-              raise 'Do not know what to do'
-            end
+            item_collection2.push(item)
           end
         when Range
-          if prev_item.is_a?(Range) && prev_item.symbole == '.' && item.symbole == '.'
-            # skip
+          # puts '--> L2 Its Range: %s  %s  %s %s %s' % [
+          #   item.inspect,
+          #   item_collection2.curr.inspect,
+          #   item_collection2.curr.is_a?(Range) ? 'Y' : 'n',
+          #   item_collection2.curr.symbole == '.' ? 'Y' : 'n',
+          #   item.symbole == '.' ? 'Y' : 'n',
+          # ]
+          if item_collection2.curr.is_a?(Range) && item_collection2.curr.symbole == '.' && item.symbole == '.'
+            # puts '--> L2 Skip'
           else
-            append_dup = true
+            item_collection2.push(item)
           end
         else
           # puts '--> L2 ELSE'
+          item_collection2.push(item)
+        end # case item
 
-          append_dup = true
-        end
-
-        if append_dup
-          curr_item = item.dup
-          if !prev_item.nil?
-            prev_item.chain(curr_item)
-          end
-          items2.push(curr_item)
-          prev_item = curr_item
-
-          curr_item = nil
-        end
-      end
-
-      # pp items2.map{ |item| item.inspect }
-
-      # puts
-      # puts '-> Lexer.resolve L3'
-      append_dub_f = nil
-      append_prev_f = nil
-      prev_item = nil
-      block_stack = BlockStack.new
-      items3 = []
-      items2.each do |item|
-        # puts '--> L3  %20s  bs=%d' % [item.inspect, block_stack.length]
-
-        append_dup = false
-        append_prev = false
-
-        case item
-        when Number
-          if item.next_item.is_a?(Range) || item.prev_item.is_a?(Range) || item.prev_item.is_a?(Interval)
-            # skip
-          else
-            append_dup = true
-          end
-        when Range
-          if item.prev_item.is_a?(Number) && item.next_item.is_a?(Number)
-            # puts '--> Range normal'
-            append_dub_f = -> (curr_item){
-              curr_item.left_item = item.prev_item.dup
-              curr_item.right_item = item.next_item.dup
-
-              curr_item.left_item.parent_item = block_stack.curr
-              curr_item.right_item.parent_item = block_stack.curr
-
-              block_stack.add_child(curr_item.left_item)
-              block_stack.add_child(curr_item.right_item)
-            }
-            append_dup = true
-          else
-            raise 'Invalid Range: %s %s' % [
-              item.prev_item.inspect,
-              item.next_item.inspect,
-            ]
-          end
-        when Interval
-          if !item.next_item.is_a?(Number)
-            raise 'Invalid Interval: %s' % [item.next_item.inspect]
-          end
-
-          append_dub_f = ->(curr_item){ curr_item.number = item.next_item.dup }
-          append_dup = true
-        when Operator
-          if prev_item.is_a?(Number)
-            append_prev_f = -> (curr_item){ curr_item.inc }
-            append_prev = true
-          end
-        when BlockDown
-          #block_stack.push(item.dup)
-          append_dub_f = ->(curr_item){ block_stack.push(curr_item) }
-          append_dup = true
-        when BlockUp
-          block_stack.pop
-          append_dup = true
-        else
-          # puts '--> L3 ELSE'
-          append_dup = true
-        end
-
-        # Append Dup
-        if append_dup
-          # Dup
-          curr_item = item.dup
-          # Function
-          if !append_dub_f.nil?
-            append_dub_f.call(curr_item)
-            append_dub_f = nil
-          end
-          # Chain
-          if !prev_item.nil?
-            prev_item.chain(curr_item)
-          end
-          # Block
-          if !item.is_a?(Block)
-            # puts '---> set Parent: %s' % [block_stack.curr.inspect]
-            curr_item.parent_item = block_stack.curr
-            block_stack.add_child(curr_item)
-          end
-          # Append
-          items3.push(curr_item)
-          # Prev Item
-          prev_item = curr_item
-        end
-
-        # Append Prev
-        if append_prev && !prev_item.nil?
-          # Dup
-          curr_item = prev_item.dup
-          # Function
-          if !append_prev_f.nil?
-            append_prev_f.call(curr_item)
-            append_prev_f = nil
-          end
-          # Chain
-          prev_item.chain(curr_item)
-          # Block
-          if !item.is_a?(Block)
-            curr_item.parent_item = block_stack.curr
-            block_stack.add_child(curr_item)
-          end
-          # Append
-          items3.push(curr_item)
-          # Prev Item
-          prev_item = curr_item
-        end
-
-        # Block
-        if item.is_a?(Block)
-          # puts '--> L3 set parent block for block'
-          item.parent_item = block_stack.curr
-          block_stack.add_child(item)
-        end
-      end
+      end # item_collection1.items
 
-      # pp items3.map{ |item| item.inspect }
+      # puts '-> Lexer2.resolve L2 Items'
+      # pp item_collection2.items.map{ |item| item.inspect }
 
       # puts
-      # puts '-> Lexer.resolve L4 [convert to int]'
-      items4 = []
-      items3.each do |item|
-        # puts '--> L4  %20s   %20s   c: %d' % [item.inspect, item.parent_item.inspect, item.children.length]
-
-        case item
-        when Number
-          if item.next_item.is_a?(BlockDown)
-            # skip
-            # puts '---> skip'
-          else
-            items4.push(item.char.to_i)
-          end
-        when Range
-          r_begin = item.left_item.char.to_i
-          r_end = item.right_item.char.to_i
-          r = ::Range.new(r_begin, r_end)
-
-          if item.next_item.is_a?(Interval)
-            # Interval Range
-            n = item.next_item.number.char.to_i
-            c = 0
-            r.each do |i|
-              if c == 0
-                items4.push(i)
-              end
-              c += 1
-              if c == n
-                c = 0
-              end
-            end
-          else
-            # Normal Range
-            items4.push(*r.to_a)
-          end
-        when Interval
-          # puts '---> skip Interval'
-        when Separator
-          # puts '---> skip Separator'
-        when Block
-          # puts '---> skip Block'
-        else
-          raise 'Implementation missing for: %s' % [item.inspect]
-        end
-      end
-
-      # pp items4
-      items4
+      scope = Scope.new(item_collection2.items)
+      scope.resolve
     end
   end # Lexer
 end # Lexer

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

@@ -1,6 +1,4 @@
 
-require 'pp'
-
 module TheFox
 module Range
 module Lexer
@@ -9,47 +7,96 @@ module Lexer
     def initialize(char)
       super()
       # puts '-> Number.initialize(%s)' % [char]
+      #@nonce = rand(10 ** 3).to_s.rjust(3, '0')
       @char = char
+      @is_ref_item = false
     end
 
     # :nocov:
     def inspect()
-      'Number(%s,^%s)' % [@char, @parent_item.inspect]
+      a = [
+        # '#' + @nonce.to_s,
+        # 'c' + @char,
+        @char,
+      ]
+      if !@parent_item.nil?
+        a.push('^%s' % @parent_item.inspect)
+      end
+      a.push('IRI=%d' % [@is_ref_item])
+      # if @children.length > 0
+      #   a.push('v%d' % @children.length)
+      # end
+      'Number(%s)' % [a.join(' ')]
+    end
+    def dup()
+      # puts '-> Number.dup(%s) -> %s %s' % [@char, inspect, self.is_ref_item ? 'Y' : 'n']
+      # puts '-> %s.dup' % [inspect]
+      o = super()
+      o.is_ref_item = self.is_ref_item
+      # puts '-> Number.dup(%s) -> %s' % [@char, o.inspect]
+      o
     end
     # :nocov:
 
-    def char()
-      # puts '-> %s.char' % [self.inspect]
-      if self.has_parent_item
-        # puts '-> %s.char has parent' % [self.inspect]
-        if self.parent_item.is_a?(Block)
-          # puts '-> %s.char parent is a %s' % [self.inspect, self.parent_item.inspect]
-          if self.parent_item.prev_item.is_a?(Number)
-            # puts '-> %s.char parent Prev is a %s' % [self.inspect, self.parent_item.prev_item.inspect]
-            '%s%s' % [self.parent_item.prev_item.char, @char]
-          else
-            raise 'Parent Prev item for %s is not a Block: %s' % [
-              self.inspect,
-              self.parent_item.prev_item.inspect,
-            ]
-          end
-        else
-          raise 'Parent item for %s is not a Block: %s' % [self.inspect, self.parent_item.inspect]
-        end
-      else
-        # puts '-> %s.char char' % [self.inspect]
-        @char
-      end
+    def char
+      @char
+    end
+
+    def is_ref_item
+      @is_ref_item
+    end
+    def is_ref_item=(is_ref_item)
+      @is_ref_item = is_ref_item
     end
 
-    def append(char)
-      @char += char
+    def append(obj)
+      if obj.is_a?(Number)
+        self.append(obj.char)
+      else
+        @char += obj
+      end
     end
 
     def inc()
       f = '%%0%dd' % [@char.length]
       @char = f % [@char.to_i + 1]
     end
+
+    def resolve(level = 0)
+      # puts '-> %s.resolve(%d)' % [self.inspect, @char, level]
+      if self.has_parent_item
+        if @parent_item.is_a?(Number)
+          ('%s%s' % [@parent_item.resolve(level + 1), @char]).to_i
+        elsif @parent_item.is_a?(Scope)
+          curr_item = @parent_item
+          stack = [@char]
+          while !curr_item.parent_scope.nil? do
+            # puts '-----> CI=%s          RI=%s' % [curr_item.inspect, curr_item.ref_item.inspect]
+
+            if !curr_item.ref_item.nil?
+              stack.push(curr_item.ref_item.char)
+            end
+            curr_item = curr_item.parent_scope
+          end
+
+          # pp stack.reverse
+
+          stack.reverse.join.to_i
+
+          # if @char == '5'
+          #   2102
+          # else
+          #   9999
+          # end
+        elsif @parent_item.is_a?(Interval)
+          @char.to_i
+        else
+          nil
+        end
+      else
+        @char.to_i
+      end
+    end
   end # Number
 end # Lexer
 end # Range

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

@@ -2,7 +2,7 @@
 module TheFox
 module Range
 module Lexer
-  # -
+  # - ..
   class Range < Base
     def initialize(symbole)
       super(symbole)
@@ -10,31 +10,55 @@ module Lexer
 
       @left_item = nil
       @right_item = nil
+      @interval = nil
     end
 
-    def left_item()
-      @left_item
+    # :nocov:
+    def inspect()
+      if !@left_item.nil? && !@right_item.nil?
+        'Range(#%s s=%s l=%s r=%s i=%s)' % [
+          @nonce,
+          @symbole,
+          @left_item.inspect,
+          @right_item.inspect,
+          @interval.inspect
+        ]
+      else
+        'Range(#%s %s)' % [@nonce, @symbole]
+      end
     end
+    # :nocov:
+
     def left_item=(left_item)
-      @left_item = left_item
+      @left_item = left_item.dup
     end
 
+    def right_item=(right_item)
+      @right_item = right_item.dup
+    end
     def right_item()
       @right_item
     end
-    def right_item=(right_item)
-      @right_item = right_item
+
+    def interval()
+      @interval
+    end
+    def interval=(interval)
+      @interval = interval.dup
     end
 
-    # :nocov:
-    def inspect()
-      if !@left_item.nil? && !@right_item.nil?
-        'Range(%s, %s, %s)' % [@symbole, @left_item.inspect, @right_item.inspect]
-      else
-        'Range(%s)' % [@symbole]
+    def resolve()
+      # puts '-> %s.resolve()'.colorize(:red) % [inspect]
+      if @left_item.is_a?(Number) && @right_item.is_a?(Number)
+        r = ::Range.new(@left_item.resolve, @right_item.resolve)
+        if @interval.is_a?(Interval)
+          # puts '--> I=%s'.colorize(:red) % [@interval.inspect]
+          r = r.step(@interval.resolve)
+        end
+        # puts '--> %s'.colorize(:red) % [r.inspect]
+        r.to_a
       end
     end
-    # :nocov:
   end # Range
 end # Lexer
 end # Range