[project @ 1997-09-24 16:05:45 by simonm]

[ghc-hetmet.git] / ghc / driver / ghc-iface.lprl

diff --git a/ghc/driver/ghc-iface.lprl b/ghc/driver/ghc-iface.lprl
index fde7412..ebd4778 100644 (file)
--- a/ghc/driver/ghc-iface.lprl
+++ b/ghc/driver/ghc-iface.lprl
@@ -22,14 +22,15 @@ sub postprocessHiFile {
          $going_interactive) = @_;
 
     local($new_hi) = "$Tmp_prefix.hi-new";
+    local($show_hi_diffs) = $HiDiff_flag && ! $HiOnStdout && ! $going_interactive && -f $hifile_target;
 
-    print STDERR "*** New hi file follows...\n"
-    print STDERR `$Cat $hsc_hi`;
+    print STDERR "*** New hi file follows...\n" if $Verbose;
+    system("$Cat $hsc_hi 1>&2") if $Verbose;
 
-    &constructNewHiFile($hsc_hi, $hifile_target, $new_hi);
+    &constructNewHiFile($hsc_hi, $hifile_target, $new_hi, $show_hi_diffs);
 
     # run diff if they asked for it
-    if ($HiDiff_flag && ! $HiOnStdout && ! $going_interactive && -f $hifile_target) {
+    if ($show_hi_diffs) {
        if ( $HiDiff_flag eq 'usages' ) {
            # lots of near-useless info; but if you want it...
            &run_something("$Cmp -s $hifile_target $new_hi || $Diff $hifile_target $new_hi 1>&2 || exit 0",
@@ -50,7 +51,7 @@ sub postprocessHiFile {
     # if we produced an interface file "no matter what",
     # print what we got on stderr (ToDo: honor -ohi flag)
     if ( $HiOnStdout ) {
-       print STDERR `$Cat $new_hi`;
+        system("$Cat $new_hi 1>&2"); # if $Verbose;
     } else {
        &run_something("$Cmp -s $hifile_target $new_hi || ( $Rm $hifile_target && $Cp $new_hi $hifile_target )",
           "Replace .$HiSuffix file, if changed");
@@ -90,7 +91,8 @@ sub deUsagifyHi {
 sub constructNewHiFile {
     local($hsc_hi,         # The iface info produced by hsc.
          $hifile_target,   # Pre-existing .hi filename (if it exists)
-         $new_hi) = @_;    # Filename for new one
+         $new_hi,          # Filename for new one
+         $show_hi_diffs) = @_;
 
     &readHiFile('old',$hifile_target) unless $HiHasBeenRead{'old'} == 1;
     &readHiFile('new',$hsc_hi)       unless $HiHasBeenRead{'new'} == 1;
@@ -128,7 +130,7 @@ sub constructNewHiFile {
 
     print NEWHI "_declarations_\n";
     foreach $v (@decl_names) {
-       &printNewItemVersion(NEWHI, $v, $new_module_version);           # Print new version number
+       &printNewItemVersion(NEWHI, $v, $new_module_version, $show_hi_diffs);           # Print new version number
        print NEWHI $Decl{"new:$v"};            # Print the new decl itself
     }
 
@@ -169,7 +171,7 @@ sub readHiFile {
        next if /\{-# GHC_PRAGMA INTERFACE VERSION 20 #-\}/;
 
        # avoid pre-1.3 interfaces
-#print STDERR "now_in:$now_in:$_";
+        #print STDERR "now_in:$now_in:$_";
        if ( /\{-# GHC_PRAGMA INTERFACE VERSION . #-\}/ ) {
            $HiExists{$mod} = 0;
            last hi_line;
@@ -185,13 +187,15 @@ sub readHiFile {
        } elsif ( /^_([a-z_]+)_$/ ) {
            $now_in = $1;
 
-       } elsif ( $now_in eq 'usages' && /^(\S+)\s+(\d+)\s+:: (.*)/ ) {
+       } elsif ( $now_in eq 'usages' && /^(\S+)\s+(!\s+)?(\d+)\s+::(.*)/ ) {
            $Stuff{"$mod:usages"} .= $_; # save the whole thing
 
 
        } elsif ( $now_in =~ /^(exports|instance_modules|instances|fixities)$/ ) {
            $Stuff{"$mod:$1"} .= $_; # just save it up
 
+       } elsif ( /^--.*/ ) { # silently ignore comment lines.
+           ;
        } elsif ( $now_in eq 'declarations' ) { # relatively special treatment needed...
        # We're in a declaration
 
@@ -206,7 +210,7 @@ sub readHiFile {
                $_ = $2;
           }
        
-           if ( /^(\S+)\s+::\s+/ ) {
+           if ( /^(\S+)\s+_:_\s+/ ) {
                $current_name = $1;
                $Decl{"$mod:$current_name"} = $_;
                if ($mod eq "old") { $OldVersion{$current_name} = $version; }
@@ -221,13 +225,10 @@ sub readHiFile {
                $Decl{"$mod:$current_name"} = $_;
                if ($mod eq "old") { $OldVersion{$current_name} = $version; }
 
-           } elsif ( /class\s+(.*\s+=>\s+)?(\S+)\s+.*where\s+\{.*\};/ ) {
+           } elsif ( /^class\s+(\{[^{}]*\}\s+=>\s+)?(\S+)\s+/ ) {
                # must be wary of => bit matching after "where"...
-               $current_name = $2;
-               $Decl{"$mod:$current_name"} = $_;
-               if ($mod eq "old") { $OldVersion{$current_name} = $version; }
-
-           } elsif ( /class\s+(.*\s+=>\s+)?(\S+)\s+/ ) {
+               # ..hence the [^{}] part
+               # NB: a class decl may not have a where part at all
                $current_name = $2;
                $Decl{"$mod:$current_name"} = $_;
                if ($mod eq "old") { $OldVersion{$current_name} = $version; }
@@ -287,24 +288,27 @@ sub mv_change {
 }
 
 sub printNewItemVersion {
-    local($hifile, $item, $mod_version) = @_;
+    local($hifile, $item, $mod_version, $show_hi_diffs) = @_;
     local($idecl) = $Decl{"new:$item"};
+    
 
     if (! defined($Decl{"old:$item"})) {       # Old decl doesn't exist
-       print STDERR "new: $item\n";
-       print $hifile  "$mod_version ";         # Use module version
-
-    } elsif ($idecl ne $Decl{"old:$item"})  {  # Old decl differs from new decl
-       local($odecl) = $Decl{"old:$item"};
-#      print STDERR "changed: $item\nOld: $odecl\nNew: $idecl\n";
+       if ($show_hi_diffs) {print STDERR "new: $item\n";}
        print $hifile  "$mod_version ";         # Use module version
 
     } elsif (! defined($OldVersion{"$item"}) ) {
-       print STDERR "$item: no old version?!\n";
+       if ($show_hi_diffs) {print STDERR "$item: no old version?!\n";}
        print $hifile  "$mod_version ";                 # Use module version
 
+    } elsif ($idecl ne $Decl{"old:$item"})  {  # Old decl differs from new decl
+       local($odecl) = $Decl{"old:$item"};
+       if ($show_hi_diffs) {print STDERR "changed: $item\nOld: $odecl", "New: $idecl";}
+       print $hifile  "--old: ", $OldVersion{"$item"}, " $odecl" 
+                       if $Keep_HiDiffs;         # show old in interface file
+       print $hifile  "$mod_version ";           # Use module version
+
     } else {                                   # Identical decls, so use old version number
-       print STDERR "$item: unchanged\n";
+       #if ($show_hi_diffs) {print STDERR "$item: unchanged\n";}
        print $hifile  $OldVersion{"$item"}, " ";
     }
     return;