isomorfeus-ferret 0.13.1 → 0.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98439b4a9e6ca849246c6e2ddd2ce1bbf117182025b3651d4f6a95593aff0eb6
-  data.tar.gz: 0e1e90c4bfce1014c9983f4bb5be0f3123ef502788f464e988c4671bdd1758ed
+  metadata.gz: 19cfca9e5508c89a931678c23a5b0b32d8759d0d1839ac0ecf0b043d93cd1ddf
+  data.tar.gz: 5999edb4c8ce46718264abdfac47cdd2bcc0f8e0ddf46a0af69bfba1ec024a1c
 SHA512:
-  metadata.gz: da674772ba34175364d0d4d93023ef380eab06334b4f9c3e1956934289a7a2016387607740fb83cc11753a3bb72de62208390933ff9f4cc341524b7fe6c0c6af
-  data.tar.gz: 8261029020f33cb9fb52453e007defdfd2c1dd029f9da22a02b64ae0047bcd333e62e6d6a8d15263ee71089e203f393f5e865138a31784edf48f66a483a0ffce
+  metadata.gz: e8ab5a9574a3b610b4d554a94ecbdf3252a77d7947f81fdd21bdd0c87ed6bd0940f4842091f0bec793b4e061fe218706d0e16ef64ab19d85ca48d825a1867beb
+  data.tar.gz: 474d0d57a321f3eaf47e372f76c7102592b85c7d0bf2e8506e7e3baf6ad3cbba2b5628296b5a3cf50b9bdba3031a2712225234143343cb9dbf80bc3781d00faa

data/LICENSE

@@ -139,32 +139,6 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-lib/isomorfeus/ferret/monitor.rb originally taken from the gem 'monitor':
-
-Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-  1. Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-  2. Redistributions in binary form must reproduce the above copyright notice,
-     this list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 The following licenses apply to files, which are distributed within the repo
 but not distributed with the gem and not used at runtime:
 

data/README.md

@@ -26,7 +26,7 @@ It should work on *nixes, *nuxes, *BSDs and also works on Windows.
 - The :store option no longer accepts :compress, compression must now be specified by the separate :compress options (see below).
 - The ASCII-specific Tokenizers and Analyzers have been removed
 
-### Sring Encoding support
+### String Encoding support
 
 #### Input strings and stored fields
 
@@ -37,12 +37,13 @@ All Ruby string encodings are supported.
 When fields are stored, they are now stored with the encoding, so that when they are retrieved again, they
 retain the original encoding with positions matching the string in its original encoding.
 
-#### Tokens and Filters
+#### Tokens, Terms, Filters and Queries
 
 Tokens are internally converted to UTF-8, which may change their length compared to their original encoding,
-yet they retain position information according to the source in its original encoding.
-The benefit is, that Filters, Stemmers or anything else working with Tokens only needs to support UTF-8 encoding,
-greatly simplifying things and ensuring consistent query results.
+yet they retain position information according to the source in its original encoding. Terms are likewise stored in UTF-8 encoding.
+Queries are converted to UTF-8 encoding too.
+The benefit is, that Filters, Stemmers or anything else working with Tokens and Terms only needs to support UTF-8 encoding,
+greatly simplifying things and ensuring consistent query results, independent of source encoding.
 
 ### Compression
 

data/ext/isomorfeus_ferret_ext/frb_index.c

@@ -64,6 +64,7 @@ static ID id_fld_num_map;
 static ID id_field_num;
 static ID id_boost;
 
+extern rb_encoding *utf8_encoding;
 extern void frb_set_term(VALUE rterm, FrtTerm *t);
 extern FrtAnalyzer *frb_get_cwrapped_analyzer(VALUE ranalyzer);
 extern VALUE frb_get_analyzer(FrtAnalyzer *a);
@@ -181,8 +182,9 @@ static VALUE frb_get_field_info(FrtFieldInfo *fi) {
             fi->rfi = TypedData_Wrap_Struct(cFieldInfo, &frb_field_info_t, fi);
             FRT_REF(fi);
         }
+        return fi->rfi;
     }
