Merge remote branch 'andy/master'

Author: pheaver

Makefile

@@ -35,3 +35,8 @@ derive:
 delete-trailing-whitespace:
 	@for f in `/usr/bin/find . -iname \*.hs`; do \
             sed -i -e 's/[ \t]*$$//g' $$f; done
+
+
+hudson:
+	cd netlist && cabal install
+	cd netlist-to-vhdl && cabal install

netlist-to-vhdl/Language/Netlist/GenVHDL.hs

@@ -137,8 +137,10 @@ pstmts ss = (vcat $ zipWith mkIf is ss)  $$ text "end if" <> semi
                        nest 2 (stmt s)
 
 event :: Event -> Doc
-event (Event i PosEdge) = text "rising_edge" <> parens (expr i)
-event (Event i NegEdge) = text "falling_edge" <> parens (expr i)
+event (Event i PosEdge)   = text "rising_edge" <> parens (expr i)
+event (Event i NegEdge)   = text "falling_edge" <> parens (expr i)
+event (Event i AsyncHigh) = expr i <+> text "= '1'"
+event (Event i AsyncLow)  = expr i <+> text "= '0'"
 
 stmt :: Stmt -> Doc
 stmt (Assign l r) = expr l <+> text "<=" <+> expr r <> semi

netlist/Language/Netlist/AST.hs

@@ -132,6 +132,8 @@ data Event
 data Edge
   = PosEdge
   | NegEdge
+  | AsyncHigh
+  | AsyncLow
   -- TODO: AnyEdge?
   deriving (Eq, Ord, Show, Data, Typeable)