story-gen 0.1.5 → 0.1.7

data/NEWS

@@ -1,3 +1,6 @@
+0.1.7
+  Bug fixes, extract Parse into separate gem
+
 0.1.5:
   Add "once" and "UniqueNames.delete"
 

data/lib/array/chomp.rb

@@ -5,6 +5,11 @@ class Array
   # 
   # @return [self]
   # 
+  # @example
+  # 
+  #   [1, 2, 3].chomp!(3)  #=> [1, 2]
+  #   [1, 2, 3].chomp!(2)  #=> [1, 2, 3]
+  # 
   def chomp!(item)
     self.pop if item == self.last
     return self
@@ -16,6 +21,3 @@ class Array
   end
   
 end
-
-# p [1, 2, 3].chomp(3)
-# p [1, 2, 3].chomp(2)

data/lib/array/to_h.rb

@@ -1,9 +1,13 @@
 
-class Array
+unless Array.method_defined? :to_h
   
-  # @return [Hash]
-  def to_h
-    self.reduce({}) { |h, e| h[e.first] = e.last; h }
+  class Array
+    
+    # @return [Hash]
+    def to_h
+      self.reduce({}) { |h, e| h[e.first] = e.last; h }
+    end
+    
   end
   
 end

data/lib/integer/of.rb

@@ -0,0 +1,11 @@
+
+class Integer
+  
+  # @return [Array] an {Array} of n results of call to +block+, where n is self.
+  def of(&block)
+    r = []
+    self.times { r.push(block.()) }
+    return r;
+  end
+  
+end

data/lib/names.rb

