Merge git://github.com/darchon/clash into cλash

diff --git a/GlobalNameTable.hs b/GlobalNameTable.hs
index 756c6113c932e978e29a7bccd52d84669250e0e0..6317ebcee9a5125ef01519728edc8f8de05d700f 100644 (file)
--- a/GlobalNameTable.hs
+++ b/GlobalNameTable.hs
@@ -21,6 +21,6 @@ globalNameTable = mkGlobalNameTable
   , ("head"           , (1, genExprFCall headId                           ) )
   , ("hwxor"          , (2, genExprOp2 AST.Xor                            ) )
   , ("hwand"          , (2, genExprOp2 AST.And                            ) )
-  , ("hwor"           , (2, genExprOp2 AST.And                            ) )
+  , ("hwor"           , (2, genExprOp2 AST.Or                             ) )
   , ("hwnot"          , (1, genExprOp1 AST.Not                            ) )
   ]

diff --git a/VHDL.hs b/VHDL.hs
index 0f60fcb7a65d15bc23414488e4f0135a5d3c5207..4db744528851559f789d0ba7ccb62ef05471fed6 100644 (file)
--- a/VHDL.hs
+++ b/VHDL.hs
@@ -351,6 +351,7 @@ mkConcSm (bndr, (Case (Var scrut) b ty [(_, _, Var false), (con, _, Var true)]))
     return $ mkCondAssign (Left bndr) cond_expr true_expr false_expr
 mkConcSm (_, (Case (Var _) _ _ alts)) = error "VHDL.mkConcSm Not in normal form: Case statement with more than two alternatives"
 mkConcSm (_, Case _ _ _ _) = error "VHDL.mkConcSm Not in normal form: Case statement has does not have a simple variable as scrutinee"
+mkConcSm (bndr, expr) = error $ "VHDL.mkConcSM Unsupported binding in let expression: " ++ pprString bndr ++ " = " ++ pprString expr
 
 -- Create an unconditional assignment statement
 mkUncondAssign ::