From: simonpj <unknown>
Date: Mon, 21 Dec 1998 09:39:56 +0000 (+0000)
Subject: [project @ 1998-12-21 09:39:56 by simonpj]
X-Git-Tag: Approx_2487_patches~175
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=ec7851802e3cd59aa8ed5691b319b01f2ddc93da;p=ghc-hetmet.git

[project @ 1998-12-21 09:39:56 by simonpj]
Forgot to commit changes to interface file munging in ghc-iface.lprl
---

diff --git a/ghc/driver/ghc-iface.lprl b/ghc/driver/ghc-iface.lprl
index b9a7231..7bcd3c6 100644
--- 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;