@@ -0,0 +1,237 @@
+# encoding: UTF-8
+
+class Names
+  
+  # @return [Array<String>]
+  def self.russian_male
+    %W{
+      Адам
+      Адриан
+      Александр
+      Алексей
+      Анатолий
+      Андрей
+      Антон
+      Аркадий
+      Арсений
+      Артем
+      Артур
+
+      Богдан
+      Борис
+
+      Вадим
+      Валентин
+      Валерий
+      Василий
+      Виктор
+      Виталий
+      Владимир
+      Владислав
+      Вячеслав
+
+      Геннадий
+      Георгий
+      Герман
+      Глеб
+      Григорий
+
+      Давид
+      Даниил
+      Денис
+      Дмитрий
+
+      Евгений
+      Егор
+      Ефим
+
+      Захар
+
+      Иван
+      Игорь
+      Илья
+
+      Кирилл
+      Константин
+
+      Лев
+      Леонид
+
+      Максим
+      Марк
+      Матвей
+      Мирослав
+      Михаил
+
+      Назар
+      Нестор
+      Никита
+      Николай
+
+      Олег
+      Орест
+      Оскар
+      Остап
+
+      Павел
+      Петр
+      Платон
+
+      Ренат
+      Родион
+      Роман
+      Ростислав
+      Руслан
+
+      Святослав
+      Семен
+      Сергей
+      Станислав
+      Степан
+
+      Тарас
+      Тимофей
+      Тимур
+
+      Федор
+      Филипп
+
+      Эдуард
+
+      Юрий
+
+      Яков
+      Ян
+      Ярослав
+    }
+  end
+  
+  # @return [Array<String>]
+  def self.russian_female
+    %W{
+      Агата
+      Ада
+      Адель
+      Адриана
+      Алевтина
+      Александра
+      Алина
+      Алиса
+      Алла
+      Альбина
+      Анастасия
+      Ангелина
+      Анжела
+      Анна
+      Антонина
+      Анфиса
+      Арина
+
+      Богдана
+      Борислава
+
+      Валентина
+      Валерия
+      Варвара
+      Василиса
+      Вера
+      Вероника
+      Виктория
+      Виолетта
+
+      Галина
+
+      Дарья
+      Диана
+
+      Ева
+      Евгения
+      Екатерина
+      Елена
+      Елизавета
+
+      Жанна
+
+      Зинаида
+      Зоя
+
+      Илона
+      Инга
+      Инесса
+      Инна
+      Ирина
+
+      Карина
+      Кира
+      Клавдия
+      Клара
+      Кристина
+      Ксения
+
+      Лариса
+      Лидия
+      Лилия
+      Любовь
+      Людмила
+
+      Майя
+      Маргарита
+      Марина
+      Мария
+      Марта
+      Марьяна
+      Мирослава
+
+      Надежда
+      Наталья
+      Нелли
+      Нина
+
+      Оксана
+      Ольга
+
+      Полина
+
+      Раиса
+      Регина
+      Римма
+      Роза
+      Роксана
+      Руслана
+
+      Светлана
+      Снежана
+      София
+
+      Таисия
+      Тамара
+      Татьяна
+
+      Ульяна
+
+      Христина
+
+      Эвелина
+      Элеонора
+      Эльвира
+      Эмма
+
+      Юлиана
+      Юлия
+
+      Яна
+      Ярослава
+    }
+  end
+  
+  # @return [Array<String>]
+  def self.english_male
+    ["Jack", "Thomas", "Joshua", "Oliver", "Harry", "James", "Charlie", "William", "Daniel", "Samuel", "Alfie", "Benjamin", "Joseph", "George", "Callum", "Jake", "Ethan", "Lewis", "Luke", "Mohammed", "Matthew", "Dylan", "Jacob", "Alexander", "Ryan", "Adam", "Tyler", "Harvey", "Liam", "Max", "Cameron", "Harrison", "Jamie", "Jayden", "Leo", "Owen", "Henry", "Connor", "Archie", "Nathan", "Ben", "Muhammad", "Oscar", "Edward", "Lucas", "Michael", "Isaac", "Aaron", "Kyle", "Noah", "Finley", "Rhys", "Bradley", "Charles", "Toby", "Louis", "Brandon", "Logan", "Mason", "Reece", "Kieran", "Alex", "Riley", "Finlay", "Kai", "Freddie", "David", "Harley", "Kian", "Mohammad", "Bailey", "Sam", "Luca", "Joel", "Theo", "Leon", "John", "Robert", "Ashton", "Ellis", "Joe", "Aidan", "Billy", "Corey", "Hayden", "Evan", "Zachary", "Taylor", "Christopher", "Sebastian", "Elliot", "Morgan", "Jay", "Dominic", "Reuben", "Gabriel", "Sean", "Louie", "Andrew", "Frederick", "Ewan", "Zak"]
+  end
+  
+  # @return [Array<String>]
+  def self.english_female
+    ["Olivia", "Grace", "Ruby", "Jessica", "Emily", "Sophie", "Chloe", "Lucy", "Lily", "Ella", "Ellie", "Amelia", "Charlotte", "Katie", "Mia", "Hannah", "Evie", "Megan", "Amy", "Isabella", "Millie", "Isabelle", "Abigail", "Freya", "Molly", "Daisy", "Holly", "Emma", "Erin", "Poppy", "Jasmine", "Phoebe", "Leah", "Keira", "Caitlin", "Imogen", "Madison", "Rebecca", "Elizabeth", "Georgia", "Sophia", "Lauren", "Scarlett", "Amber", "Ava", "Eleanor", "Bethany", "Alice", "Isabel", "Summer", "Paige", "Anna", "Lola", "Libby", "Eva", "Maisie", "Isobel", "Brooke", "Lilly", "Alisha", "Tia", "Sarah", "Amelie", "Gracie", "Faith", "Rosie", "Courtney", "Matilda", "Niamh", "Maddison", "Sienna", "Eve", "Aimee", "Skye", "Zara", "Isla", "Shannon", "Madeleine", "Harriet", "Zoe", "Nicole", "Sofia", "Abbie", "Maya", "Lacey", "Rachel", "Francesca", "Layla", "Lydia", "Alicia", "Hollie", "Martha", "Alexandra", "Julia", "Natasha", "Lexie", "Mollie", "Morgan", "Maria", "Demi", "Rose", "Laura", "Lara", "Victoria", "Tilly", "Sara", "Evelyn", "Eloise"]
+  end
+  
+end

data/lib/story/compile.rb

@@ -53,7 +53,6 @@ class Story
     #
     c = code <<
       "require 'enumerable/empty'\n"<<
