Namespace ourselves, first pass

darcs-hash:20080828092019-4d648-996f6968c7304098af7b44601a4d81b7ab6de05e.gz

diff --git a/Definitions.pm b/Definitions.pm
index ec1fad0639b1055f28c9450adb2b5d4afbbf077e..6c639e3ef98b862b9d214c37e3c23f7e94119e0f 100644 (file)
--- a/Definitions.pm
+++ b/Definitions.pm
@@ -1,8 +1,7 @@
 use warnings;
 use strict;
 
-#package Irssi::Scripts::Instance::Definitions;
-package Definitions;
+package Instance::Definitions;
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
 require Exporter;

diff --git a/HuffmanCoder.pm b/HuffmanCoder.pm
index c8936b327a50c0207b8565b88e16c8f793ea996e..57f61cbcd82ca75109504bc91e0fa2afc012bf1d 100644 (file)
--- a/HuffmanCoder.pm
+++ b/HuffmanCoder.pm
@@ -1,7 +1,6 @@
 use warnings;
 
-#package Irssi::Scripts::Instance::HuffmanCoder;
-package HuffmanCoder;
+package Instance::HuffmanCoder;
 
 #################################################################
 

diff --git a/HuffmanCoder_test.pl b/HuffmanCoder_test.pl
index 57521b5b13b40bbc4d57692b0321010c0c9123c6..8053af8809bde1a65a83101ec38b0cb39b9f50a3 100644 (file)
--- a/HuffmanCoder_test.pl
+++ b/HuffmanCoder_test.pl
@@ -2,14 +2,13 @@ use warnings;
 use strict;
 #use Data::Dumper;
 
