X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=ian-dotfiles.git;a=blobdiff_plain;f=gpt;h=f16320caa464853689ee842154c95949592222ac;hp=c50443ad910460820896cf4758290a40d896ce07;hb=2101c0a7fa5dbbc6df915feab299d5f1c2f5b124;hpb=5911e56cc5a8a9f572a5887e232feb2a37df5159

diff --git a/gpt b/gpt
index c50443a..f16320c 100755
--- a/gpt
+++ b/gpt
@@ -19,7 +19,7 @@ use IO::File;
 
 open DEBUG, ">/dev/null" or die "gpt: /dev/null: $!\n";
 
-while (@main::ARGV =~ m/^-/) {
+while ($main::ARGV[0] =~ m/^-/) {
     $_= shift @main::ARGV;
     next if m/^--$/;
     while (m/^-./) {
@@ -41,15 +41,19 @@ if (!@main::ARGV) {
 } else {
     for ($i=0; $i<@main::ARGV; $i++) {
 	$lno= '<arg#'.($i+1).'>';
-	$value= $main::ARGV[$i];
-	$fh= new IO::File $value,'r' or err("cannot open file \`$value': $!");
-	process_fh($fh,$value);
-	$fh->close or err("gpt: cannot close file \`$value': $!");
+	process_file($main::ARGV[$i]);
     }
 }
 close STDOUT or die "gpt: close stdout: $!\n";
 exit 0;
 
+sub process_file ($) {
+    my ($value) = @_;
+    $fh= new IO::File $value,'r' or err("cannot open file \`$value': $!");
+    process_fh($fh,$value);
+    $fh->close or err("gpt: cannot close file \`$value': $!");
+}
+
 sub err ($) { die "gpt: $fn:$lno: $_[0]\n"; }
 
 sub add_perl ($) {
@@ -122,6 +126,7 @@ sub process_input () {
 		if ($op =~ m/[-< \$?]/) {
 		    $substr.= $esc if @oplist;
 		    push @oplist, $op;
+		    add_perl($op) if $op =~ m/[\$]/;
 		} elsif ($op =~ m/[\)\}\;\:]/) {
 		    err("unmatched closing \@\@$op") unless @oplist;
 		    $want= pop @oplist;
@@ -160,6 +165,8 @@ sub process_input () {
 		    } else {
 			$substr.= $esc;
 		    }
+		} elsif ($op eq '#') {
+		    $l =~ s/^[^\n]*//; $l =~ s/^\n//;
 		} else {
 		    err("bad escape sequence \@\@$op in text part");
 		}
@@ -171,6 +178,26 @@ sub process_input () {
     }
 }
 
+sub close_nesteds () {
+    my ($op);
+    while (@oplist) {
+	$op= $oplist[$#oplist];
+	if (@oplist & 1) {
+	    err("unterminated \@\@?") if $op eq '?';
+	    $l=' @@';
+	} else {
+	    if ($op =~ y/({/)}/) {
+		$l= '@@'.$op;
+	    } elsif ($op =~ m/^[;:]+/) {
+		$l= '@@;';
+	    } else {
+		die "intern /@oplist/";
+	    }
+	}
+	process_input();
+    }
+}
+
 sub process_fh ($$) {
     local ($fh,$fn) = @_;
     local ($l,$lno, @oplist,$substr,$expr,$to,$op);
@@ -180,7 +207,9 @@ sub process_fh ($$) {
 	$lno= $.;
 	process_input();
     }
+    
     die "gpt: $fn: read error: $!" if $fh->error;
+    close_nesteds();
 }
 
 sub output ($) {
@@ -199,5 +228,6 @@ sub process_i ($) {
     local ($outbuf, @oplist,$substr,$expr,$to,$op);
     $outbuf='';
     process_input();
+    close_nesteds();
     return $outbuf;
 }