-      "require 'enumerable/lazy'\n"<<
       "require 'set'\n"<<
       "require 'story'\n"<<
       "require 'enumerable/new'\n"<<

data/lib/unique_names.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 require 'set'
 require 'once'
+require 'names'
 
 # Infinite set of unique names.
 class UniqueNames
@@ -11,239 +12,27 @@ class UniqueNames
     @base_names = base_names
     @postfix_id = 0
     @deleted_names = Set.new
-    reinit_current_names()
+    reinit_current_names
   end
   
   # @return [UniqueNames]
   def self.russian_male
-    UniqueNames.new %W{
-      Адам
-      Адриан
-      Александр
-      Алексей
-      Анатолий
-      Андрей
-      Антон
-      Аркадий
-      Арсений
-      Артем
-      Артур
-
-      Богдан
-      Борис
-
-      Вадим
-      Валентин
-      Валерий
-      Василий
-      Виктор
-      Виталий
-      Владимир
-      Владислав
-      Вячеслав
-
-      Геннадий
-      Георгий
-      Герман
-      Глеб
-      Григорий
-
-      Давид
-      Даниил
-      Денис
-      Дмитрий
-
-      Евгений
-      Егор
-      Ефим
-
-      Захар
-
-      Иван
-      Игорь
-      Илья
-
-      Кирилл
-      Константин
-
-      Лев
-      Леонид
-
-      Максим
-      Марк
-      Матвей
-      Мирослав
-      Михаил
-
-      Назар
-      Нестор
-      Никита
-      Николай
-
-      Олег
-      Орест
-      Оскар
-      Остап
-
-      Павел
-      Петр
-      Платон
-
-      Ренат
-      Родион
-      Роман
-      Ростислав
-      Руслан
-
-      Святослав
-      Семен
-      Сергей
-      Станислав
-      Степан
-
-      Тарас
-      Тимофей
-      Тимур
-
-      Федор
-      Филипп
-
-      Эдуард
-
-      Юрий
-
-      Яков
-      Ян
-      Ярослав
-    }
+    UniqueNames.new(Names.russian_male)
   end
   
   # @return [UniqueNames]
   def self.russian_female
-    UniqueNames.new %W{
-      Агата
-      Ада
-      Адель
-      Адриана
-      Алевтина
-      Александра
-      Алина
-      Алиса
-      Алла
-      Альбина
-      Анастасия
-      Ангелина
-      Анжела
-      Анна
-      Антонина
-      Анфиса
-      Арина
-
-      Богдана
-      Борислава
-
-      Валентина
-      Валерия
-      Варвара
-      Василиса
-      Вера
-      Вероника
-      Виктория
-      Виолетта
-
-      Галина
-
-      Дарья
-      Диана
-
-      Ева
-      Евгения
-      Екатерина
-      Елена
-      Елизавета
-
-      Жанна
-
-      Зинаида
-      Зоя
-
-      Илона
-      Инга
-      Инесса
-      Инна
-      Ирина
-
-      Карина
-      Кира
-      Клавдия
-      Клара
-      Кристина
-      Ксения
-
-      Лариса
-      Лидия
-      Лилия
-      Любовь
-      Людмила
-
-      Майя
-      Маргарита
-      Марина
-      Мария
-      Марта
-      Марьяна
-      Мирослава
-
-      Надежда
-      Наталья
-      Нелли
-      Нина
-
-      Оксана
-      Ольга
-
-      Полина
-
-      Раиса
-      Регина
-      Римма
-      Роза
-      Роксана
-      Руслана
-
-      Светлана
-      Снежана
-      София
-
-      Таисия
-      Тамара
-      Татьяна
-
-      Ульяна
-
-      Христина
-
-      Эвелина
-      Элеонора
-      Эльвира
-      Эмма
-
-      Юлиана
-      Юлия
-
-      Яна
-      Ярослава
-    }
+    UniqueNames.new(Names.russian_female)
   end
   
   # @return [UniqueNames]
   def self.english_male
