Fiddled with the Show/showCode capabilities of the newtype Var in UsageCheck
This commit is contained in:
parent
4a8653cc41
commit
668ed9531e
|
@ -28,9 +28,10 @@ import qualified AST as A
|
||||||
import Errors
|
import Errors
|
||||||
import FlowGraph
|
import FlowGraph
|
||||||
import Metadata
|
import Metadata
|
||||||
|
import ShowCode
|
||||||
|
|
||||||
|
newtype Var = Var A.Variable deriving (Show)
|
||||||
|
|
||||||
newtype Var = Var A.Variable
|
|
||||||
|
|
||||||
customVarCompare :: A.Variable -> A.Variable -> Ordering
|
customVarCompare :: A.Variable -> A.Variable -> Ordering
|
||||||
customVarCompare (A.Variable _ (A.Name _ _ lname)) (A.Variable _ (A.Name _ _ rname)) = compare lname rname
|
customVarCompare (A.Variable _ (A.Name _ _ lname)) (A.Variable _ (A.Name _ _ rname)) = compare lname rname
|
||||||
|
@ -42,11 +43,16 @@ instance Eq Var where
|
||||||
instance Ord Var where
|
instance Ord Var where
|
||||||
compare (Var a) (Var b) = customVarCompare a b
|
compare (Var a) (Var b) = customVarCompare a b
|
||||||
|
|
||||||
|
instance ShowOccam Var where
|
||||||
|
showOccamM (Var v) = showOccamM v
|
||||||
|
instance ShowRain Var where
|
||||||
|
showRain (Var v) = showRain v
|
||||||
|
|
||||||
data Vars = Vars {
|
data Vars = Vars {
|
||||||
readVars :: Set.Set Var
|
readVars :: Set.Set Var
|
||||||
,writtenVars :: Set.Set Var
|
,writtenVars :: Set.Set Var
|
||||||
,usedVars :: Set.Set Var -- for channels, barriers, etc
|
,usedVars :: Set.Set Var -- for channels, barriers, etc
|
||||||
}
|
} deriving (Eq, Show)
|
||||||
|
|
||||||
data Decl = ScopeIn String | ScopeOut String deriving (Show, Eq)
|
data Decl = ScopeIn String | ScopeOut String deriving (Show, Eq)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user