iparser 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 051ef5d38afe13cb8520bd3d614c7ed901162b36
-  data.tar.gz: 525de30addbade95e26236e7501a71065881b9ca
+  metadata.gz: 97d7e3125f043d5c5717ceaf8419cf62acce7ae1
+  data.tar.gz: e52c91bbf66725980e8be57de10f1b72b6dc9407
 SHA512:
-  metadata.gz: d5060ec8998ed3ba971cb8f3471fba3a6a836d2fe14118323917371267090f6ead2363d9e357faee8d35266a94d0f397d255d5883d2d4969cfcd0a626fc1f794
-  data.tar.gz: 84b75688e07b04918b1d39e5f940e69e2b8b98fd8cc3183eb69f541f708d21d1a0c79ddc28904c0851b836ce254b2895e6fbf8682e4055f3d41a586db0dcd146
+  metadata.gz: 2004e1f5c41dc9e7a9c70aab0ebc7946581d7acbde7ac8852943674c8fdd26a8cc7bc855ea0a053bbf28bfdd2b1b727ad91630ec0ef697b96f020aedf90bc19b
+  data.tar.gz: 1610d3c67e56eb93107791a0d5b853297835a93faf0784a27b12e35fb26dc91d707ddfd745d9a536da8cdb354baf8146a4b331d57a809e1a76a2d634095f51d6

data/README.md

@@ -42,6 +42,11 @@ parser.addstate ps_idle
 parser.addstate ps_cline
 parser.addstate ps_cblock
 
+# Add branch indexes to 'comment-line' and 'comment-block' state.
+# From 'idle' we can branch to 'comment-line' or 'comment-block' states.
+ps_idle.branches << parser.state_index( ps_cline )
+ps_idle.branches << parser.state_index( ps_cblock )
+
 # Describe 'comment-line' state.
 # Set template for entry this state (String or Regexp).
 ps_cline.entry << '/'
@@ -49,14 +54,6 @@ ps_cline.entry << '/'
 ps_cline.entry << '/'
 # Set template for leave this state (String or Regexp).
 ps_cline.leave << /[\n\r]/
-# Add handler to 'commaent-line' state.
-ps_cline.init( method(:doc_init) )
-ps_cline.handler( method(:doc_handler) )
-ps_cline.fini( method(:doc_fini) )
-# Add branch indexes to 'comment-line' and 'comment-block' state.
-# From 'idle' we can branch to 'comment-line' or 'comment-block' states.
-ps_idle.branches << parser.state_index( ps_cline )
-ps_idle.branches << parser.state_index( ps_cblock )
 
 # Describe 'comment-block' state.
 # Set template for entry this state (String or Regexp).
@@ -83,15 +80,15 @@ Check each state.
 **NOTE**: Type `'\\'` for input `'\'`.
 
 Each state has the following templates:
-1. __entry__  - used for set condition (template) to entry state.
-2. __leave__  - used for set condition (template) to leave state (return to previous state).
-3. __ignore__ - used for set symbols to ignoring.
+* `entry`  - used for set condition (template) to entry state.
+* `leave`  - used for set condition (template) to leave state (return to previous state).
+* `ignore` - used for set symbols to ignoring.
  
 After successfully check, you can add handler to each state.
 Each state has the following handlers:
-1. __init__ - is state contructor (called when entry to state).
-2. __fini__ - is state destructor (called when leave state).
-3. __handler__ - is state handler (called every time, is still in state).
+* `init` - is state contructor (called when entry to state).
+* `fini` - is state destructor (called when leave state).
+* `handler` - is state handler (called every time, is still in state).
 
 Each handler can return the following values: __nil__ - nothing is done (method `.parse` return `true`)
 and __any__ values for break parsing (method `.parse` return `false`). For break parsing process you
@@ -114,6 +111,9 @@ We create the following handlers:
 For `comment-block` state set ignore char - `*`, and handler don't called to this chars.
 The result is a file with the following content of 'parser_example.rb':
 