-    UniqueNames.new ["Jack", "Thomas", "Joshua", "Oliver", "Harry", "James", "Charlie", "William", "Daniel", "Samuel", "Alfie", "Benjamin", "Joseph", "George", "Callum", "Jake", "Ethan", "Lewis", "Luke", "Mohammed", "Matthew", "Dylan", "Jacob", "Alexander", "Ryan", "Adam", "Tyler", "Harvey", "Liam", "Max", "Cameron", "Harrison", "Jamie", "Jayden", "Leo", "Owen", "Henry", "Connor", "Archie", "Nathan", "Ben", "Muhammad", "Oscar", "Edward", "Lucas", "Michael", "Isaac", "Aaron", "Kyle", "Noah", "Finley", "Rhys", "Bradley", "Charles", "Toby", "Louis", "Brandon", "Logan", "Mason", "Reece", "Kieran", "Alex", "Riley", "Finlay", "Kai", "Freddie", "David", "Harley", "Kian", "Mohammad", "Bailey", "Sam", "Luca", "Joel", "Theo", "Leon", "John", "Robert", "Ashton", "Ellis", "Joe", "Aidan", "Billy", "Corey", "Hayden", "Evan", "Zachary", "Taylor", "Christopher", "Sebastian", "Elliot", "Morgan", "Jay", "Dominic", "Reuben", "Gabriel", "Sean", "Louie", "Andrew", "Frederick", "Ewan", "Zak"]
+    UniqueNames.new(Names.english_male)
   end
   
   # @return [UniqueNames]
   def self.english_female
-    UniqueNames.new ["Olivia", "Grace", "Ruby", "Jessica", "Emily", "Sophie", "Chloe", "Lucy", "Lily", "Ella", "Ellie", "Amelia", "Charlotte", "Katie", "Mia", "Hannah", "Evie", "Megan", "Amy", "Isabella", "Millie", "Isabelle", "Abigail", "Freya", "Molly", "Daisy", "Holly", "Emma", "Erin", "Poppy", "Jasmine", "Phoebe", "Leah", "Keira", "Caitlin", "Imogen", "Madison", "Rebecca", "Elizabeth", "Georgia", "Sophia", "Lauren", "Scarlett", "Amber", "Ava", "Eleanor", "Bethany", "Alice", "Isabel", "Summer", "Paige", "Anna", "Lola", "Libby", "Eva", "Maisie", "Isobel", "Brooke", "Lilly", "Alisha", "Tia", "Sarah", "Amelie", "Gracie", "Faith", "Rosie", "Courtney", "Matilda", "Niamh", "Maddison", "Sienna", "Eve", "Aimee", "Skye", "Zara", "Isla", "Shannon", "Madeleine", "Harriet", "Zoe", "Nicole", "Sofia", "Abbie", "Maya", "Lacey", "Rachel", "Francesca", "Layla", "Lydia", "Alicia", "Hollie", "Martha", "Alexandra", "Julia", "Natasha", "Lexie", "Mollie", "Morgan", "Maria", "Demi", "Rose", "Laura", "Lara", "Victoria", "Tilly", "Sara", "Evelyn", "Eloise"]
+    UniqueNames.new(Names.english_female)
   end
   
   # @param [String] name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: story-gen
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-28 00:00:00.000000000 Z
-dependencies: []
+date: 2016-05-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: parse-framework
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Generate stories from descriptions based on Facts!
 email: various.furriness@gmail.com
 executables:
@@ -19,11 +35,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/once.rb
-- lib/strscan/substr.rb
 - lib/any.rb
+- lib/integer/of.rb
 - lib/fact.rb
 - lib/story/compile.rb
 - lib/story/samples_dir.rb
+- lib/names.rb
 - lib/array/case_equal_fixed.rb
 - lib/array/separate.rb
 - lib/array/to_h.rb
@@ -31,14 +48,12 @@ files:
 - lib/string/ru_downcase.rb
 - lib/string/lchomp.rb
 - lib/story.rb
-- lib/parse.rb
 - lib/enumerable/empty.rb
 - lib/enumerable/lazy.rb
 - lib/enumerable/new.rb
 - lib/enumerable/sample.rb
 - lib/hash/put.rb
 - lib/unique_names.rb
-- lib/code.rb
 - lib/object/map_.rb
 - lib/object/to_rb.rb
 - README.md

data/lib/code.rb

