[project @ 1998-12-21 09:39:56 by simonpj]

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

diff --git a/ghc/driver/ghc-iface.lprl b/ghc/driver/ghc-iface.lprl
index b9a7231..7bcd3c6 100644 (file)
--- a/ghc/driver/ghc-iface.lprl
+++ b/ghc/driver/ghc-iface.lprl
@@ -108,7 +108,6 @@ sub constructNewHiFile {
     print NEWHI $Stuff{'new:usages'} unless $Stuff{'new:usages'} eq '';
     print NEWHI $Stuff{'new:instance_modules'} unless $Stuff{'new:instance_modules'} eq '';
     print NEWHI $Stuff{'new:exports'};
-    print NEWHI $Stuff{'new:fixities'} unless $Stuff{'new:fixities'} eq '';
     print NEWHI $Stuff{'new:instances'} unless $Stuff{'new:instances'} eq '';
 
     foreach $v (@decl_names) {
@@ -148,7 +147,6 @@ sub readHiFile {
     $Stuff{"$mod:instance_modules"} = '';
     $Stuff{"$mod:usages"}          = ''; # stuff glommed together
     $Stuff{"$mod:exports"}         = '';
-    $Stuff{"$mod:fixities"}        = '';
     $Stuff{"$mod:instances"}       = '';
     $Stuff{"$mod:declarations"}            = '';
 
@@ -177,9 +175,6 @@ sub readHiFile {
        } elsif ( /^__export/ ) {
            $Stuff{"$mod:exports"} .= $_;
 
-       } elsif ( /^infix(r|l)? / ) {
-           $Stuff{"$mod:fixities"} .= $_;
-
        } elsif ( /^instance / ) {
            $Stuff{"$mod:instances"} .= $_;
 
@@ -220,6 +215,12 @@ sub readHiFile {
                $Decl{"$mod:$current_name"} = $_;
                if ($mod eq "old") { $OldVersion{$current_name} = $version; }
 
+          } elsif ( /^infix(r|l)?\s+[0-9]\s+(\S+)/ ) {
+                   # fixity declaration
+               $current_name = "fixity $2";
+               $Decl{"$mod:$current_name"} = $_;
+               if ($mod eq "old") { $OldVersion{$current_name} = $version; }
+
           } elsif ( /^(\S+)\s+::\s+/ ) {
                        # Value declaration
                $current_name = $1;