aio_elin 0.0.1 → 1.0.0

data/lib/aio/core/text/context.rb

@@ -1,211 +1,211 @@
 #coding=utf-8
 
 module Aio::Text
-	class Context < ::Array
-
-		class OutLineError < StandardError; end
-
-		include Aio::Ui::Verbose
-
-		attr_reader :count_line, :backup_line
-
-		def initialize(*arr)
-			super
-			self.each_with_index do |str, i|
-				self[i] = Aio::Text::LineString.new(str.chomp)
-			end
-			@backup_line = nil
-			@count_line = 0
-		end
-
-		# 到下一行
-		def next
-			@count_line += 1
-		end
-
-		# 对每行进行read, 判断是单步运行还是循环运行
-		# 修改了此处的backup_line 逻辑
-		def readline_match_block(reg, single = false, &block)
-
-			reg = Aio::Base::Toolkit::Regexp.safe(reg)
-
-			first = true
-			loop do 
-				line_str = self[@count_line]
-
-				if first
-					@backup_line = @count_line
-				end
-
-				# 如果出界，有可能是因为循环导致
-				# 跳出循环
-				# 此处有问题，无法判断是否为最后一个，并跳出此模块
-				if @backup_line > self.size and line_str.nil?
-					@count_line = @backup_line
-					if Aio::Base::Debug.mismatch?
-						puts "[-] Can't match this line: "
-						puts caller
-						puts "  line_string: #{self[@backup_line]}"
-						puts "  regexp: #{reg}"
-					end
-					raise OutLineError
-				end
-
-				if line_str.nil?
-					@count_line = @backup_line
-					break
-				end
-
-				first = false
-				begin
-					res = line_str.match_block(reg) do |b|
-						block.call(b) unless block.nil?
-					end
-				rescue IndexError => e
-					print_error "IndexError: 请检查模块block提取信息名称"
-					puts "caller"
-					puts caller
-					exit
-				rescue NoMethodError
-					if Aio::Base::Debug.module_debug?
-						print_error "NoMethodError: 请检查模块block中useful是否定义正确"
-						puts caller
-					end
-					exit
-				rescue ArgumentError => e
-					if Aio::Base::Debug.module_debug?
-						puts "ArgumentError:"
-						puts e.message
-						puts caller
-					end
-				end
-
-				@count_line += 1
-
-				# 如果匹配到，跳出循环
-				break if res
-
-				# 如果只是单步运行，就返回
-				break if single
-			end
-		end
-
-		# 单行循环
+  class Context < ::Array
+
+    class OutLineError < StandardError; end
+
+    include Aio::Ui::Verbose
+
+    attr_reader :count_line, :backup_line
+
+    def initialize(*arr)
+      super
+      self.each_with_index do |str, i|
+        self[i] = Aio::Text::LineString.new(str.chomp)
+      end
+      @backup_line = nil
+      @count_line = 0
+    end
+
+    # 到下一行
+    def next
+      @count_line += 1
+    end
+
+    # 对每行进行read, 判断是单步运行还是循环运行
+    # 修改了此处的backup_line 逻辑
+    def readline_match_block(reg, single = false, &block)
+
+      reg = Aio::Base::Toolkit::Regexp.safe(reg)
+
+      first = true
+      loop do 
+        line_str = self[@count_line]
+
+        if first
+          @backup_line = @count_line
+        end
+
+        # 如果出界，有可能是因为循环导致
+        # 跳出循环
+        # 此处有问题，无法判断是否为最后一个，并跳出此模块
+        if @backup_line > self.size and line_str.nil?
+          @count_line = @backup_line
+          if Aio::Base::Debug.mismatch?
+            puts "[-] Can't match this line: "
+            puts caller
+            puts "  line_string: #{self[@backup_line]}"
+            puts "  regexp: #{reg}"
+          end
+          raise OutLineError
+        end
+
+        if line_str.nil?
+          @count_line = @backup_line
+          break
+        end
+
+        first = false
+        begin
+          res = line_str.match_block(reg, self, @count_line) do |b|
+            block.call(b) unless block.nil?
+          end
+        rescue IndexError => e
+          print_error "IndexError: 请检查模块block提取信息名称"
+          puts "caller"
+          puts caller
+          exit
+        rescue NoMethodError
+          if Aio::Base::Debug.module_debug?
+            print_error "NoMethodError: 请检查模块block中useful是否定义正确"
+            puts caller
+          end
+          exit
+        rescue ArgumentError => e
+          if Aio::Base::Debug.module_debug?
+            puts "ArgumentError:"
+            puts e.message
+            puts caller
+          end
+        end
+
+        @count_line += 1
+
+        # 如果匹配到，跳出循环
+        break if res
+
+        # 如果只是单步运行，就返回
+        break if single
+      end
+    end
+
+    # 单行循环
     # stop 为停止出，在停止处之前的每一行都将输出