-# use Irssi::Scripts::Instance::Mastercode; ### XXX
-require MasterCoder;
-require HuffmanCoder;
-use Definitions qw( @debug_code_chars $instance_huffman_table1 
+require Instance::MasterCoder;
+require Instance::HuffmanCoder;
+use Instance::Definitions qw( @debug_code_chars $instance_huffman_table1 
                     $MESSAGE_START $MESSAGE_END );
 
-my $mastercoder = MasterCoder->new(\@debug_code_chars, $MESSAGE_START, $MESSAGE_END);
-my $huffmancoder = HuffmanCoder->new($mastercoder, $instance_huffman_table1);
+my $mastercoder = Instance::MasterCoder->new(\@debug_code_chars, $MESSAGE_START, $MESSAGE_END);
+my $huffmancoder = Instance::HuffmanCoder->new($mastercoder, $instance_huffman_table1);
 
 #print "Dumping encoding table:\n";
 #$huffmancoder->dump_encode_table();

diff --git a/MasterCoder.pm b/MasterCoder.pm
index dbc2f8db23e042bda768dc98741b1c3337e880bb..00644af722ed412b4f4e9479a6fd5baca00f15c5 100644 (file)
--- a/MasterCoder.pm
+++ b/MasterCoder.pm
@@ -4,8 +4,7 @@ use strict;
 use Math::BaseCalc;
 use POSIX qw( floor );
 
-#package Irssi::Scripts::Instance::MasterCoder;
-package MasterCoder;
+package Instance::MasterCoder;
 
 #################################################################
 

diff --git a/MasterCoder_test.pl b/MasterCoder_test.pl
index 8b0583d6b6db21b7cc204a5c1a30d5c7e012684f..827a7aa8fabb29a54d5324e13d8b4f3ca044b183 100644 (file)
--- a/MasterCoder_test.pl
+++ b/MasterCoder_test.pl
@@ -1,11 +1,10 @@
 use warnings;
 use strict;
 
-# use Irssi::Scripts::Instance::Mastercode; ### XXX
-require MasterCoder;
-use Definitions qw( @debug_code_chars $MESSAGE_START $MESSAGE_END );
+require Instance::MasterCoder;
+use Instance::Definitions qw( @debug_code_chars $MESSAGE_START $MESSAGE_END );
 
-my $coder = MasterCoder->new(\@debug_code_chars, $MESSAGE_START, $MESSAGE_END );
+my $coder = Instance::MasterCoder->new(\@debug_code_chars, $MESSAGE_START, $MESSAGE_END );
 
 print "Some handy quick tests... \n";
 die unless $coder->tencode_padded($MESSAGE_START,2) eq "OO";

diff --git a/MasterCoder_tlv_test.pl b/MasterCoder_tlv_test.pl
index a0cde02875a9ea2489d754cab0074e9631d531b4..d9337c6da23da613ecfe3e5d3c6ef39b2e2ca3ff 100644 (file)
--- a/MasterCoder_tlv_test.pl
+++ b/MasterCoder_tlv_test.pl
@@ -1,16 +1,16 @@
 use warnings;
 use strict;
 
-use Definitions qw( %known_types
+use Instance::Definitions qw( %known_types
                     @debug_code_chars
                     $instance_huffman_table1
                     $MESSAGE_START $MESSAGE_END );
-require MasterCoder;
-require HuffmanCoder;
-use Protoutils qw( dump_message );
+require Instance::MasterCoder;
+require Instance::HuffmanCoder;
+use Instance::Protoutils qw( dump_message );
 
-my $mc = MasterCoder->new(\@debug_code_chars, $MESSAGE_START, $MESSAGE_END);
-my $hc = HuffmanCoder->new($mc, $instance_huffman_table1);
+my $mc = Instance::MasterCoder->new(\@debug_code_chars, $MESSAGE_START, $MESSAGE_END);
+my $hc = Instance::HuffmanCoder->new($mc, $instance_huffman_table1);
 
 my @test_strings = ( "hi", "there", "coin", "test", "!@#\$&*.-=" );
 my @tlvs = ();

diff --git a/Protoutils.pm b/Protoutils.pm
index 70f487c9301747c831e5ff8e630e0b27d1aaa51a..ac74de3300284475f0016499b2d775d6f31fbbca 100644 (file)
--- a/Protoutils.pm
+++ b/Protoutils.pm
@@ -1,8 +1,7 @@
 use warnings;
 use strict;
 
-#package Irssi::Scripts::Instance::Protoutils;
-package Protoutils;
+package Instance::Protoutils;
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
 require Exporter;

diff --git a/irssi_test_new.pl b/irssi_test_new.pl
index 9ed3cc6ffa8b695ffe335323e7d9118232198501..76491766b34d43264ffa732cb37e76c9c09fc020 100644 (file)
--- a/irssi_test_new.pl
+++ b/irssi_test_new.pl
@@ -21,17 +21,17 @@ $VERSION = 'irssi-test v0.01';
 
 #################################################################
 
-require MasterCoder;
-require HuffmanCoder;
-use Definitions qw( %known_types
+require Instance::MasterCoder;
+require Instance::HuffmanCoder;
+use Instance::Definitions qw( %known_types
                     @debug_code_chars @default_code_chars
                     $instance_huffman_table1
                     $MESSAGE_START $MESSAGE_END );
 
-my $mc_dbg = MasterCoder->new(\@debug_code_chars,   $MESSAGE_START, $MESSAGE_END);
-my $mc_dfl = MasterCoder->new(\@default_code_chars, $MESSAGE_START, $MESSAGE_END);
-my $hc_dbg = HuffmanCoder->new($mc_dbg, $instance_huffman_table1);
-my $hc_dfl = HuffmanCoder->new($mc_dfl, $instance_huffman_table1);
+my $mc_dbg = Instance::MasterCoder->new(\@debug_code_chars,   $MESSAGE_START, $MESSAGE_END);
+my $mc_dfl = Instance::MasterCoder->new(\@default_code_chars, $MESSAGE_START, $MESSAGE_END);
+my $hc_dbg = Instance::HuffmanCoder->new($mc_dbg, $instance_huffman_table1);
+my $hc_dfl = Instance::HuffmanCoder->new($mc_dfl, $instance_huffman_table1);
 
 # XXX Allow some kind of runtime switch between these?
 my $mc = $mc_dfl;