minor type cleanup and fixes

- remove outdated flexible partial type eq and show instances
- properly disallow incomplete declarations
- disallow var after net type
- remove unused edge case in InterfaceT representation

src/Language/SystemVerilog/AST/Type.hs

@@ -61,9 +61,8 @@ instance Show Type where
     show (IntegerVector kw sg rs) = printf "%s%s%s" (show kw) (showPadBefore sg) (showRanges rs)
     show (IntegerAtom   kw sg   ) = printf "%s%s"   (show kw) (showPadBefore sg)
     show (NonInteger    kw      ) = printf "%s"     (show kw)
-    show (InterfaceT "" "" r) = "interface" ++ showRanges r
-    show (InterfaceT x y r) = x ++ yStr ++ (showRanges r)
-        where yStr = if null y then "" else '.' : y
+    show (InterfaceT    "" "" rs) = printf "interface%s" ( showRanges rs)
+    show (InterfaceT    xx yy rs) = printf "%s.%s%s" xx yy (showRanges rs)
     show (Enum t vals r) = printf "enum %s{%s}%s" tStr (commas $ map showVal vals) (showRanges r)
         where
             tStr = showPad t
@@ -85,16 +84,6 @@ showFields items = itemsStr
 pattern UnknownType :: Type
 pattern UnknownType = Implicit Unspecified []
 
-instance Show ([Range] -> Type) where
-    show tf = show (tf [])
-instance Eq ([Range] -> Type) where
-    (==) tf1 tf2 = (tf1 []) == (tf2 [])
-
-instance Show (Signing -> [Range] -> Type) where
-    show tf = show (tf Unspecified)
-instance Eq (Signing -> [Range] -> Type) where
-    (==) tf1 tf2 = (tf1 Unspecified) == (tf2 Unspecified)
-
 typeRanges :: Type -> ([Range] -> Type, [Range])
 typeRanges typ =
     case typ of

src/Language/SystemVerilog/Parser/ParseDecl.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE PatternSynonyms #-}
 {- sv2v
  - Author: Zachary Snow <zach@zachjs.com>
  -
@@ -74,7 +73,6 @@ data DeclToken
     | DTLifetime Position Lifetime
     | DTAttr     Position Attr
     | DTEnd      Position Char
-    deriving Eq
 
 
 -- [PUBLIC]: parser for module port declarations, including interface ports
@@ -262,13 +260,14 @@ parseDTsAsDeclOrStmt tokens =
 -- beginning of the given token list
 declLookahead :: [DeclToken] -> Bool
 declLookahead l0 =
-    l0 /= l5 && tripLookahead l5
+    length l0 /= length l6 && tripLookahead l6
     where
         (_, l1) = takeDir      l0
         (_, l2) = takeLifetime l1
-        (_, l3) = takeVarOrNet l2
-        (_, l4) = takeType     l3
-        (_, l5) = takeRanges   l4
+        (_, l3) = takeConst    l2
+        (_, l4) = takeVarOrNet l3
+        (_, l5) = takeType     l4
+        (_, l6) = takeRanges   l5
 
 -- internal; parser for leading statements in a procedural block
 parseDTsAsStmt :: [DeclToken] -> [Stmt]
@@ -391,21 +390,27 @@ parseDTsAsComponent :: [DeclToken] -> (Component, [DeclToken])
 parseDTsAsComponent l0 =
     if l /= Nothing && l /= Just Automatic then
         parseError (head l1) "unexpected non-automatic lifetime"
-    else if dir == Local && length l2 == length l5 then
+    else if dir == Local && isImplicit t && not (isNet $ head l3) then
         parseError (head l0) "declaration missing type information"
     else
-        (component, l6)
+        (component, l7)
     where
         (dir, l1) = takeDir      l0
         (l  , l2) = takeLifetime l1
-        (von, l3) = takeVarOrNet l2
-        (tf , l4) = takeType     l3
-        (rs , l5) = takeRanges   l4
-        (tps, l6) = takeTrips    l5
+        (_ct, l3) = takeConst    l2
+        (von, l4) = takeVarOrNet l3
+        (tf , l5) = takeType     l4
+        (rs , l6) = takeRanges   l5
+        (tps, l7) = takeTrips    l6
         position = tokPos $ head l0
-        base = von dir $ tf rs
+        base = von dir t
+        t = tf rs
         component = (position, base, tps)
 
+isImplicit :: Type -> Bool
+isImplicit Implicit{} = True
+isImplicit _ = False
+
 takeTrips :: [DeclToken] -> ([Triplet], [DeclToken])
 takeTrips l0 =
     (trip : trips, l5)
@@ -441,10 +446,15 @@ takeLifetime :: [DeclToken] -> (Maybe Lifetime, [DeclToken])
 takeLifetime (DTLifetime _ l : rest) = (Just  l, rest)
 takeLifetime                   rest  = (Nothing, rest)
 
-takeVarOrNet :: [DeclToken] -> (Direction -> Type -> DeclBase, [DeclToken])
-takeVarOrNet (DTConst{} : DTConst pos : _) =
+takeConst :: [DeclToken] -> (Bool, [DeclToken])
+takeConst (DTConst{} : DTConst pos : _) =
     parseError pos "duplicate const modifier"
-takeVarOrNet (DTConst _ : tokens) = takeVarOrNet tokens
+takeConst (DTConst{} : tokens) = (True, tokens)
+takeConst tokens = (False, tokens)
+
+takeVarOrNet :: [DeclToken] -> (Direction -> Type -> DeclBase, [DeclToken])
+takeVarOrNet (DTNet{} : DTVar pos : _) =
+    parseError pos "unexpected var after net type"
 takeVarOrNet (DTNet _ n s : tokens) = (\d -> Net d n s, tokens)
 takeVarOrNet tokens = (Variable, tokens)
 
@@ -550,6 +560,10 @@ isPorts :: DeclToken -> Bool
 isPorts DTPorts{} = True
 isPorts _ = False
 
+isNet :: DeclToken -> Bool
+isNet DTNet{} = True
+isNet _ = False
+
 tokPos :: DeclToken -> Position
 tokPos (DTComma    p) = p
 tokPos (DTAutoDim  p) = p

test/error/decl_ranged_implicit.sv

@@ -0,0 +1,4 @@
+// pattern: decl_ranged_implicit\.sv:3:5: Parse error: declaration missing type information
+module top;
+    [1:0] x;
+endmodule

test/error/decl_signed_implicit.sv

@@ -0,0 +1,4 @@
+// pattern: decl_signed_implicit\.sv:3:5: Parse error: declaration missing type information
+module top;
+    signed x;
+endmodule

test/error/decl_wire_var.sv

@@ -0,0 +1,4 @@
+// pattern: decl_wire_var\.sv:3:10: Parse error: unexpected var after net type
+module top;
+    wire var x;
+endmodule