minor preprocessor tweak to make win32 joyous again

rcaputo · Aug 8, 2000 · 4370848 · 4370848
1 parent 29ecf49
commit 4370848
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/Changes b/Changes
@@ -54,6 +54,15 @@ Version numbers have four fields: X.YYZZAA
 `-----------------
 
 
+0.1104 2000.??.??
+-----------------
+
+Thanks to jaxdahl's donation of shell time on a Windows 2000 machine,
+I think I've found a bug in POE::Preprocessor.  This bug only occurs
+on Windows machines so far.  Although it should also appear on other
+multi-byte newline systems, it doesn't on my OS/2 system.
+
+
 0.1103 2000.08.06
 -----------------
 

diff --git a/lib/POE/Component/Server/TCP.pm b/lib/POE/Component/Server/TCP.pm
@@ -1,9 +1,9 @@
 # $Id$
 
-use strict;
-
 package POE::Component::Server::TCP;
 
+use strict;
+
 use Carp qw(carp croak);
 use vars qw($VERSION);
 

diff --git a/lib/POE/Preprocessor.pm b/lib/POE/Preprocessor.pm
@@ -144,7 +144,7 @@ sub import {
             DEBUG and warn sprintf "%4d M: %s", $line_number, $_;
 
             # Close it!
-            if (/^\}$/) {
+            if (/^\}\s*$/) {
 
               DEBUG and
                 warn( ",-----\n",
@@ -157,7 +157,7 @@ sub import {
                       "`-----\n"
                     );
 
-              unless ($macros{$macro_name}->[MAC_CODE] =~ /\;$/) {
+              unless ($macros{$macro_name}->[MAC_CODE] =~ /\;\s*$/) {
                 $macros{$macro_name}->[MAC_CODE] =~ s/^\s*//;
                 $macros{$macro_name}->[MAC_CODE] =~ s/\s*$//;
               }