@@ -1,138 +0,0 @@
-
-class Code
-  
-  # @api private
-  # @note used by {Code}, {::code}, {::non_code} only.
-  # 
-  # @param [Array<String, NonCodePart>] parts
-  # @param [Object, nil] metadata
-  # 
-  def initialize(parts, metadata = nil)
-    @parts = parts
-    @metadata = metadata
-  end
-  
-  # @overload + str
-  #   @param [String] str
-  #   @return [Code]
-  # @overload + code
-  #   @param [Code] code
-  #   @return [Code]
-  def + arg
-    case arg
-    when String then self + Code.new([arg])
-    when Code then Code.new(self.parts + arg.parts)
-    end
-  end
-  
-  # @overload << str
-  #   Appends +str+ to self.
-  #   @param [String] str
-  #   @return [self]
-  # @overload << code
-  #   Appends +str+ to self.
-  #   @param [Code] code
-  #   @return [self]
-  def << arg
-    case arg
-    when String then self << Code.new([arg])
-    when Code then @parts.concat(arg.parts); self
-    end
-  end
-  
-  # @overload metadata(obj)
-  #   @param [Object] obj
-  #   @return [Code] a {Code} with +obj+ attached to it. The +obj+ can later
-  #     be retrieved with {#metadata}().
-  # @overload metadata
-  #   @return [Object, nil] an {Object} attached to this {Code} with
-  #     {#metadata}(obj) or nil if no {Object} is attached.
-  def metadata(*args)
-    if args.empty?
-    then @metadata
-    else Code.new(@parts, args.first)
-    end
-  end
-  
-  # @yieldparam [Object] part
-  # @yieldreturn [String]
-  # @return [Code] a {Code} with {#non_code_parts} mapped by the passed block.
-  def map_non_code_parts(&f)
-    Code.new(
-      @parts.map do |part|
-        case part
-        when String then part
-        when NonCodePart then f.(part.data)
-        end
-      end
-    )
-  end
-  
-  # @return [Enumerable<Object>] non-code parts of this {Code} introduced
-  #   with {::non_code}. See also {#map_non_code_parts}.
-  def non_code_parts
-    @parts.select { |part| part.is_a? NonCodePart }.map(&:data)
-  end
-  
-  # @return [String]
-  def to_s
-    if (x = @parts.find { |part| part.is_a? NonCodePart }) then
-      raise "non-code part: #{x.inspect}"
-    end
-    @parts.join
-  end
-  
-  # @return [String]
-  def inspect
-    Inspectable.new(@parts, @metadata).inspect
-  end
-  
-  # @api private
-  # @note used by {Code}, {::non_code} only.
-  NonCodePart = Struct.new :data
-  
-  protected
-  
-  # @!visibility private
-  attr_reader :parts
-  
-  private
-  
-  # @!visibility private
-  Inspectable = Struct.new :parts, :metadata
-  
-end
-
-class Array
-  
-  # @param [Code, String] delimiter
-  # @return [Code]
-  def join_code(delimiter = "")
-    self.reduce do |r, self_i|
-      code << r << delimiter << self_i
-    end or
-    code
-  end
-  
-end
-
-# @overload code
-#   @return [Code] an empty {Code}.
-# @overload code(str)
-#   @param [String] str
-#   @return [Code] +str+ converted to {Code}.
-def code(str = nil)
-  if str
-  then Code.new([str])
-  else Code.new([])
-  end
-end
-
-# @param [Object] data
-# @return [Code] a {Code} consisting of the single non-code part +data+.
-#   See also {Code#non_code_parts}.
-def non_code(data)
-  Code.new([Code::NonCodePart.new(data)])
-end
-
-alias __non_code__ non_code

data/lib/parse.rb

