Changeset 23454

Timestamp:

11/13/08 01:27:22 (5 years ago)

Author:

tokuhirom

Message:

シンプルなように実装。

Location:

lang/perl/MENTA/trunk

Files:

• bin/cgi-server.pl (modified) (1 diff)
• lib/MENTA/Builder.pm (modified) (2 diffs)
• plugins/dbi_select.pl (modified) (1 diff)

lang/perl/MENTA/trunk/bin/cgi-server.pl

@@ -16 +16 @@
             waitpid($pid, POSIX::WNOHANG);
         } elsif ($pid == 0) {
-            system "$^X bin/menta.pl";
-            chdir 'out';
+            chdir 'app';
             my $out = MENTA::BindSTDOUT->bind(sub {
+                package main;
                 do './menta.cgi';
                 die $@ if $@;

lang/perl/MENTA/trunk/lib/MENTA/Builder.pm

@@ -8 +8 @@
 my $OUTPUT_DIR = 'out';
 my $SOURCE_DIR = 'app';
-
-my $TMPL = <<'...';
-### SHEBANG ###
-use strict;
-use warnings;
-use utf8;
-
-### INCLUDE 'lib/MENTA.pm' ###
-### INCLUDE 'app/menta.cgi' ###
-...
-
-sub replace {
-    my ($src, $params) = @_;
-    $src =~ s{###\s+INCLUDE\s+'([^']+)'\s+###}{
-        read_source($1);
-    }gem;
-    while (my ($key, $val) = each %$params) {
-        $src =~ s/### $key ###/$val/g;
-    }
-    $src;
-}
-
-sub read_source {
-    my $fname = shift;
-    my $src = _read_and_indent($fname, 1);
-    $src =~ s{require\s+['"]([^'"]+)['"]\s*;}{
-        my $fname = $1;
-        $fname =~ s!^\.\./*!!;
-        _read_and_indent($fname, 2);
-    }ge;
-    $src;
-}
-
-sub _read_and_indent {
-    my ($fname, $indent_level) = @_;
-    my $one_level = 4;
-    my $indent = ' ' x ($indent_level*$one_level);
-    "{\n" . join("\n", grep { /^\s*$/ or $_ = $indent . $_; 1 }
-                       split("\n", read_file($fname)))
-          . "\n" . (' ' x (($indent_level-1)*$one_level)) . "}\n";
-}
 
 sub run {
@@ -63 +22 @@
 sub generate_cgi {
     say "menta.cgi をつくりあげる";
-    my $menta = $TMPL;
-    $menta = replace($menta, {
-        SHEBANG => do {
-            my ($shebang,) = split /\r\n|[\r\n]/, read_file('app/menta.cgi');
-            $shebang;
-        },
-    });
+    my ($shebang,) = split /\r\n|[\r\n]/, read_file('app/menta.cgi');
+    my $menta = "$shebang\n$TMPL";
+    $menta .= read_file('lib/MENTA.pm');
+    $menta .= read_file('app/menta.cgi');
     $menta =~ s/use MENTA;/package main;/g;
-    $menta =~ s/use lib 'lib';//;
+    $menta =~ s!use lib '\..\/lib';!!;
     say "menta.cgi を出力しています";
     write_file("$OUTPUT_DIR/menta.cgi" => $menta);

lang/perl/MENTA/trunk/plugins/dbi_select.pl

@@ -18 +18 @@
 }
 
+1;