Import set 1.0.1

- Eliminate warnings
- Convert rdoc to markdown
This commit is contained in:
Akinori MUSHA 2020-12-22 21:41:44 +09:00
parent f08cbdbf7d
commit 96b8816793
4 changed files with 73 additions and 69 deletions

View File

@ -1,35 +1,31 @@
#--
# frozen_string_literal: true # frozen_string_literal: true
# :markup: markdown
# #
# set.rb - defines the Set class # set.rb - defines the Set class
#++ #
# Copyright (c) 2002-2016 Akinori MUSHA <knu@iDaemons.org> # Copyright (c) 2002-2020 Akinori MUSHA <knu@iDaemons.org>
# #
# Documentation by Akinori MUSHA and Gavin Sinclair. # Documentation by Akinori MUSHA and Gavin Sinclair.
# #
# All rights reserved. You can redistribute and/or modify it under the same # All rights reserved. You can redistribute and/or modify it under the same
# terms as Ruby. # terms as Ruby.
#
# $Id$
# ##
# == Overview
#
# This library provides the Set class, which deals with a collection # This library provides the Set class, which deals with a collection
# of unordered values with no duplicates. It is a hybrid of Array's # of unordered values with no duplicates. It is a hybrid of Array's
# intuitive inter-operation facilities and Hash's fast lookup. # intuitive inter-operation facilities and Hash's fast lookup.
# #
# The method +to_set+ is added to Enumerable for convenience. # The method `to_set` is added to Enumerable for convenience.
# #
# Set implements a collection of unordered values with no duplicates. # Set implements a collection of unordered values with no duplicates.
# This is a hybrid of Array's intuitive inter-operation facilities and # This is a hybrid of Array's intuitive inter-operation facilities and
# Hash's fast lookup. # Hash's fast lookup.
# #
# Set is easy to use with Enumerable objects (implementing +each+). # Set is easy to use with Enumerable objects (implementing `each`).
# Most of the initializer methods and binary operators accept generic # Most of the initializer methods and binary operators accept generic
# Enumerable objects besides sets and arrays. An Enumerable object # Enumerable objects besides sets and arrays. An Enumerable object
# can be converted to Set using the +to_set+ method. # can be converted to Set using the `to_set` method.
# #
# Set uses Hash as storage, so you must note the following points: # Set uses Hash as storage, so you must note the following points:
# #
@ -42,15 +38,16 @@
# * When a string is to be stored, a frozen copy of the string is # * When a string is to be stored, a frozen copy of the string is
# stored instead unless the original string is already frozen. # stored instead unless the original string is already frozen.
# #
# == Comparison # ## Comparison
# #
# The comparison operators <, >, <=, and >= are implemented as # The comparison operators `<`, `>`, `<=`, and `>=` are implemented as
# shorthand for the {proper_,}{subset?,superset?} methods. # shorthand for the {proper_,}{subset?,superset?} methods. The `<=>`
# The <=> operator reflects this order, or return `nil` for # operator reflects this order, or return `nil` for sets that both
# sets that both have distinct elements ({x, y} vs. {x, z} for example). # have distinct elements (`{x, y}` vs. `{x, z}` for example).
# #
# == Example # ## Example
# #
# ```ruby
# require 'set' # require 'set'
# s1 = Set[1, 2] #=> #<Set: {1, 2}> # s1 = Set[1, 2] #=> #<Set: {1, 2}>
# s2 = [1, 2].to_set #=> #<Set: {1, 2}> # s2 = [1, 2].to_set #=> #<Set: {1, 2}>
@ -59,10 +56,11 @@
# s1.merge([2, 6]) #=> #<Set: {1, 2, "foo", 6}> # s1.merge([2, 6]) #=> #<Set: {1, 2, "foo", 6}>
# s1.subset?(s2) #=> false # s1.subset?(s2) #=> false
# s2.subset?(s1) #=> true # s2.subset?(s1) #=> true
# ```
# #
# == Contact # ## Contact
# #
# - Akinori MUSHA <knu@iDaemons.org> (current maintainer) # - Akinori MUSHA <<knu@iDaemons.org>> (current maintainer)
# #
class Set class Set
include Enumerable include Enumerable
@ -199,9 +197,9 @@ class Set
end end
# Returns self if no arguments are given. Otherwise, converts the # Returns self if no arguments are given. Otherwise, converts the
# set to another with klass.new(self, *args, &block). # set to another with `klass.new(self, *args, &block)`.
# #
# In subclasses, returns klass.new(self, *args, &block) unless # In subclasses, returns `klass.new(self, *args, &block)` unless
# overridden. # overridden.
def to_set(klass = Set, *args, &block) def to_set(klass = Set, *args, &block)
return self if instance_of?(Set) && klass == Set && block.nil? && args.empty? return self if instance_of?(Set) && klass == Set && block.nil? && args.empty?
@ -330,7 +328,7 @@ class Set
end end
# Returns true if the set and the given set have no element in # Returns true if the set and the given set have no element in
# common. This method is the opposite of +intersect?+. # common. This method is the opposite of `intersect?`.
# #
# Set[1, 2, 3].disjoint? Set[3, 4] #=> false # Set[1, 2, 3].disjoint? Set[3, 4] #=> false
# Set[1, 2, 3].disjoint? Set[4, 5] #=> true # Set[1, 2, 3].disjoint? Set[4, 5] #=> true
@ -347,7 +345,7 @@ class Set
self self
end end
# Adds the given object to the set and returns self. Use +merge+ to # Adds the given object to the set and returns self. Use `merge` to
# add many elements at once. # add many elements at once.
# #
# Set[1, 2].add(3) #=> #<Set: {1, 2, 3}> # Set[1, 2].add(3) #=> #<Set: {1, 2, 3}>
@ -369,8 +367,8 @@ class Set
add(o) unless include?(o) add(o) unless include?(o)
end end
# Deletes the given object from the set and returns self. Use +subtract+ to # Deletes the given object from the set and returns self. Use
# delete many items at once. # `subtract` to delete many items at once.
def delete(o) def delete(o)
@hash.delete(o) @hash.delete(o)
self self
@ -404,7 +402,7 @@ class Set
self self
end end
# Replaces the elements with ones returned by collect(). # Replaces the elements with ones returned by `collect()`.
# Returns an enumerator if no block is given. # Returns an enumerator if no block is given.
def collect! def collect!
block_given? or return enum_for(__method__) { size } block_given? or return enum_for(__method__) { size }
@ -496,8 +494,8 @@ class Set
alias intersection & alias intersection &
# Returns a new set containing elements exclusive between the set # Returns a new set containing elements exclusive between the set
# and the given enumerable object. (set ^ enum) is equivalent to # and the given enumerable object. `(set ^ enum)` is equivalent to
# ((set | enum) - (set & enum)). # `((set | enum) - (set & enum))`.
# #
# Set[1, 2] ^ Set[2, 3] #=> #<Set: {3, 1}> # Set[1, 2] ^ Set[2, 3] #=> #<Set: {3, 1}>
# Set[1, 'b', 'c'] ^ ['b', 'd'] #=> #<Set: {"d", 1, "c"}> # Set[1, 'b', 'c'] ^ ['b', 'd'] #=> #<Set: {"d", 1, "c"}>
@ -685,7 +683,7 @@ end
module Enumerable module Enumerable
# Makes a set from the enumerable object with given arguments. # Makes a set from the enumerable object with given arguments.
# Needs to +require "set"+ to use this method. # Needs to `require "set"` to use this method.
def to_set(klass = Set, *args, &block) def to_set(klass = Set, *args, &block)
klass.new(self, *args, &block) klass.new(self, *args, &block)
end end

View File

@ -1,6 +1,6 @@
Gem::Specification.new do |spec| Gem::Specification.new do |spec|
spec.name = "set" spec.name = "set"
spec.version = "1.0.0" spec.version = "1.0.1"
spec.authors = ["Akinori MUSHA"] spec.authors = ["Akinori MUSHA"]
spec.email = ["knu@idaemons.org"] spec.email = ["knu@idaemons.org"]

View File

@ -1,3 +1,9 @@
class SortedSet Object.instance_exec do
# Remove the constant to cancel autoload that would be fired by
# `class SortedSet` and cause circular require.
remove_const :SortedSet if const_defined?(:SortedSet)
end
class SortedSet < Set
# ... # ...
end end

View File

@ -22,7 +22,7 @@ class TC_SortedSet < Test::Unit::TestCase
rescue Exception => e rescue Exception => e
e.message e.message
end end
raise r unless r.match? /has been extracted/ raise r unless r.match?(/has been extracted/)
RUBY RUBY
end end