+Constructors and destructors handlers will be getting array chars with own templates.
+For example `doc_init` getting follow array chars: `['/', '/', '/']`
+
 *source № 2*:
 ```ruby
 require 'iparser'
@@ -131,15 +131,15 @@ $fout = File.new( 'index.html', 'w' )
 
 # Create initializer method for parser-states.
 def doc_init ( str )
-  $fout.print "<p>"
+  $fout.print "<p>"; return nil
 end
 # Create handler method for parser-states.
 def doc_handler ( c )
-  $fout.print c
+  $fout.print c; return nil
 end
 # Create finalizer method for parser-states.
 def doc_fini ( str )
-  $fout.puts "</p>"
+  $fout.puts "</p>"; return nil
 end
 
 # Create parser-machine object.
@@ -156,6 +156,11 @@ parser.addstate ps_idle
 parser.addstate ps_cline
 parser.addstate ps_cblock
 
+# Add branch indexes to 'comment-line' and 'comment-block' state.
+# From 'idle' we can branch to 'comment-line' or 'comment-block' states.
+ps_idle.branches << parser.state_index( ps_cline )
+ps_idle.branches << parser.state_index( ps_cblock )
+
 # Describe 'comment-line' state.
 # Set template for entry this state (String or Regexp).
 ps_cline.entry << '/'
@@ -167,10 +172,6 @@ ps_cline.leave << /[\n\r]/
 ps_cline.init( method(:doc_init) )
 ps_cline.handler( method(:doc_handler) )
 ps_cline.fini( method(:doc_fini) )
-# Add branch indexes to 'comment-line' and 'comment-block' state.
-# From 'idle' we can branch to 'comment-line' or 'comment-block' states.
-ps_idle.branches << parser.state_index( ps_cline )
-ps_idle.branches << parser.state_index( ps_cblock )
 
 # Describe 'comment-block' state.
 # Set template for entry this state (String or Regexp).
@@ -283,12 +284,16 @@ end
 
 Details information for each patch.
 
+##### 1.1.6
+* Fixed bug in analyse `leave` template (incorrectly handling, if `entry` and `leave` is begin with identical symbol).
+* Now `ignore` template enabled for all handlers (init, fini, handler).
+
 ##### 1.1.5
 * Add method `.current_state` for return name (String) of current state in parser-machine.
 
 ##### 1.1.4
 * Add method `.state_index` for return index of parser-state.
-* Add analyes result of any handler (init, fini, handler).
+* Add analyse result of any handler (init, fini, handler).
 * Now `entry` and `leave` templates you can set a string or regular expression.
 
 ## Development

data/lib/iparser.rb

@@ -331,6 +331,7 @@ module Iparser
 	    return -1
 	  end
 	  backtag = 1
+	  mindex  = -1
 	else
 	  #
 	  # Нет совпадения, но если уже часть сравнений
@@ -380,7 +381,7 @@ module Iparser
 	end
 	#
 	# Анализ количества совпадений.
-	case mcount
+	case (mcount + backtag)
 	#
 	# нет совпадений.
 	when 0
@@ -389,8 +390,12 @@ module Iparser
 	# однозначное совпадение, но весь массив шаблонов
 	# еще не пройден.
 	when 1
-	  @matchstate[:state] = 1
-	  @matchstate[:index] = mindex
+	  if mindex == -1 then
+	    @matchstate[:state] = 2
+	  else
+	    @matchstate[:state] = 1
+	    @matchstate[:index] = mindex
+	  end
 	  return -2
 	#
 	# нет однозначного соответствия.
@@ -398,7 +403,7 @@ module Iparser
 	  return -2
 	end
 	
-      # Состояние точно определено.
+      # Состояние точно определено (переход в перед).
       # :state = 1
       when 1
 	i = @matchstate[:index]
@@ -429,6 +434,36 @@ module Iparser
 	@states[i].ientry = 0
 	@matchstate[:state] = 0
 	return -3
+	
+      # Состояние точно определено (возврат назад).
+      # :state = 2
+      when 2
+	if cmp( state.leave, state.ileave ) then
+	  state.ileave = state.ileave.next
+	  #
+	  # Возврат в предыдущее состояние.
+	  if state.ileave >= state.leave.size then
+	    @matchstate[:state] = 0
+	    return -1
+	  end
+	  return -2
+	end
+	#
+	# Нет совпадения, но если уже часть сравнений
+	# успешна, то возможно входной символ совпадает
+	# с предыдущими, уже совпавшими символами,
+	# т.е. как откат в режиме <wait>.
+	#
+	i = checkback( state.leave, state.ileave )
+
+	if i != -1 then
+	  state.ileave = i.next
+	  return -2
+	end
+	state.ileave = 0
+	@matchstate[:state] = 0
+	return -3
+	
       end # case @matchstate
     end
 
@@ -446,6 +481,11 @@ module Iparser
       # 
       @buffer << c
 
+      # Задан шаблон для игнорирования символов.
+      if @chain.last.ignore.size > 0 then
+        return retval if @chain.last.ignore.include?(c)
+      end
+      
       # Проверка переходов в другие состояния.
       r = classify( @chain.last )
 
@@ -487,36 +527,31 @@ module Iparser
 	# буфер надо обработать.
 	@buffer.each do |ch|
 	  @parserstate = 'miss'
-	  tag = true
-	  if @chain.last.ignore.size > 0 then
-	    tag = false if @chain.last.ignore.include?(ch)
-	  end
-	  if tag == true then
-	    r = @chain.last.run_handler( ch )
-	    #
-	    # Анализ результата обработки состояния.
-	    case r.class.to_s
-	    #
-	    # Fixnum - переход на любое состояние (индекс).
-	    when 'Fixnum'
-	      if( (r >= 0) && (r < @states.size) ) then
-		@chain << @states[r]
-		reset( )
-		@parserstate = 'hardset'
-	      else
-		raise TypeError, "Method <#{@chain.last.statename}> return incorrectly index."
-	      end
-	    #
-	    # nil - ничего не возвращает.
-	    when 'NilClass'
-	    #
-	    # else - расценивается как ошибка обработки.
-	    # обработка ложится на плечи разработчика.
+	  
+	  r = @chain.last.run_handler( ch )
+	  #
+	  # Анализ результата обработки состояния.
+	  case r.class.to_s
+	  #
+	  # Fixnum - переход на любое состояние (индекс).
+	  when 'Fixnum'
+	    if( (r >= 0) && (r < @states.size) ) then
+	      @chain << @states[r]
+	      reset( )
+	      @parserstate = 'hardset'
 	    else
-	      @parserstate = 'error'
-	      retval = false
-	      break
+	      raise TypeError, "Method <#{@chain.last.statename}> return incorrectly index."
 	    end
+	  #
+	  # nil - ничего не возвращает.
+	  when 'NilClass'
+	  #
+	  # else - расценивается как ошибка обработки.
+	  # обработка ложится на плечи разработчика.
+	  else
+	    @parserstate = 'error'
+	    retval = false
+	    break
 	  end
 	end
 	@buffer = []

data/lib/iparser/version.rb

@@ -1,3 +1,3 @@
 module Iparser
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iparser
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - gera-gas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler