Mailing List Archive

Author: creamyg
Date: 2008-07-28 12:15:57 -0700 (Mon, 28 Jul 2008)
New Revision: 3658

Removed:
trunk/perl/lib/KinoSearch/base.pm
Modified:
trunk/perl/MANIFEST
trunk/perl/lib/KSx/Remote/SearchClient.pm
trunk/perl/lib/KSx/Remote/SearchServer.pm
trunk/perl/lib/KSx/Search/Filter.pm
trunk/perl/lib/KSx/Search/LongFieldSim.pm
trunk/perl/lib/KSx/Search/MockScorer.pm
trunk/perl/lib/KSx/Simple.pm
trunk/perl/lib/KinoSearch.pm
trunk/perl/lib/KinoSearch/QueryParser/QueryParser.pm
trunk/perl/lib/KinoSearch/Test/TestQueryParser.pm
trunk/perl/lib/KinoSearch/Test/TestQueryParserLogic.pm
trunk/perl/lib/KinoSearch/Test/TestQueryParserSyntax.pm
trunk/perl/lib/KinoSearch/Test/Util/BBSortEx.pm
trunk/perl/lib/KinoSearch/Test/Util/TestCharBuf.pm
Log:
Eliminate KinoSearch::base. Remove a bunch of redundant base class
declarations that are already set up by the XS boot function for the
KinoSearch module.


Modified: trunk/perl/MANIFEST
===================================================================
--- trunk/perl/MANIFEST 2008-07-28 18:50:45 UTC (rev 3657)
+++ trunk/perl/MANIFEST 2008-07-28 19:15:57 UTC (rev 3658)
@@ -58,7 +58,6 @@
lib/KinoSearch/Analysis/Token.pm
lib/KinoSearch/Analysis/TokenBatch.pm
lib/KinoSearch/Analysis/Tokenizer.pm
-lib/KinoSearch/base.pm
lib/KinoSearch/Doc.pm
lib/KinoSearch/Doc/HitDoc.pm
lib/KinoSearch/Docs/Cookbook.pod

Modified: trunk/perl/lib/KSx/Remote/SearchClient.pm
===================================================================
--- trunk/perl/lib/KSx/Remote/SearchClient.pm 2008-07-28 18:50:45 UTC (rev 3657)
+++ trunk/perl/lib/KSx/Remote/SearchClient.pm 2008-07-28 19:15:57 UTC (rev 3658)
@@ -3,7 +3,7 @@

package KSx::Remote::SearchClient;
use KinoSearch::Util::ToolSet qw( confess nfreeze thaw );
-use KinoSearch::base qw( KinoSearch::Search::Searchable );
+BEGIN { our @ISA = qw( KinoSearch::Search::Searchable ) }