-		def readline_match_block_loop(start, stop, &block)
-			stop = Aio::Base::Toolkit::Regexp.safe(stop)
-			loop do 
-				readline_match_block(start, true, &block)
-			  break if stop.match(self[@count_line])
-				break if self[@count_line].nil?
-			end
-		end
-			
-		# 读取一个区间，并返回块
-		# 只会执行一次
-		# stop 作为分裂符
-		# opt 当last为false时，不会对stop一行输出
-		# opt 当before为true时，只会分裂stop的前一行，count_line保留
-		def readline_range(start, stop, opt={:last=>false}, &block)
-			str_context = Context.new
-			start = Aio::Base::Toolkit::Regexp.safe(start)
-			stop = Aio::Base::Toolkit::Regexp.safe(stop)
-			backup_line = @count_line
-
-			loop do 
-				line_str = self[@count_line]
-
-				if line_str.nil?
-					@count_line = backup_line
-					raise OutLineError
-				end
-
-				if start =~ line_str
-					str_context << line_str
-					@count_line += 1
-					break
-				end
-				@count_line += 1
-			end
-
-			loop do 
-				line_str = self[@count_line]
-				#raise OutLineError if line_str.nil?
-				if stop =~ line_str or line_str.nil?
-					str_context << line_str if opt[:last]
-					@count_line += 1 unless opt[:before]
-					break
-				else
-					str_context << line_str
-				end
-				@count_line += 1
-			end
-
-			block.call(str_context)
-		end
-
-		# 当需要多次循环时使用
-		# 此方法用于循环更加安全
-		def readline_range_loop(start, stop, opt={:last=>false}, &block)
-			loop do 
-				begin
-					readline_range(start, stop, opt, &block)
-				rescue OutLineError
-					break
-				end
-			end
-		end
-
-		# 读取一个区间并返回块
-		# 在起始位置之后的行中，满足条件, 则放入同一区间。否则返回
-		def readline_range_if(start, condition, &block)
-			str_context = Context.new
-			start = Aio::Base::Toolkit::Regexp.safe(start)
-			condition = Aio::Base::Toolkit::Regexp.safe(condition)
-
-			loop do
-				line_str = self[@count_line]
-				raise OutLineError if line_str.nil?
-				if start =~ line_str
-					str_context << line_str
-					@count_line += 1
-					break
-				end
-				@count_line += 1
-			end
-
-			loop do
-				line_str = self[@count_line]
-				if condition =~ line_str
-					str_context << line_str
-					@count_line += 1
-				else
-					break
-				end
-			end
-
-			block.call(str_context)
-		end
-
-		def readline_range_if_loop(start, condition, &block)
-			loop do
-				begin
-					readline_range_if(start, condition, &block)
-				rescue OutLineError
-					break
-				end
-			end
-		end
-
-		def count_line
-			self[@count_line]
-		end
-
-		def method_missing(mid, *arg, &block)
-			print_error "#{mid} 方法未定义，请检查方法名拼写"
-			puts caller[0]
-			super
-		end
-
-	end
+    def readline_match_block_loop(start, stop, &block)
+      stop = Aio::Base::Toolkit::Regexp.safe(stop)
+      loop do 
+        readline_match_block(start, true, &block)
+        break if stop.match(self[@count_line])
+        break if self[@count_line].nil?
+      end
+    end
+
+    # 读取一个区间，并返回块
+    # 只会执行一次
+    # stop 作为分裂符
+    # opt 当last为false时，不会对stop一行输出
+    # opt 当before为true时，只会分裂stop的前一行，count_line保留
+    def readline_range(start, stop, opt={:last=>false}, &block)
+      str_context = Context.new
+      start = Aio::Base::Toolkit::Regexp.safe(start)
+      stop = Aio::Base::Toolkit::Regexp.safe(stop)
+      backup_line = @count_line
+
+      loop do 
+        line_str = self[@count_line]
+
+        if line_str.nil?
+          @count_line = backup_line
+          raise OutLineError
+        end
+
+        if start =~ line_str
+          str_context << line_str
+          @count_line += 1
+          break
+        end
+        @count_line += 1
+      end
+
+      loop do 
+        line_str = self[@count_line]
+        #raise OutLineError if line_str.nil?
+        if stop =~ line_str or line_str.nil?
+          str_context << line_str if opt[:last]
+          @count_line += 1 unless opt[:before]
+          break
+        else
+          str_context << line_str
+        end
+        @count_line += 1
+      end
+
+      block.call(str_context)
+    end
+
+    # 当需要多次循环时使用
+    # 此方法用于循环更加安全
+    def readline_range_loop(start, stop, opt={:last=>false}, &block)
+      loop do 
+        begin
+          readline_range(start, stop, opt, &block)
+        rescue OutLineError
+          break
+        end
+      end
+    end
+
+    # 读取一个区间并返回块
+    # 在起始位置之后的行中，满足条件, 则放入同一区间。否则返回
+    def readline_range_if(start, condition, &block)
+      str_context = Context.new
+      start = Aio::Base::Toolkit::Regexp.safe(start)
+      condition = Aio::Base::Toolkit::Regexp.safe(condition)
+
+      loop do
+        line_str = self[@count_line]
+        raise OutLineError if line_str.nil?
+        if start =~ line_str
+          str_context << line_str
+          @count_line += 1
+          break
+        end
+        @count_line += 1
+      end
+
+      loop do
+        line_str = self[@count_line]
+        if condition =~ line_str
+          str_context << line_str
+          @count_line += 1
+        else
+          break
+        end
+      end
+
+      block.call(str_context)
+    end
+
+    def readline_range_if_loop(start, condition, &block)
+      loop do
+        begin
+          readline_range_if(start, condition, &block)
+        rescue OutLineError
+          break
+        end
+      end
+    end
+
+    def count_line
+      self[@count_line]
+    end
+
+    def method_missing(mid, *arg, &block)
+      print_error "#{mid} 方法未定义，请检查方法名拼写"
+      puts caller[0]
+      super
+    end
+
+  end
 end