-    return fi->rfi;
+    return Qnil;
 }
 
 /*
@@ -411,8 +413,9 @@ static VALUE frb_get_field_infos(FrtFieldInfos *fis) {
             fis->rfis = TypedData_Wrap_Struct(cFieldInfos, &frb_field_infos_t, fis);
             FRT_REF(fis);
         }
+        return fis->rfis;
     }
-    return fis->rfis;
+    return Qnil;
 }
 
 /*
@@ -496,11 +499,6 @@ static VALUE frb_fis_get(VALUE self, VALUE ridx) {
         case T_STRING:
             rfi = frb_get_field_info(frt_fis_get_field(fis, frb_field(ridx)));
             break;
-            /*
-        case T_STRING:
-            rfi = frb_get_field_info(frt_fis_get_field(fis, StringValuePtr(ridx)));
-            break;
-            */
         default:
             rb_raise(rb_eArgError, "Can't index FieldInfos with %s",
                      rs2s(rb_obj_as_string(ridx)));
@@ -1219,6 +1217,7 @@ static VALUE frb_get_tv_term(FrtTVTerm *tv_term) {
     VALUE rtext;
     VALUE rpositions = Qnil;
     rtext = rb_str_new2(tv_term->text);
+    rb_enc_associate(rtext, utf8_encoding);
     if (tv_term->positions) {
         int *positions = tv_term->positions;
         rpositions = rb_ary_new2(freq);
@@ -1697,10 +1696,9 @@ frb_iw_delete(VALUE self, VALUE rfield, VALUE rterm)
  *  Get the FieldInfos object for this FrtIndexWriter. This is useful if you need
  *  to dynamically add new fields to the index with specific properties.
  */
-static VALUE
-frb_iw_field_infos(VALUE self)
-{
-    FrtIndexWriter *iw = (FrtIndexWriter *)DATA_PTR(self);
+static VALUE frb_iw_field_infos(VALUE self) {
+    FrtIndexWriter *iw;
+    TypedData_Get_Struct(self, FrtIndexWriter, &frb_index_writer_t, iw);
     return frb_get_field_infos(iw->fis);
 }
 
@@ -2715,10 +2713,9 @@ frb_ir_fields(VALUE self)
  *
  *  Get the FieldInfos object for this IndexReader.
  */
-static VALUE
-frb_ir_field_infos(VALUE self)
-{
-    FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
+static VALUE frb_ir_field_infos(VALUE self) {
+    FrtIndexReader *ir;
+    TypedData_Get_Struct(self, FrtIndexReader, &frb_index_reader_t, ir);
     return frb_get_field_infos(ir->fis);
 }
 
@@ -3085,10 +3082,6 @@ static void Init_TermDocEnum(void) {
     rb_define_method(cTermDocEnum, "to_json",        frb_tde_to_json, -1);
 }
 
-/* rdochack
-cTermVector = rb_define_class_under(mIndex, "TermVector", rb_cObject);
-*/
-
 /*
  *  Document-class: Ferret::Index::TermVector::TVOffsets
  *
@@ -3107,9 +3100,6 @@ cTermVector = rb_define_class_under(mIndex, "TermVector", rb_cObject);
  */
 static void Init_TVOffsets(void) {
     const char *tv_offsets_class = "TVOffsets";
-    /* rdochack
-    cTVOffsets = rb_define_class_under(cTermVector, "TVOffsets", rb_cObject);
-    */
     cTVOffsets = rb_struct_define(tv_offsets_class, "start", "end", NULL);
     rb_set_class_path(cTVOffsets, cTermVector, tv_offsets_class);
     rb_const_set(mIndex, rb_intern(tv_offsets_class), cTVOffsets);
@@ -3130,13 +3120,8 @@ static void Init_TVOffsets(void) {
  *    tv_term = tv.find {|tvt| tvt.term = "fox"}
  *    offsets = tv_term.positions.collect {|pos| tv.offsets[pos]}
  */
-static void
-Init_TVTerm(void)
-{
+static void Init_TVTerm(void) {
     const char *tv_term_class = "TVTerm";
-    /* rdochack
-    cTVTerm = rb_define_class_under(cTermVector, "TVTerm", rb_cObject);
-    */
     cTVTerm = rb_struct_define(tv_term_class, "text", "freq", "positions", NULL);
     rb_set_class_path(cTVTerm, cTermVector, tv_term_class);
     rb_const_set(mIndex, rb_intern(tv_term_class), cTVTerm);
@@ -3172,15 +3157,9 @@ Init_TVTerm(void)
  *  particular that you need to store both positions and offsets if you want
  *  to associate offsets with particular terms.
  */
-static void
-Init_TermVector(void)
-{
+static void Init_TermVector(void) {
     const char *tv_class = "TermVector";
-    /* rdochack
-    cTermVector = rb_define_class_under(mIndex, "TermVector", rb_cObject);
-    */
-    cTermVector = rb_struct_define(tv_class,
-                                   "field", "terms", "offsets", NULL);
+    cTermVector = rb_struct_define(tv_class, "field", "terms", "offsets", NULL);
     rb_set_class_path(cTermVector, mIndex, tv_class);
     rb_const_set(mIndex, rb_intern(tv_class), cTermVector);
 

data/ext/isomorfeus_ferret_ext/frt_index.c

@@ -14,6 +14,7 @@
 #undef close
 #undef read
 
+extern rb_encoding *utf8_encoding;
 extern void frt_micro_sleep(const int micro_seconds);
 
 #define GET_LOCK(lock, name, store, err_msg) do {\
@@ -1710,8 +1711,7 @@ static FrtTermVector *frt_fr_read_term_vector(FrtFieldsReader *fr, int field_num
             total_len = delta_start + delta_len;
             frt_is_read_bytes(fdt_in, buffer + delta_start, delta_len);
             buffer[total_len++] = '\0';
-            term->text = (char *)memcpy(FRT_ALLOC_N(char, total_len),
-                                        buffer, total_len);
+            term->text = (char *)memcpy(FRT_ALLOC_N(char, total_len), buffer, total_len);
 
             /* read freq */
             freq = term->freq = frt_is_read_vint(fdt_in);
@@ -1822,8 +1822,7 @@ FrtTermVector *frt_fr_get_field_tv(FrtFieldsReader *fr, int doc_num, int field_n
  *
  ****************************************************************************/
 
-FrtFieldsWriter *frt_fw_open(FrtStore *store, const char *segment, FrtFieldInfos *fis)
-{
+FrtFieldsWriter *frt_fw_open(FrtStore *store, const char *segment, FrtFieldInfos *fis) {
     FrtFieldsWriter *fw = FRT_ALLOC(FrtFieldsWriter);
     char file_name[FRT_SEGMENT_NAME_MAX_LENGTH];
     size_t segment_len = strlen(segment);
@@ -1844,8 +1843,7 @@ FrtFieldsWriter *frt_fw_open(FrtStore *store, const char *segment, FrtFieldInfos
     return fw;
 }
 
-void frt_fw_close(FrtFieldsWriter *fw)
-{
+void frt_fw_close(FrtFieldsWriter *fw) {
     frt_os_close(fw->fdt_out);
     frt_os_close(fw->fdx_out);
     frt_ram_destroy_buffer(fw->buffer);
@@ -2046,8 +2044,7 @@ void frt_fw_add_doc(FrtFieldsWriter *fw, FrtDocument *doc) {
     frt_ramo_write_to(fw->buffer, fdt_out);
 }
 
-void frt_fw_write_tv_index(FrtFieldsWriter *fw)
-{
+void frt_fw_write_tv_index(FrtFieldsWriter *fw) {
     int i;
     const int tv_cnt = frt_ary_size(fw->tv_fields);
     FrtOutStream *fdt_out = fw->fdt_out;
@@ -5548,9 +5545,24 @@ FrtHash *frt_dw_invert_field(FrtDocWriter *dw, FrtFieldInverter *fld_inv, FrtDoc
         for (i = 0; i < df_size; i++) {
             int len = df->lengths[i];
             char *data_ptr = df->data[i];
-            if (len > FRT_MAX_WORD_SIZE) {
-                len = FRT_MAX_WORD_SIZE - 1;
-                data_ptr = (char *)memcpy(buf, df->data[i], len);
+            if (df->encodings[i] == utf8_encoding) {
+                if (len >= FRT_MAX_WORD_SIZE) {
+                    len = FRT_MAX_WORD_SIZE - 1;  // TODO: this may invalidate mbc's
+                    data_ptr = (char *)memcpy(buf, df->data[i], len);
+                    buf[len] = '\0';
+                }
+            } else if (df->encodings[i] != utf8_encoding) {
+                if (len >= FRT_MAX_WORD_SIZE)
+                    len = FRT_MAX_WORD_SIZE - 1;
+                const unsigned char *sp = (unsigned char *)df->data[i];
+                unsigned char *dp = (unsigned char *)&buf;
+                rb_econv_t *ec = rb_econv_open(rb_enc_name(df->encodings[i]), "UTF-8", RUBY_ECONV_INVALID_REPLACE);
+                assert(ec != NULL);
+                rb_econv_convert(ec, &sp, (unsigned char *)df->data[i] + len, &dp, (unsigned char *)&buf + FRT_MAX_WORD_SIZE - 1, 0);
+                rb_econv_close(ec);
+                len = dp - (unsigned char *)&buf;
+                buf[len] = '\0';
+                data_ptr = buf;
             }
             dw_add_posting(mp, curr_plists, fld_plists, doc_num, data_ptr, len, i);
             if (store_offsets) {

data/lib/isomorfeus/ferret/index/index.rb

@@ -4,7 +4,7 @@ module Isomorfeus
       # This is a simplified interface to the index. See the TUTORIAL for more
       # information on how to use this class.
       class Index
-        include Isomorfeus::Ferret::MonitorMixin
+        include MonitorMixin
         include Isomorfeus::Ferret::Store
         include Isomorfeus::Ferret::Search
 

data/lib/isomorfeus/ferret/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Ferret
-    VERSION = '0.13.1'
+    VERSION = '0.13.4'
   end
 end

data/lib/isomorfeus-ferret.rb

@@ -2,7 +2,7 @@ require 'isomorfeus_ferret_ext'
 require 'isomorfeus/ferret/version'
 require 'isomorfeus/ferret/field_symbol'
 require 'isomorfeus/ferret/stdlib_patches'
-require 'isomorfeus/ferret/monitor'
+require 'monitor'
 require 'isomorfeus/ferret/index/field_infos'
 require 'isomorfeus/ferret/index/index'
 require 'isomorfeus/ferret/document'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-ferret
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.4
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-16 00:00:00.000000000 Z
+date: 2022-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -360,7 +360,6 @@ files:
 - lib/isomorfeus/ferret/field_symbol.rb
 - lib/isomorfeus/ferret/index/field_infos.rb
 - lib/isomorfeus/ferret/index/index.rb
-- lib/isomorfeus/ferret/monitor.rb
 - lib/isomorfeus/ferret/stdlib_patches.rb
 - lib/isomorfeus/ferret/version.rb
 homepage: https://isomorfeus.com

data/lib/isomorfeus/ferret/monitor.rb

@@ -1,323 +0,0 @@
-# frozen_string_literal: false
-# = monitor.rb
-#
-# Copyright (C) 2001  Shugo Maeda <shugo@ruby-lang.org>
-#
-# This library is distributed under the terms of the Ruby license.
-# You can freely distribute/modify this library.
-#
-
-#
-# In concurrent programming, a monitor is an object or module intended to be
-# used safely by more than one thread.  The defining characteristic of a
-# monitor is that its methods are executed with mutual exclusion.  That is, at
-# each point in time, at most one thread may be executing any of its methods.
-# This mutual exclusion greatly simplifies reasoning about the implementation
-# of monitors compared to reasoning about parallel code that updates a data
-# structure.
-#
-# You can read more about the general principles on the Wikipedia page for
-# Monitors[http://en.wikipedia.org/wiki/Monitor_%28synchronization%29]
-#
-# == Examples
-#
-# === Simple object.extend
-#
-#   require 'monitor.rb'
-#
-#   buf = []
-#   buf.extend(MonitorMixin)
-#   empty_cond = buf.new_cond
-#
-#   # consumer
-#   Thread.start do
-#     loop do
-#       buf.synchronize do
-#         empty_cond.wait_while { buf.empty? }
-#         print buf.shift
-#       end
-#     end
-#   end
-#
-#   # producer
-#   while line = ARGF.gets
-#     buf.synchronize do
-#       buf.push(line)
-#       empty_cond.signal
-#     end
-#   end
-#
-# The consumer thread waits for the producer thread to push a line to buf
-# while <tt>buf.empty?</tt>.  The producer thread (main thread) reads a
-# line from ARGF and pushes it into buf then calls <tt>empty_cond.signal</tt>
-# to notify the consumer thread of new data.
-#
-# === Simple Class include
-#
-#   require 'monitor'
-#
-#   class SynchronizedArray < Array
-#
-#     include MonitorMixin
-#
-#     def initialize(*args)
-#       super(*args)
-#     end
-#
-#     alias :old_shift :shift
-#     alias :old_unshift :unshift
-#
-#     def shift(n=1)
-#       self.synchronize do
-#         self.old_shift(n)
-#       end
-#     end
-#
-#     def unshift(item)
-#       self.synchronize do
-#         self.old_unshift(item)
-#       end
-#     end
-#
-#     # other methods ...
-#   end
-#
-# +SynchronizedArray+ implements an Array with synchronized access to items.
-# This Class is implemented as subclass of Array which includes the
-# MonitorMixin module.
-#
-module Isomorfeus
-  module Ferret
-    module MonitorMixin
-      #
-      # FIXME: This isn't documented in Nutshell.
-      #
-      # Since MonitorMixin.new_cond returns a ConditionVariable, and the example
-      # above calls while_wait and signal, this class should be documented.
-      #
-      class ConditionVariable
-        class Timeout < Exception; end
-
-        #
-        # Releases the lock held in the associated monitor and waits; reacquires the lock on wakeup.
-        #
-        # If +timeout+ is given, this method returns after +timeout+ seconds passed,
-        # even if no other thread doesn't signal.
-        #
-        def wait(timeout = nil)
-          Thread.handle_interrupt(Exception => :never) do
-            @monitor.__send__(:mon_check_owner)
-            count = @monitor.__send__(:mon_exit_for_cond)
-            begin
-              Thread.handle_interrupt(Exception => :immediate) do
-                @cond.wait(@monitor.instance_variable_get(:@mon_mutex), timeout)
-              end
-              return true
-            ensure
-              @monitor.__send__(:mon_enter_for_cond, count)
-            end
-          end
-        end
-
-        #
-        # Calls wait repeatedly while the given block yields a truthy value.
-        #
-        def wait_while
-          while yield
-            wait
-          end
-        end
-
-        #
-        # Calls wait repeatedly until the given block yields a truthy value.
-        #
-        def wait_until
-          until yield
-            wait
-          end
-        end
-
-        #
-        # Wakes up the first thread in line waiting for this lock.
-        #
-        def signal
-          @monitor.__send__(:mon_check_owner)
-          @cond.signal
-        end
-
-        #
-        # Wakes up all threads waiting for this lock.
-        #
-        def broadcast
-          @monitor.__send__(:mon_check_owner)
-          @cond.broadcast
-        end
-
-        private
-
-        def initialize(monitor)
-          @monitor = monitor
-          @cond = Thread::ConditionVariable.new
-        end
-      end
-
-      def self.extend_object(obj)
-        super(obj)
-        obj.__send__(:mon_initialize)
-      end
-
-      #
-      # Attempts to enter exclusive section.  Returns +false+ if lock fails.
-      #
-      def mon_try_enter
-        if @mon_owner != Thread.current
-          unless @mon_mutex.try_lock
-            return false
-          end
-          @mon_owner = Thread.current
-          @mon_count = 0
-        end
-        @mon_count += 1
-        return true
-      end
-      # For backward compatibility
-      alias try_mon_enter mon_try_enter
-
-      #
-      # Enters exclusive section.
-      #
-      def mon_enter
-        if @mon_owner != Thread.current
-          @mon_mutex.lock
-          @mon_owner = Thread.current
-          @mon_count = 0
-        end
-        @mon_count += 1
-      end
-
-      #
-      # Leaves exclusive section.
-      #
-      def mon_exit
-        mon_check_owner
-        @mon_count -=1
-        if @mon_count == 0
-          @mon_owner = nil
-          @mon_mutex.unlock
-        end
-      end
-
-      #
-      # Returns true if this monitor is locked by any thread
-      #
-      def mon_locked?
-        @mon_mutex.locked?
-      end
-
-      #
-      # Returns true if this monitor is locked by current thread.
-      #
-      def mon_owned?
-        @mon_mutex.locked? && @mon_owner == Thread.current
-      end
-
-      #
-      # Enters exclusive section and executes the block.  Leaves the exclusive
-      # section automatically when the block exits.  See example under
-      # +MonitorMixin+.
-      #
-      def mon_synchronize
-        # Prevent interrupt on handling interrupts; for example timeout errors
-        # it may break locking state.
-        Thread.handle_interrupt(Exception => :never){ mon_enter }
-        begin
-          yield
-        ensure
-          Thread.handle_interrupt(Exception => :never){ mon_exit }
-        end
-      end
-      alias synchronize mon_synchronize
-
-      #
-      # Creates a new MonitorMixin::ConditionVariable associated with the
-      # receiver.
-      #
-      def new_cond
-        return ConditionVariable.new(self)
-      end
-
-      private
-
-      # Use <tt>extend MonitorMixin</tt> or <tt>include MonitorMixin</tt> instead
-      # of this constructor.  Have look at the examples above to understand how to
-      # use this module.
-      def initialize(*args)
-        super
-        mon_initialize
-      end
-
-      # Initializes the MonitorMixin after being included in a class or when an
-      # object has been extended with the MonitorMixin
-      def mon_initialize
-        if defined?(@mon_mutex) && @mon_mutex_owner_object_id == object_id
-          raise ThreadError, "already initialized"
-        end
-        @mon_mutex = Thread::Mutex.new
-        @mon_mutex_owner_object_id = object_id
-        @mon_owner = nil
-        @mon_count = 0
-      end
-
-      def mon_check_owner
-        if @mon_owner != Thread.current
-          raise ThreadError, "current thread not owner"
-        end
-      end
-
-      def mon_enter_for_cond(count)
-        @mon_owner = Thread.current
-        @mon_count = count
-      end
-
-      def mon_exit_for_cond
-        count = @mon_count
-        @mon_owner = nil
-        @mon_count = 0
-        return count
-      end
-    end
-
-    # Use the Monitor class when you want to have a lock object for blocks with
-    # mutual exclusion.
-    #
-    #   require 'monitor'
-    #
-    #   lock = Monitor.new
-    #   lock.synchronize do
-    #     # exclusive access
-    #   end
-    #
-    class Monitor
-      include MonitorMixin
-      alias try_enter try_mon_enter
-      alias enter mon_enter
-      alias exit mon_exit
-    end
-  end
-end
-
-# Documentation comments:
-#  - All documentation comes from Nutshell.
-#  - MonitorMixin.new_cond appears in the example, but is not documented in
-#    Nutshell.
-#  - All the internals (internal modules Accessible and Initializable, class
-#    ConditionVariable) appear in RDoc.  It might be good to hide them, by
-#    making them private, or marking them :nodoc:, etc.
-#  - RDoc doesn't recognise aliases, so we have mon_synchronize documented, but
-#    not synchronize.
-#  - mon_owner is in Nutshell, but appears as an accessor in a separate module
-#    here, so is hard/impossible to RDoc.  Some other useful accessors
-#    (mon_count and some queue stuff) are also in this module, and don't appear
-#    directly in the RDoc output.
-#  - in short, it may be worth changing the code layout in this file to make the
-#    documentation easier