integrate changes#2978,2979 from mainline

[perl5.git] / vms / vms_yfix.pl

diff --git a/vms/vms_yfix.pl b/vms/vms_yfix.pl
index 323a40d..08a8dbf 100644 (file)
--- a/vms/vms_yfix.pl
+++ b/vms/vms_yfix.pl
@@ -6,20 +6,37 @@
 # If it finds that the input files are already patches for VMS,
 # it just copies the input to the output.
 #
-# Revised 26-May-1995 by Charles Bailey  bailey@genetics.upenn.edu
+# Revised 20-Dec-1996 by Charles Bailey  bailey@genetics.upenn.edu
 
+$VERSION = '1.11';
+
+push(@ARGV,(qw[ perly.c perly.h vms/perly_c.vms vms/perly_h.vms])[@ARGV..4])
+    if @ARGV < 4;
 ($cinfile,$hinfile,$coutfile,$houtfile) = @ARGV;
 
 open C,$cinfile or die "Can't read $cinfile: $!\n";
 open COUT, ">$coutfile" or die "Can't create $coutfile: $!\n";
+print COUT <<EOH;
+/* Postprocessed by vms_yfix.pl $VERSION to add VMS declarations of globals */
+EOH
 while (<C>) {
-  if (/^dEXT/) {  # we've already got a fixed copy
-    print COUT $_,<C>;
-    last;
+  # "y.tab.c" is illegal as a VMS filename; DECC 5.2/VAX preprocessor
+  # doesn't like this.
+  if ( s/^#line\s+(\d+)\s+"y.tab.c"/#line $1 "y_tab.c"/ ) { 1; }
+  elsif (/char \*getenv/) {
+    # accomodate old VAXC's macro susbstitution pecularities
+    $_ = "#   ifndef getenv\n$_#   endif\n";
+  }
+  elsif ( /getenv\("YYDEBUG"\)/ ) {
+    # Reset the "error" status if an optional lookup fails
+    while (not /^\s+\}/) { print COUT; $_ = <C>; }
+    $_ .= "\telse SETERRNO(0,SS\$_NORMAL);\n";
+  }
+  else {
+    # add the dEXT tag to definitions of global vars, so we'll insert
+    # a globaldef when perly.c is compiled
+    s/^(short|int|YYSTYPE|char \*)\s*yy/dEXT $1 yy/;
   }
-  # add the dEXT tag to definitions of global vars, so we'll insert
-  # a globaldef when perly.c is compiled
-  s/^(short|int|YYSTYPE|char \*)\s*yy/dEXT $1 yy/;
   print COUT;
 }
 close C;
@@ -27,6 +44,9 @@ close COUT;
 
 open H,$hinfile  or die "Can't read $hinfile: $!\n";
 open HOUT, ">$houtfile" or die "Can't create $houtfile: $!\n";
+print HOUT <<EOH;
+/* Postprocessed by vms_yfix.pl $VERSION to add VMS declarations of globals */
+EOH
 $hfixed = 0;  # keep -w happy
 while (<H>) {
   $hfixed = /globalref/ unless $hfixed;  # we've already got a fixed copy