our %instance_vars = __PACKAGE__->init_instance_vars(
# params/members

Modified: trunk/perl/lib/KSx/Remote/SearchServer.pm
===================================================================
--- trunk/perl/lib/KSx/Remote/SearchServer.pm 2008-07-28 18:50:45 UTC (rev 3657)
+++ trunk/perl/lib/KSx/Remote/SearchServer.pm 2008-07-28 19:15:57 UTC (rev 3658)
@@ -3,7 +3,7 @@

package KSx::Remote::SearchServer;
use KinoSearch::Util::ToolSet qw( confess nfreeze thaw );
-use KinoSearch::base qw( KinoSearch::Obj );
+BEGIN { our @ISA = qw( KinoSearch::Obj ) }

our %instance_vars = __PACKAGE__->init_instance_vars(
# params / members

Modified: trunk/perl/lib/KSx/Search/Filter.pm
===================================================================
--- trunk/perl/lib/KSx/Search/Filter.pm 2008-07-28 18:50:45 UTC (rev 3657)
+++ trunk/perl/lib/KSx/Search/Filter.pm 2008-07-28 19:15:57 UTC (rev 3658)
@@ -3,7 +3,7 @@

package KSx::Search::Filter;
use KinoSearch::Util::ToolSet qw( confess a_isa_b nfreeze thaw weaken );
-use KinoSearch::base qw( KinoSearch::Search::Query );
+BEGIN { our @ISA = qw( KinoSearch::Search::Query ) }

our %instance_vars = __PACKAGE__->init_instance_vars(
# members
@@ -125,7 +125,7 @@
}

package KSx::Search::FilterCompiler;
-use KinoSearch::base qw( KinoSearch::Search::Compiler );
+BEGIN { our @ISA = qw( KinoSearch::Search::Compiler ) }

sub new {
my ( $class, %args ) = @_;
@@ -143,7 +143,7 @@
}

package KSx::Search::FilterScorer;
-use KinoSearch::base qw( KinoSearch::Search::Scorer );
+BEGIN { our @ISA = qw( KinoSearch::Search::Scorer ) }

1;


Modified: trunk/perl/lib/KSx/Search/LongFieldSim.pm
===================================================================
--- trunk/perl/lib/KSx/Search/LongFieldSim.pm 2008-07-28 18:50:45 UTC (rev 3657)
+++ trunk/perl/lib/KSx/Search/LongFieldSim.pm 2008-07-28 19:15:57 UTC (rev 3658)
@@ -2,7 +2,7 @@
use warnings;

package KSx::Search::LongFieldSim;
-use KinoSearch::base qw( KinoSearch::Search::Similarity );
+BEGIN { our @ISA = qw( KinoSearch::Search::Similarity ) }

sub length_norm {
my ( $self, $num_tokens ) = @_;

Modified: trunk/perl/lib/KSx/Search/MockScorer.pm
===================================================================
--- trunk/perl/lib/KSx/Search/MockScorer.pm 2008-07-28 18:50:45 UTC (rev 3657)
+++ trunk/perl/lib/KSx/Search/MockScorer.pm 2008-07-28 19:15:57 UTC (rev 3658)
@@ -3,7 +3,7 @@

package KSx::Search::MockScorer;
use KinoSearch::Util::ToolSet qw( confess reftype );
-use KinoSearch::base qw( KinoSearch::Search::Scorer );
+BEGIN { our @ISA = qw( KinoSearch::Search::Scorer ) }

our %instance_vars = __PACKAGE__->init_instance_vars(
# params / members

Modified: trunk/perl/lib/KSx/Simple.pm
===================================================================
--- trunk/perl/lib/KSx/Simple.pm 2008-07-28 18:50:45 UTC (rev 3657)
+++ trunk/perl/lib/KSx/Simple.pm 2008-07-28 19:15:57 UTC (rev 3658)
@@ -16,7 +16,7 @@
for my $lang_iso (qw( da nl en fi fr de it no pt es sv ru )) {
$schema_code .= <<LANG_SCHEMA;
package KSx::Simple::Schema::$lang_iso;
- use KinoSearch::base qw( KinoSearch::Schema );
+ our \@ISA = qw( KinoSearch::Schema );
our\%fields = ();
sub analyzer {
KinoSearch::Analysis::PolyAnalyzer->new( language => '$lang_iso' );

Modified: trunk/perl/lib/KinoSearch/QueryParser/QueryParser.pm
===================================================================
--- trunk/perl/lib/KinoSearch/QueryParser/QueryParser.pm 2008-07-28 18:50:45 UTC (rev 3657)
+++ trunk/perl/lib/KinoSearch/QueryParser/QueryParser.pm 2008-07-28 19:15:57 UTC (rev 3658)
@@ -2,10 +2,8 @@
use warnings;

package KinoSearch::QueryParser::QueryParser;
-use KinoSearch::base qw( KinoSearch::QueryParser );
+BEGIN { our @ISA = qw( KinoSearch::QueryParser ) }

-our %instance_vars = __PACKAGE__->init_instance_vars();
-
# Only here for back compat.

1;

Modified: trunk/perl/lib/KinoSearch/Test/TestQueryParser.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Test/TestQueryParser.pm 2008-07-28 18:50:45 UTC (rev 3657)
+++ trunk/perl/lib/KinoSearch/Test/TestQueryParser.pm 2008-07-28 19:15:57 UTC (rev 3658)
@@ -3,8 +3,10 @@

package KinoSearch::Test::TestQueryParser;
use KinoSearch::Util::ToolSet qw( to_perl );
-use KinoSearch::base qw( KinoSearch::Obj Exporter );
-our @EXPORT_OK = qw( doc_set );
+BEGIN {
+ push our @ISA, 'Exporter';
+ our @EXPORT_OK = qw( doc_set );
+}

sub doc_set { return to_perl( _doc_set() ) }


Modified: trunk/perl/lib/KinoSearch/Test/TestQueryParserLogic.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Test/TestQueryParserLogic.pm 2008-07-28 18:50:45 UTC (rev 3657)
+++ trunk/perl/lib/KinoSearch/Test/TestQueryParserLogic.pm 2008-07-28 19:15:57 UTC (rev 3658)
@@ -3,8 +3,10 @@

package KinoSearch::Test::TestQueryParserLogic;
use KinoSearch::Util::ToolSet qw( to_perl );
-use KinoSearch::base qw( KinoSearch::Obj Exporter );
-our @EXPORT_OK = qw( logical_tests prune_tests );
+BEGIN {
+ push our @ISA, 'Exporter';
+ our @EXPORT_OK = qw( logical_tests prune_tests );
+}

sub logical_tests { to_perl( _logical_tests(shift) ) }
sub prune_tests { to_perl( _prune_tests() ) }

Modified: trunk/perl/lib/KinoSearch/Test/TestQueryParserSyntax.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Test/TestQueryParserSyntax.pm 2008-07-28 18:50:45 UTC (rev 3657)
+++ trunk/perl/lib/KinoSearch/Test/TestQueryParserSyntax.pm 2008-07-28 19:15:57 UTC (rev 3658)
@@ -3,8 +3,10 @@

package KinoSearch::Test::TestQueryParserSyntax;
use KinoSearch::Util::ToolSet qw( to_perl );
-use KinoSearch::base qw( KinoSearch::Obj Exporter );
-our @EXPORT_OK = qw( leaf_tests syntax_tests );
+BEGIN {
+ push our @ISA, 'Exporter';
+ our @EXPORT_OK = qw( leaf_tests syntax_tests );
+}

sub leaf_tests { to_perl( _leaf_tests() ) }
sub syntax_tests { to_perl( _syntax_tests() ) }

Modified: trunk/perl/lib/KinoSearch/Test/Util/BBSortEx.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Test/Util/BBSortEx.pm 2008-07-28 18:50:45 UTC (rev 3657)
+++ trunk/perl/lib/KinoSearch/Test/Util/BBSortEx.pm 2008-07-28 19:15:57 UTC (rev 3658)
@@ -1,12 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch;

-package KinoSearch::Test::Util::BBSortEx;
-use KinoSearch::base qw( KinoSearch::Util::SortExternal );
-
-package KinoSearch::Test::Util::BBSortExRun;
-use KinoSearch::base qw( KinoSearch::Util::SortExRun );
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Test/Util/TestCharBuf.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Test/Util/TestCharBuf.pm 2008-07-28 18:50:45 UTC (rev 3657)
+++ trunk/perl/lib/KinoSearch/Test/Util/TestCharBuf.pm 2008-07-28 19:15:57 UTC (rev 3658)
@@ -3,8 +3,10 @@

package KinoSearch::Test::Util::TestCharBuf;
use KinoSearch::Util::ToolSet qw( to_perl );
-use KinoSearch::base qw( KinoSearch::Obj Exporter );
-our @EXPORT_OK = qw( vcatf_tests );
+BEGIN {
+ push our @ISA, 'Exporter';
+ our @EXPORT_OK = qw( vcatf_tests );
+}

sub vcatf_tests { to_perl( _vcatf_tests() ) }


Deleted: trunk/perl/lib/KinoSearch/base.pm
===================================================================
--- trunk/perl/lib/KinoSearch/base.pm 2008-07-28 18:50:45 UTC (rev 3657)
+++ trunk/perl/lib/KinoSearch/base.pm 2008-07-28 19:15:57 UTC (rev 3658)
@@ -1,70 +0,0 @@
-use strict;
-use warnings;
-
-package KinoSearch::base;
-
-sub import {
- my $class = shift;
- my @parents = @_;
- my $inheritor = caller(0);
-
- # Load parent modules.
- for my $parent (@parents) {
- $parent =~ s#::|'#/#g;
- require "$parent.pm";
- }
-
- # Set @ISA.
- no strict 'refs';
- my %uniquifier;
- @{"$inheritor\::ISA"} = map { $uniquifier{$_}++ == 0 ? $_ : () }
- ( @{"$inheritor\::ISA"}, @_ );
-}
-
-1;
-
-__END__
-
-__POD__
-
-=begin devdocs
-
-=head1 NAME
-
-KinoSearch::base - Manage inheritance for core KinoSearch classes.
-
-=head1 SYNOPSIS
-
- use KinoSearch::base qw( KinoSearch::Util::PriorityQueue );
-
-=head1 DESCRIPTION
-
-The C<base> pragma, though core Perl and widely known, is subject to
-action-at-a-distance bugs. The C<parent> pragma from CPAN is a good
-replacement, but KinoSearch has special needs.
-
-The XS bootstrapping for the C<KinoSearch> module fills out @ISA for every
-class in the core KinoSearch hierarchy. This is done automatically because
-failing to associate the proper C<DESTROY> method with any one class results
-in a memory leak, and manually ensuring that the right modules are always
-loaded is error-prone.
-
-Both C<base> and C<parent> allow duplicate classes in @ISA, which is
-unnecessary and can cause strange bugs.
-
- package KinoSearch::Foo;
- use parent qw( KinoSearch::Obj );
- # KinoSearch::Foo::ISA is now qw( KinoSearch::Obj KinoSearch::Obj );
-
-KinoSearch::base filters duplicates, eliminating that problem.
-
-=head1 COPYRIGHT
-
-Copyright 2008 Marvin Humphrey
-
-=head1 LICENSE, DISCLAIMER, BUGS, etc.
-
-See L<KinoSearch> version 0.20.
-
-=end devdocs
-=cut

Modified: trunk/perl/lib/KinoSearch.pm
===================================================================
--- trunk/perl/lib/KinoSearch.pm 2008-07-28 18:50:45 UTC (rev 3657)
+++ trunk/perl/lib/KinoSearch.pm 2008-07-28 19:15:57 UTC (rev 3658)
@@ -12,7 +12,11 @@
# See the docs for KinoSearch::Util::ToolSet.
BEGIN { XSLoader::load( 'KinoSearch', '0.20_06' ) }

-use KinoSearch::base qw( Exporter );
+BEGIN {
+ push our @ISA, 'Exporter';
+ our @EXPORT_OK = qw( kdump );
+}
+
use KinoSearch::Autobinding;

sub kdump {
@@ -23,8 +27,6 @@
warn $kdumper->Dump;
}

-our @EXPORT_OK = qw( kdump );
-
{
package KinoSearch::Util::StringHelper;
BEGIN {
@@ -163,7 +165,6 @@

{
package KinoSearch::Analysis::Analyzer;
- use KinoSearch::base qw( KinoSearch::Obj );
use KinoSearch::Util::StringHelper qw( utf8_flag_on );

sub transform_field {
@@ -182,7 +183,6 @@

{
package KinoSearch::Analysis::LCNormalizer;
- use KinoSearch::base qw( KinoSearch::Analysis::Analyzer );

sub transform_field {
return KinoSearch::Analysis::TokenBatch->new(
@@ -193,7 +193,6 @@
{
package KinoSearch::Analysis::PolyAnalyzer;
use KinoSearch::Util::ToolSet qw( to_kino );
- use KinoSearch::base qw( KinoSearch::Analysis::Analyzer );

our %instance_vars = __PACKAGE__->init_instance_vars(
cached_analyzers => \our %cached_analyzers, );
@@ -236,7 +235,6 @@

{
package KinoSearch::Analysis::Stemmer;
- use KinoSearch::base qw( KinoSearch::Analysis::Analyzer );

sub new {
my $either = shift;
@@ -248,7 +246,6 @@
{
package KinoSearch::Analysis::Stopalizer;
use KinoSearch::Util::ToolSet qw( confess reftype to_kino );
- use KinoSearch::base qw( KinoSearch::Analysis::Analyzer );

sub new {
my ( $either, %args ) = @_;
@@ -275,7 +272,6 @@

{
package KinoSearch::Analysis::Token;
- use KinoSearch::base qw( KinoSearch::Obj::FastObj );

our %new_PARAMS = (
text => undef,
@@ -288,7 +284,6 @@

{
package KinoSearch::Analysis::TokenBatch;
- use KinoSearch::base qw( KinoSearch::Util::VArray );

our %new_PARAMS = (
# params
@@ -299,7 +294,6 @@
{
package KinoSearch::Analysis::Tokenizer;
use KinoSearch::Util::ToolSet qw( confess verify_args kerror );
- use KinoSearch::base qw( KinoSearch::Analysis::Analyzer );

our %instance_vars = __PACKAGE__->init_instance_vars(
# params/members
@@ -328,7 +322,6 @@
{
package KinoSearch::Doc;
use KinoSearch::Util::ToolSet qw( nfreeze thaw );
- use KinoSearch::base qw( KinoSearch::Obj );

use overload
fallback => 1,
@@ -355,7 +348,6 @@

{
package KinoSearch::Doc::HitDoc;
- use KinoSearch::base qw( KinoSearch::Doc );

our %new_PARAMS = (
score => undef,
@@ -367,7 +359,6 @@

{
package KinoSearch::FieldSpec;
- use KinoSearch::base qw( KinoSearch::Obj );
use KinoSearch::Search::Similarity;

sub boost {1.0}
@@ -382,8 +373,8 @@

{
package KinoSearch::FieldSpec::text;
+ BEGIN { our @ISA = 'KinoSearch::FieldSpec' }
use KinoSearch::Util::ToolSet qw( confess a_isa_b );
- use KinoSearch::base qw( KinoSearch::FieldSpec );
use KinoSearch::Posting::ScorePosting;
use KinoSearch::Search::Similarity;

@@ -410,7 +401,6 @@
{
package KinoSearch::Highlight::HeatMap;
use KinoSearch::Util::ToolSet qw( to_kino to_perl );
- use KinoSearch::base qw( KinoSearch::Obj );

our %instance_vars = __PACKAGE__->init_instance_vars(
# members
@@ -463,7 +453,7 @@
{
package KinoSearch::Highlight::Highlighter;
use KinoSearch::Util::ToolSet qw( confess a_isa_b );
- use KinoSearch::base qw( KinoSearch::Obj Exporter );
+ BEGIN { push our @ISA, 'Exporter' }

our %instance_vars = __PACKAGE__->init_instance_vars(
# members
@@ -499,7 +489,6 @@
{
package KinoSearch::InvIndex;
use KinoSearch::Util::ToolSet qw( confess a_isa_b );
- use KinoSearch::base qw( KinoSearch::Obj );

use KinoSearch::Index::Snapshot;

@@ -533,7 +522,6 @@
{
package KinoSearch::InvIndexer;
use KinoSearch::Util::ToolSet qw( confess );
- use KinoSearch::base qw( KinoSearch::Obj );

sub add_doc {
confess('usage: $invindexer->add_doc($doc)') unless @_ == 2;
@@ -674,7 +662,6 @@
{
package KinoSearch::Obj::FastObj;
use KinoSearch::Util::ToolSet qw( confess );
- use KinoSearch::base qw( KinoSearch::Obj );

sub init_instance_vars {
confess "Can't use inside-out pattern with FastObj";
@@ -688,7 +675,6 @@

{
package KinoSearch::Index::DocReader;
- use KinoSearch::base qw( KinoSearch::Index::SegDataReader );

use KinoSearch::Util::StringHelper qw( utf8_flag_on );
use KinoSearch::Doc::HitDoc;
@@ -714,7 +700,6 @@

{
package KinoSearch::Index::DocWriter;
- use KinoSearch::base qw( KinoSearch::Index::SegDataWriter );

use KinoSearch::Util::StringHelper qw( utf8_flag_off utf8_flag_on );

@@ -747,7 +732,6 @@

{
package KinoSearch::Index::FilePurger;
- use KinoSearch::base qw( KinoSearch::Obj );

sub try_delete_file {
my ( $self, $filename ) = @_;
@@ -777,7 +761,6 @@
{
package KinoSearch::Index::IndexReader;
use KinoSearch::Util::ToolSet qw( confess a_isa_b );
- use KinoSearch::base qw( KinoSearch::Obj );

# Test code will define these as coderefs.
our $debug1;
@@ -939,7 +922,6 @@
{
package KinoSearch::Index::SegInfo;
use KinoSearch::Util::ToolSet qw( to_kino to_perl );
- use KinoSearch::base qw( KinoSearch::Obj );

sub add_metadata {
my ( $self, $key, $val ) = @_;
@@ -954,7 +936,6 @@

{
package KinoSearch::Index::TermVector;
- use KinoSearch::base qw( KinoSearch::Obj );

sub get_positions { shift->_get_positions->to_arrayref }
sub get_start_offsets { shift->_get_start_offsets->to_arrayref }
@@ -964,7 +945,6 @@
{
package KinoSearch::QueryParser;
use KinoSearch::Util::ToolSet qw( to_kino );
- use KinoSearch::base qw( KinoSearch::Obj );

sub new {
my ( $either, %args ) = @_;
@@ -976,7 +956,6 @@
{
package KinoSearch::Schema;
use KinoSearch::Util::ToolSet qw( confess blessed );
- use KinoSearch::base qw( KinoSearch::Obj );

sub analyzer { shift->abstract_death }
sub similarity { KinoSearch::Search::Similarity->new }
@@ -1039,13 +1018,12 @@

{
package KinoSearch::Schema::FieldSpec;
- use KinoSearch::base qw( KinoSearch::FieldSpec::text );
+ BEGIN { our @ISA = qw( KinoSearch::FieldSpec::text ) }
}

{
package KinoSearch::Search::Compiler;
use KinoSearch::Util::ToolSet qw( a_isa_b confess );
- use KinoSearch::base qw( KinoSearch::Obj );

sub new {
my ( $either, %args ) = @_;
@@ -1066,7 +1044,6 @@
{
package KinoSearch::Search::MultiSearcher;
use KinoSearch::Util::ToolSet qw( to_kino );
- use KinoSearch::base qw( KinoSearch::Search::Searchable );

sub new {
my ( $either, %args ) = @_;
@@ -1078,7 +1055,6 @@
{
package KinoSearch::Search::PhraseQuery;
use KinoSearch::Util::ToolSet qw( to_kino );
- use KinoSearch::base qw( KinoSearch::Search::Query );

sub new {
my ( $either, %args ) = @_;
@@ -1094,7 +1070,6 @@
{
package KinoSearch::Search::Query;
use KinoSearch::Util::ToolSet qw( confess kerror verify_args );
- use KinoSearch::base qw( KinoSearch::Obj );

our %make_compiler_PARAMS = (
searchable => undef,
@@ -1112,7 +1087,6 @@

{
package KinoSearch::Search::TopDocs;
- use KinoSearch::base qw( KinoSearch::Obj );

use KinoSearch::Util::VArray;
use KinoSearch::Search::RemoteFieldDoc;
@@ -1130,7 +1104,6 @@
{
package KinoSearch::Searcher;
use KinoSearch::Util::ToolSet qw( a_isa_b confess );
- use KinoSearch::base qw( KinoSearch::Search::Searchable );

sub new {
my ( $either, %args ) = @_;
@@ -1153,7 +1126,6 @@

{
package KinoSearch::Store::Folder;
- use KinoSearch::base qw( KinoSearch::Obj );
use File::Spec::Functions qw( rel2abs );

sub new {
@@ -1171,7 +1143,6 @@

{
package KinoSearch::Store::FSFolder;
- use KinoSearch::base qw( KinoSearch::Store::Folder );
use File::Spec::Functions qw( rel2abs );

sub new {
@@ -1183,14 +1154,12 @@

{
package KinoSearch::Store::RAMFileDes;
- use KinoSearch::base qw( KinoSearch::Store::FileDes );

sub contents { shift->_contents->to_perl }
}

{
package KinoSearch::Store::RAMFolder;
- use KinoSearch::base qw( KinoSearch::Store::Folder );
use File::Spec::Functions qw( rel2abs );

sub new {
@@ -1204,28 +1173,29 @@

{
package KinoSearch::Util::BitVector;
- use KinoSearch::base qw( KinoSearch::Obj );

sub to_arrayref { shift->to_array->to_arrayref }
}

{
package KinoSearch::Util::ByteBuf;
- use KinoSearch::base qw( KinoSearch::Obj::FastObj Exporter );
+ BEGIN {
+ push our @ISA, 'Exporter';
+ our @EXPORT_OK = qw( bb_compare bb_less_than ); # testing only
+ }

- our @EXPORT_OK = qw( bb_compare bb_less_than ); # testing only
-
package KinoSearch::Util::ViewByteBuf;
use KinoSearch::Util::ToolSet qw( confess );
- use KinoSearch::base qw( KinoSearch::Util::ByteBuf );

sub new { confess "ViewByteBuf objects can only be created from C." }
}

{
package KinoSearch::Util::CharBuf;
- use KinoSearch::base qw( KinoSearch::Obj::FastObj Exporter );
- our @EXPORT_OK = qw( cb_compare );
+ BEGIN {
+ push our @ISA, 'Exporter';
+ our @EXPORT_OK = qw( cb_compare );
+ }

{
# Defeat an obscure bug in the XS auto-generation by redefining
@@ -1244,7 +1214,6 @@
{
package KinoSearch::Util::ViewCharBuf;
use KinoSearch::Util::ToolSet qw( confess );
- use KinoSearch::base qw( KinoSearch::Util::CharBuf );

sub new { confess "ViewCharBuf has no public constructor." }
}
@@ -1262,7 +1231,6 @@
{
package KinoSearch::Util::Compat::DirManip;
use KinoSearch::Util::ToolSet qw( confess to_kino );
- use KinoSearch::base qw( KinoSearch::Obj );
use File::Spec::Functions qw( rel2abs no_upwards );

sub absolutify { return rel2abs( $_[1] ) }
@@ -1295,7 +1263,6 @@

{
package KinoSearch::Util::DynVirtualTable;
- use KinoSearch::base qw( KinoSearch::Util::VirtualTable );

sub find_parent_vtable {
my ( $ignore, $package ) = @_;
@@ -1334,14 +1301,11 @@

{
package KinoSearch::Util::IntMap;
- use KinoSearch::base qw( KinoSearch::Obj );
-
our %new_PARAMS = ( ints => undef );
}

{
package KinoSearch::Util::Json;
- use KinoSearch::base qw( Exporter );
use KinoSearch::Util::ToolSet qw( to_perl to_kino );

BEGIN {
@@ -1382,8 +1346,10 @@

{
package KinoSearch::Util::MathUtils;
- use KinoSearch::base qw( Exporter );
- our @EXPORT_OK = qw( fibonacci );
+ BEGIN {
+ push our @ISA, 'Exporter';
+ our @EXPORT_OK = qw( fibonacci );
+ }
}

{
@@ -1398,7 +1364,6 @@
{
package KinoSearch::Util::PriorityQueue;
use KinoSearch::Util::ToolSet qw( to_perl );
- use KinoSearch::base qw( KinoSearch::Obj );

sub pop_all { to_perl( shift->_pop_all ) }
}


_______________________________________________
kinosearch-commits mailing list
kinosearch-commits@rectangular.com
http://www.rectangular.com/mailman/listinfo/kinosearch-commits