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

[matthijs/master-project/cλash.git] / Constants.hs

diff --git a/Constants.hs b/Constants.hs
index d941e13671697b88c4103cbaa0e11c925583c542..af8c324b300e2f52aae2ca36f8a42960e6fde837 100644 (file)
--- a/Constants.hs
+++ b/Constants.hs
@@ -95,8 +95,8 @@ lengthId = "length"
 
 
 -- | isnull (function null in original Haskell source) function identifier
-isnullId :: String
-isnullId = "isnull"
+nullId :: String
+nullId = "null"
 
 
 -- | replace function identifier
@@ -149,14 +149,38 @@ rotlId = "rotl"
 rotrId :: String
 rotrId = "rotr"
 
+-- | concatenate the vectors in a vector
+concatId :: String
+concatId = "concat"
+
 -- | reverse function identifier
 reverseId :: String
 reverseId = "reverse"
 
+-- | iterate function identifier
+iterateId :: String
+iterateId = "iterate"
+
+-- | iteraten function identifier
+iteratenId :: String
+iteratenId = "iteraten"
+
+-- | iterate function identifier
+generateId :: String
+generateId = "generate"
+
+-- | iteraten function identifier
+generatenId :: String
+generatenId = "generaten"
+
 -- | copy function identifier
 copyId :: String
 copyId = "copy"
 
+-- | copyn function identifier
+copynId :: String
+copynId = "copyn"
+
 -- | map function identifier
 mapId :: String
 mapId = "map"
@@ -165,9 +189,22 @@ mapId = "map"
 zipWithId :: String
 zipWithId = "zipWith"
 
+-- | foldl function identifier
 foldlId :: String
 foldlId = "foldl"
 
+-- | foldr function identifier
+foldrId :: String
+foldrId = "foldr"
+
+-- | zip function identifier
+zipId :: String
+zipId = "zip"
+
+-- | unzip function identifier
+unzipId :: String
+unzipId = "unzip"
+
 -- | hwxor function identifier
 hwxorId :: String
 hwxorId = "hwxor"
@@ -184,6 +221,8 @@ hwnotId = "hwnot"
 hwandId :: String
 hwandId = "hwand"
 
+lengthTId :: String
+lengthTId = "lengthT"
 
 ------------------
 -- VHDL type marks