data/lib/aio/core/text/line_string.rb

@@ -1,74 +1,29 @@
 #coding=utf-8
 
 module Aio::Text
-	class LineString < String
-		class Mismatch < StandardError; end
+  class LineString < String
+    class Mismatch < StandardError; end
 
-		include Aio::Ui::Verbose
+    attr_accessor :content, :line
 
-		# 获得区块
-		def match_block(reg)
-			block = reg.match(self)
-			#raise Mismatch.new, "reg: #{reg}\nstr: #{self.to_s}" if block.nil?
-			if block.nil?
-				return false
-			end
+    include Aio::Ui::Verbose
 
-			# 有两种更新的方式，不加str 那么就是从block中的提取
-			# 如果有str， 则直接使用str
-			def block.update(info, sym, str=nil)
-				sym = sym.to_sym
-				if info.nil?
-					print_error "请检查update中的第一个参数是否定义" 
-					pp caller
-				end
+    # 获得区块
+    # 并且获得所在的行数
+    def match_block(reg, cont, line)
+      block = Block.new(reg.match(self))
+      #raise Mismatch.new, "reg: #{reg}\nstr: #{self.to_s}" if block.nil?
+      if block.nil?
+        return false
+      end
 
-				if str.nil?
-					info[sym] = self[sym].strip
-				else
-					info[sym] = str.strip
-				end
-			end
+      block.content = cont
+      block.line    = line
 
-			def block.update_arr(info, sym)
-				sym = sym.to_sym
-				info[sym] ||= []
-				info[sym] << self[sym].strip
-			end
+      yield block
+    end
 
-			def block.update_hash(info, sym, key, val)
-				sym = sym.to_sym
-				info[sym] ||= {}
-				info[sym][key] = val.strip
-			end
 
-			# 参数info 放置useful
-      # 参数sym  为Symbol类型的标示
-			# 参数level 为 :serious 或 :ordinary
-			# 参数mod  一般为self
-			# 参数opt[:string] 当block中没有sym项时使用
-			def block.warning(info, sym, level, mod, opt={})
-				sym = sym.to_sym
-				self.update(info, sym, opt[:string])
-				# Aio::Text::Warning 类中的warning方法
-				mod.warning_klass.warning(info, sym, level, mod, opt[:force])
-			end
-
-			def block.warning_serious(info, sym, mod, opt={})
-				sym = sym.to_sym
-				self.update(info, sym, opt[:string])
-				mod.warning_klass.warning_serious(info, sym, mod, opt[:force])
-			end
-
-			def block.warning_ordinary(info, sym, mod, opt={})
-				sym = sym.to_sym
-				self.update(info, sym, opt[:string])
-				mod.warning_klass.warning_ordinary(info, sym, mod, opt[:force])
-			end
-
-			yield block
-		end
-
-	end
+  end
 end
 

data/lib/aio/core/text/match_string_info.rb

@@ -0,0 +1,73 @@
+module Aio::Text
+
+  # 将提取的关键信息附带的增加所在上下文以及行数
+  class MatchStringInfo < Struct.new(:var, :content, :line)
+
+    # 存放比较后的不同值，也是 MachStringInfo 类
+    attr_accessor :compare_val
+
+    def initialize(var, content, line)
+      super(
+        var,
+        content,
+        line
+      )
+    end
+
+    def inspect
+      var.to_s
+    end
+
+    def to_s
+     var 
+    end
+
+    # 覆盖原有的eql?
+    def eql?(other_match)
+      self.to_s.eql?(other_match.to_s)
+    end
+
+    # 判断和另一个class是否是同一个content
+    def same_content?(other_match)
+      content == other_match.content
+    end
+
+    # 判断是否和另一个值为同一行
+    def same_line?(other_match)
+      if same_content?
+        return line == other_match.line
+      end
+      return false
+    end
+
+    # 判断是否有compare_val值
+    def compare_val?
+      !@compare_val.nil?
+    end
+
+    # 差异值的文本
+    def compare_content
+      compare_val.content
+    end
+
+    # 差异值的行数
+    def compare_line
+      compare_val.line
+    end
+
+    def var;  self[:var].to_s;     end
+    def content; self[:content]; end
+    def line;    self[:line];    end
+
+    def method_missing(m, *args)
+      if var.respond_to?(m)
+        var.send(m, *args)
+      
+      else
+        super
+      end
+    end
+
+  end
+end
+