@@ -1,468 +0,0 @@
-require 'strscan'
-require 'strscan/substr'
-
-# To disable YARD warnings:
-# @!parse
-#   class Exception
-#     def message
-#     end
-#   end
-#   class Array
-#   end
-#   class String
-#   end
-
-class Parse
-  
-  # 
-  # parses +text+.
-  # 
-  # If $DEBUG == true then it prints {#rule} calls to stdout.
-  # 
-  # @param [String] text
-  # @param [String] file file the +text+ is taken from.
-  # @raise [Parse::Error, IOError]
-  # @return [Object] what {#start} returns (non-nil).
-  # 
-  def call(text, file = "-")
-    @text = StringScanner.new(text)
-    @file = file
-    @most_probable_error = nil
-    @allow_errors = true
-    @rule_start_pos = nil
-    r = start()
-    if r.nil? or not @text.eos? then
-      if @most_probable_error
-      then raise @most_probable_error
-      else raise Error.new(Position.new(@text.pos, @text, @file), "syntax error")
-      end
-    end
-    return r
-  end
-  
-  class Position
-    
-    include Comparable
-    
-    # @api private
-    # @note used by {Parse#pos} only
-    # @param [Integer] text_pos
-    # @param [StringScanner] text
-    # @param [String] file
-    def initialize(text_pos, text, file)
-      @text = text
-      @text_pos = text_pos
-      @file = file
-    end
-    
-    # @return [String]
-    attr_reader :file
-    
-    # @return [Integer]
-    def line
-      line_and_column[0]
-    end
-    
-    # @return [Integer]
-    def column
-      line_and_column[1]
-    end
-    
-    # @param [Object] other
-    # @return [-1, 0, 1, nil]
-    def <=> other
-      return nil unless other.is_a? Position and self.text.equal? other.text
-      self.text_pos <=> other.text_pos
-    end
-    
-    # @param [Object] other
-    # @return [Boolean]
-    def == other
-      (self <=> other) == 0
-    end
-    
-    # @!visibility private
-    attr_reader :text_pos
-    
-    # @!visibility private
-    attr_reader :text
-    
-    private
-    
-    def line_and_column
-      @line_and_column ||= begin
-        s = @text.substr(0, @text_pos)
-        lines = s.split("\n", -1).to_a
-        [
-          line = if lines.size == 0 then 0 else lines.size - 1 end,
-          column = (lines.last || "").size
-        ].tap do
-          @text = nil
-        end
-      end
-    end
-    
-  end
-  
-  class Error < Exception
-    
-    # @param [Position] pos
-    # @param [String] message
-    def initialize(pos, message)
-      super(message)
-      @pos = pos
-    end
-    
-    # @return [Position]
-    attr_reader :pos
-    
-    # @param [Error] other +self+.{#pos} must be equal to +other+.{#pos}.
-    # @return [Error] an {Error} with {Exception#message} combined from
-    #   {Exception#message}s of +self+ and +other+ (using "or" word).
-    def or other
-      raise "#{self.pos} == #{other.pos} is false" unless self.pos == other.pos
-      Error.new(pos, "#{self.message} or #{other.message}")
-    end
-    
-  end
-  
-  class Expected < Error
-    
-    # @param [Position] pos
-    # @param [String] what_1
-    # @param [*String] what_2_n
-    def initialize(pos, what_1, *what_2_n)
-      @what = [what_1, *what_2_n]
-      super(pos, "#{@what.join(", ")} expected")
-    end
-    
-    # (see Error#or)
-    def or other
-      if other.is_a? Expected
-        raise "#{self.pos} == #{other.pos} is false" unless self.pos == other.pos
-        Expected.new(pos, *(self.what + other.what).uniq)
-      else
-        super(other)
-      end
-    end
-    
-    protected
-    
-    # @!visibility private
-    # @return [Array<String>]
-    attr_reader :what
-    
-  end
-  
-  protected
-  
-  # @!method start()
-  #   @abstract
-  #   
-  #   Implementation of {#call}. Or the starting rule.
-  #   
-  #   @return [Object, nil] a result of parsing or nil if the parsing failed.
-  #   @raise [Parse::Error] if the parsing failed.
-  #   @raise [IOError]
-  #   
-  
-  # @return [Position] current {Position} in +text+ passed to {#call}.
-  def pos
-    Position.new(@text.pos, @text, @file)
-  end
-  
-  # 
-  # scans +arg+ in +text+ passed to {#call} starting from {#pos} and,
-  # if scanned successfully, advances {#pos} and returns the scanned
-  # sub-{String}. Otherwise it calls {#expected} and returns nil.
-  # 
-  # @param [String, Regexp] arg
-  # @return [String, nil]
-  # 
-  def scan(arg)
-    case arg
-    when Regexp then @text.scan(arg) or expected(pos, %(regexp "#{arg.source}"))
-    when String then @text.scan(Regexp.new(Regexp.escape(arg))) or expected(pos, %("#{arg}"))
-    end
-  end
-  
-  # defines method +name+ with body +body+. Inside +body+ {#rule_start_pos}
-  # is the value of {#pos} right before the defined method's call.
-  # 
-  # @param [Symbol] name
-  # @return [void]
-  # 
-  def self.rule(name, &body)
-    define_method(name) do
-      old_rule_start_pos = @rule_start_pos
-      @rule_start_pos = pos
-      begin
-        if $DEBUG then STDERR.puts("#{pos.file}:#{pos.line+1}:#{pos.column+1}: entering rule :#{name}"); end
-        r = instance_eval(&body)
-        if $DEBUG then STDERR.puts("#{pos.file}:#{pos.line+1}:#{pos.column+1}: exiting rule :#{name} #{if r.nil? then "(with nil)" end}"); end
-        r
-      ensure
-        @rule_start_pos = old_rule_start_pos
-      end
-    end
-  end
-  
-  # See {Parse::rule}.
-  # 
-  # @return [Position]
-  # 
-  attr_reader :rule_start_pos
-  
-  # @param [ASTNode] node
-  # @return [ASTNode] +node+ which is
-  #   {ASTNode#initialize_pos}({#rule_start_pos})-ed.
-  def _1(node)
-    node.initialize_pos(rule_start_pos)
-  end
-  
-  # is {#pos} at the end of the text?
-  def end?
-    @text.eos?
-  end
-  
-  alias eos? end?
-  
-  # is {#pos} at the beginning of the text?
-  def begin?
-    @text.pos == 0
-  end
-  
-  # alias for {#_1} and {#_2}
-  def _(arg = nil, &block)
-    if arg
-    then _1(arg)
-    else _2(&block)
-    end
-  end
-  
-  # --------------------------
-  # @!group Parser Combinators
-  # --------------------------
-  
-  # calls +f+ and returns true.
-  # 
-  # @return [true]
-  def act(&f)
-    f.()
-    true
-  end
-  
-  #   
-  # calls +f+. If +f+ results in nil then it restores {#pos} to the
-  # value before the call.
-  # 
-  # @return what +f+ returns.
-  # 
-  def _2(&f)
-    old_text_pos = @text.pos
-    f.() or begin
-      @text.pos = old_text_pos
-      nil
-    end
-  end
-  
-  # calls +f+ using {#_2} many times until it returns nil.
-  # 
-  # @return [Array] an {Array} of non-nil results of +f+.
-  # 
-  def many(&f)
-    r = []
-    while true
-      f0 = _(&f)
-      if f0
-      then r.push(f0)
-      else break
-      end
-    end
-    r
-  end
-  
-  # calls +f+ using {#_2}.
-  # 
-  # @return [Array] an empty {Array} if +f+ results in nil and an {Array}
-  #   containing the single result of +f+ otherwise.
-  # 
-  def opt(&f)
-    [_(&f)].compact
-  end
-  
-  # The same as <code>f.() and many(&f)</code>.
-  # 
-  # @return [Array, nil] an {Array} of results of +f+ or nil if the first call
-  #   to +f+ returned nil.
-  # 
-  def one_or_more(&f)
-    f1 = f.() and f2_n = many(&f) and [f1, *f2_n]
-  end
-  
-  alias many1 one_or_more
-  
-  # @overload not_follows(*method_ids)
-  #   
-  #   calls methods specified by +method_ids+. If any of them returns non-nil
-  #   then this method returns nil, otherwise it returns true. The methods
-  #   are called inside {#no_errors}. {#pos} is restored after each method's
-  #   call.
-  #   
-  #   @param [Array<Symbol>] method_ids
-  #   @return [true, nil]
-  #   
-  # @overload not_follows(&f)
-  # 
-  #   calls +f+. If +f+ returns non-nil then this method returns nil,
-  #   otherwise it returns true. +f+ is called inside {#no_errors}.
-  #   {#pos} is restored after +f+'s call.
-  #   
-  #   @return [true, nil]
-  # 
-  def not_follows(*method_ids, &f)
-    if f then
-      if no_errors { _{ f.() } }
-      then nil
-      else true
-      end
-    else # if not method_ids.empty? then
-      if no_errors { method_ids.any? { |method_id| _{ __send__(method_id) } } }
-      then nil
-      else true
-      end
-    end
-  end
-  
-  # ----------
-  # @!endgroup
-  # ----------
-  
-  # --------------
-  # @!group Errors
-  # --------------
-  
-  # 
-  # sets {#most_probable_error} to +error+ if it is more probable than
-  # {#most_probable_error} or if {#most_probable_error} is nil.
-  # 
-  # @param [Error] error
-  # @return [nil]
-  # 
-  def error(error)
-    if @allow_errors then
-      if @most_probable_error.nil? or @most_probable_error.pos < error.pos then
-        @most_probable_error = error
-      elsif @most_probable_error and @most_probable_error.pos == error.pos then
-        @most_probable_error = @most_probable_error.or error
-      else
-        # do nothing
-      end
-    end
-    return nil
-  end
-  
-  # macro
-  def expected(pos, what_1, *what_2_n)
-    error(Expected.new(pos, what_1, *what_2_n))
-  end
-  
-  # macro
-  def expect(what_1, *what_2_n, &body)
-    p = pos and body.() or expected(p, what_1, *what_2_n)
-  end
-  
-  # calls +block+. Inside the +block+ {#error} has no effect.
-  # 
-  # @return what +block+ returns.
-  # 
-  def no_errors(&block)
-    old_allow_errors = @allow_errors
-    begin
-      @allow_errors = false
-      block.()
-    ensure
-      @allow_errors = old_allow_errors
-    end
-  end
-  
-  # @return [Error, nil]
-  attr_reader :most_probable_error
-  
-  # ----------
-  # @!endgroup
-  # ----------
-  
-end
-
-module ASTNode
-  
-  # macro
-  def self.new(*properties, &body)
-    (if properties.empty? then Class.new else Struct.new(*properties); end).tap do |c|
-      c.class_eval do
-        
-        include ASTNode
-        
-        # @return [Boolean]
-        def === other
-          self.class == other.class and
-          self.members.all? { |member| self.__send__(member) === other.__send__(member) }
-        end
-        
-        if properties.empty? then
-          # @return [Array<Symbol>]
-          def members
-            []
-          end
-        end
-        
-      end
-      c.class_eval(&body) if body
-    end
-  end
-  
-  # @param [Parse::Position] pos
-  # @return [self]
-  def initialize_pos(pos)
-    @pos = pos
-    self
-  end
-  
-  # @note {#initialize_pos} must be called before this method can be used.
-  # @return [Parse::Position]
-  def pos
-    raise "initialize_pos() must be called before this method can be used" unless @pos
-    @pos
-  end
-  
-end
-
-# Alias for {ASTNode#new}.
-def node(*properties, &body)
-  ASTNode.new(*properties, &body)
-end
-
-# class Calc < Parse
-#   
-#   Number = ASTNode.new :val
-#   
-#   rule :start do
-#     x1 = number and x2 = many { comma and number } and [x1, *x2]
-#   end
-#   
-#   rule :number do
-#     s = scan(/\d+/) and _(Number[s])
-#   end
-#   
-#   rule :comma do
-#     scan(",")
-#   end
-#   
-# end
-# 
-# begin
-#   p Calc.new.("10, 20", __FILE__)
-# rescue Parse::Error => e
-#   puts "error: #{e.pos.file}:#{e.pos.line}:#{e.pos.column}: #{e.message}"
-# end

data/lib/strscan/substr.rb

@@ -1,16 +0,0 @@
-
-class StringScanner
-  
-  # @param [Integer] start some value of {StringScanner#pos}.
-  # @param [Integer] end_ some value of {StringScanner#pos}.
-  # @return [String]
-  def substr(start, end_)
-    old_pos = self.pos
-    self.pos = start
-    result = peek(end_ - start)
-    self.pos = old_pos
-    return result
-  end
-  
-end
-