From: Christiaan Baaij <christiaan.baaij@gmail.com>
Date: Fri, 31 Jul 2009 15:15:54 +0000 (+0200)
Subject: Fail again when we find a global function
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=644012d4ca01c5af3f678e723d6a35a8022b82e3;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git

Fail again when we find a global function

Was only disabled to fix the builtin TFVec function
---

diff --git "a/c\316\273ash/CLasH/VHDL/Generate.hs" "b/c\316\273ash/CLasH/VHDL/Generate.hs"
index e5d6bf5..619121a 100644
--- "a/c\316\273ash/CLasH/VHDL/Generate.hs"
+++ "b/c\316\273ash/CLasH/VHDL/Generate.hs"
@@ -166,7 +166,7 @@ genSizedInt = genFromInteger
 
 genTFVec :: BuiltinBuilder
 genTFVec (Left res) f [Left veclist] = do {
-  ; let (CoreSyn.Let (CoreSyn.Rec letbndrs) rez) = trace ("\n***\n" ++ show veclist ++ "\n**\n" ++ pprString veclist ++ "\n***\n") veclist
+  ; let (CoreSyn.Let (CoreSyn.Rec letbndrs) rez) = veclist
   ; letapps <- mapM genLetApp letbndrs
   ; let bndrs = Maybe.catMaybes (map fst letapps)
   ; (aap,kooi) <- reduceFSVECListToHsList rez
@@ -613,7 +613,7 @@ genApplication dst f args = do
                 builder dst f args
               else
                 error $ "\nGenerate.genApplication(VanillaGlobal): Incorrect number of arguments to builtin function: " ++ pprString f ++ " Args: " ++ show args
-            Nothing -> return $ trace ("\nGenerate.genApplication(VanillaGlobal): Using function from another module that is not a known builtin: " ++ (pprString f)) []
+            Nothing -> error $ ("\nGenerate.genApplication(VanillaGlobal): Using function from another module that is not a known builtin: " ++ (pprString f))
         IdInfo.ClassOpId cls -> do
           -- FIXME: Not looking for what instance this class op is called for
           -- Is quite stupid of course.