Author: dylan
Date: 2004-06-17 23:44:27 -0400 (Thu, 17 Jun 2004)
New Revision: 241
Modified:
trunk/main/common/lib/Haver/Base.pm
trunk/main/common/lib/Haver/Config.pm
trunk/main/common/lib/Haver/Preprocessor.pm
trunk/main/common/lib/Haver/Savable.pm
trunk/main/common/lib/Haver/Util/Logger.pm
trunk/main/common/lib/Haver/Util/Misc.pm
Log:
Made Haver::Preprocessor handle spaces before #
when there is a command there (/^\s*#?\s*/ instead of /^#?\s*/).
Changed all other modules to make use of the new
preprocessor features.
Modified: trunk/main/common/lib/Haver/Base.pm
===================================================================
--- trunk/main/common/lib/Haver/Base.pm 2004-06-18 03:37:16 UTC (rev 240)
+++ trunk/main/common/lib/Haver/Base.pm 2004-06-18 03:44:27 UTC (rev 241)
@@ -25,7 +25,7 @@
sub new {
my $this = shift;
- ASSERT: @_ == 1 || (@_ % 2) == 0;
+ #ASSERT: @_ == 1 || (@_ % 2) == 0;
my $me = @_ == 1 && ref($_[0]) ? shift : { @_ };
my $type = ref $me;
bless $me, ref($this) || $this;
@@ -38,7 +38,7 @@
}
}
- DEBUG: "DEBUG: Creating object: ", overload::StrVal($me);
+ #DEBUG(obj): "New: ", overload::StrVal($me);
$me->initialize(@_);
@@ -52,7 +52,7 @@
my $me = shift;
- DEBUG: "DEBUG: Destroying object: ", overload::StrVal($me);
+ #DEBUG(obj): "Destroy: ", overload::StrVal($me);
$me->finalize();
}
Modified: trunk/main/common/lib/Haver/Config.pm
===================================================================
--- trunk/main/common/lib/Haver/Config.pm 2004-06-18 03:37:16 UTC (rev
240)
+++ trunk/main/common/lib/Haver/Config.pm 2004-06-18 03:44:27 UTC (rev
241)
@@ -44,7 +44,7 @@
$me->{_default} = delete $me->{default};
}
- DEBUG: "Config file: ", $me->filename;
+ #DEBUG(paranoid): "Config file: ", $me->filename;
if ($me->filename) {
$me->load;
}
@@ -63,7 +63,7 @@
sub _load_data {
my ($me, $data) = @_;
- ASSERT: ref($data) eq 'HASH' or UNIVERSAL::isa($data, 'HASH');
+ #ASSERT: ref($data) eq 'HASH' or UNIVERSAL::isa($data, 'HASH');
foreach my $k (keys %$data) {
$me->{$k} = $data->{$k};
Modified: trunk/main/common/lib/Haver/Preprocessor.pm
===================================================================
--- trunk/main/common/lib/Haver/Preprocessor.pm 2004-06-18 03:37:16 UTC (rev
240)
+++ trunk/main/common/lib/Haver/Preprocessor.pm 2004-06-18 03:44:27 UTC (rev
241)
@@ -33,15 +33,15 @@
FILTER {
if ($Option{assert}) {
- s/^#?\s*ASSERT(?:\((.+?)\))?:\s*(.+?);$/assert($1, $2)/meg;
+ s/^\s*#?\s*ASSERT(?:\((.+?)\))?:\s*(.+?);$/assert($1, $2)/meg;
} else {
- s/^#?\s*ASSERT(?:\((.+?)\))?:/# ASSERT:/mg;
+ s/^\s*#?\s*ASSERT(?:\((.+?)\))?:/# ASSERT:/mg;
}
if (defined $Option{debug}) {
- s/^#?\s*DEBUG(?:\((\w+?)\))?:\s*(.+?);\s*$/debug($1, $2)/meg;
+ s/^\s*#?\s*DEBUG(?:\((\w+?)\))?:\s*(.+?);\s*$/debug($1, $2)/meg;
} else {
- s/^#?\s*DEBUG(?:\(\s*(\w+?)\s*\))?:/# DEBUG:/mg;
+ s/^\s*#?\s*DEBUG(?:\(\s*(\w+?)\s*\))?:/# DEBUG:/mg;
}
};
Modified: trunk/main/common/lib/Haver/Savable.pm
===================================================================
--- trunk/main/common/lib/Haver/Savable.pm 2004-06-18 03:37:16 UTC (rev
240)
+++ trunk/main/common/lib/Haver/Savable.pm 2004-06-18 03:44:27 UTC (rev
241)
@@ -43,8 +43,8 @@
my $filename = $me->filename;
my $fh;
- DEBUG: "Loading $me";
- ASSERT: defined $filename;
+ #DEBUG(obj): "Loading $me";
+ #ASSERT: defined $filename;
if (-e $filename) {
my $raw = _slurp($filename);
my $data = YAML::Load($raw);
@@ -80,7 +80,7 @@
my $filename = $me->filename;
my $fh;
- ASSERT: defined $filename;
+ #ASSERT: defined $filename;
my $mtime = do {
if (-e $filename) {
File::stat::populate(CORE::stat(_))->mtime;
@@ -88,7 +88,7 @@
$me->{_mtime};
}
};
- ASSERT: defined $mtime;
+ #ASSERT: defined $mtime;
File::Path::mkpath($me->directory);
@@ -99,7 +99,7 @@
print $fh YAML::Dump($save);
close $fh;
$me->{_mtime} = File::stat::stat($filename)->mtime;
- DEBUG: "Saving $me";
+ #DEBUG(obj): "Saving $me";
return 1;
} else {
carp "Cowardly refusing to overwrite $filename... $mtime !=
$me->{_mtime}";
@@ -109,7 +109,7 @@
sub overwrite {
my ($me, $val) = @_;
- ASSERT: @_ == 1 or @_ == 2;
+ #ASSERT: @_ == 1 or @_ == 2;
if (@_ == 1) {
return $me->{_overwrite};
Modified: trunk/main/common/lib/Haver/Util/Logger.pm
===================================================================
--- trunk/main/common/lib/Haver/Util/Logger.pm 2004-06-18 03:37:16 UTC (rev
240)
+++ trunk/main/common/lib/Haver/Util/Logger.pm 2004-06-18 03:44:27 UTC (rev
241)
@@ -29,7 +29,7 @@
sub create {
my $class = shift;
- ASSERT: (@_ == 1) or ((@_ % 2) == 0);
+ #ASSERT: (@_ == 1) or ((@_ % 2) == 0);
my $opts = @_ == 1 ? $_[0] : { @_ };
create POE::Session (
Modified: trunk/main/common/lib/Haver/Util/Misc.pm
===================================================================
--- trunk/main/common/lib/Haver/Util/Misc.pm 2004-06-18 03:37:16 UTC (rev
240)
+++ trunk/main/common/lib/Haver/Util/Misc.pm 2004-06-18 03:44:27 UTC (rev
241)
@@ -32,7 +32,7 @@
sub format_datetime {
# dylan: Because bd_ thought it should work this way...
- ASSERT: @_ <= 1;
+ #ASSERT: @_ <= 1;
my $now = @_ ? shift : time;
strftime('%Y-%m-%d %H:%M:%S %z', localtime($now));
