From cccb665ebac6e916c4f961eacbe11a9af7d7ceb3 Mon Sep 17 00:00:00 2001
From: Yann Herklotz <git@yannherklotz.com>
Date: Thu, 29 Aug 2019 15:44:33 +1000
Subject: Change name from VeriFuzz to VeriSmith

---
 src/VeriFuzz/Verilog/Preprocess.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/VeriFuzz/Verilog/Preprocess.hs')

diff --git a/src/VeriFuzz/Verilog/Preprocess.hs b/src/VeriFuzz/Verilog/Preprocess.hs
index c783ac5..c30252b 100644
--- a/src/VeriFuzz/Verilog/Preprocess.hs
+++ b/src/VeriFuzz/Verilog/Preprocess.hs
@@ -1,5 +1,5 @@
 {-|
-Module      : VeriFuzz.Verilog.Preprocess
+Module      : VeriSmith.Verilog.Preprocess
 Description : Simple preprocessor for `define and comments.
 Copyright   : (c) 2011-2015 Tom Hawkins, 2019 Yann Herklotz
 License     : GPL-3
@@ -14,7 +14,7 @@ The code is from https://github.com/tomahawkins/verilog.
 Edits to the original code are warning fixes and formatting changes.
 -}
 
-module VeriFuzz.Verilog.Preprocess
+module VeriSmith.Verilog.Preprocess
     ( uncomment
     , preprocess
     )
-- 
cgit 


From a2b01b92612a098673ff03890e6e8aef4ceb28ea Mon Sep 17 00:00:00 2001
From: Yann Herklotz <git@yannherklotz.com>
Date: Wed, 4 Sep 2019 20:15:51 +1000
Subject: Renaming to VeriSmith

---
 src/VeriFuzz/Verilog/Preprocess.hs | 111 -------------------------------------
 1 file changed, 111 deletions(-)
 delete mode 100644 src/VeriFuzz/Verilog/Preprocess.hs

(limited to 'src/VeriFuzz/Verilog/Preprocess.hs')

diff --git a/src/VeriFuzz/Verilog/Preprocess.hs b/src/VeriFuzz/Verilog/Preprocess.hs
deleted file mode 100644
index c30252b..0000000
--- a/src/VeriFuzz/Verilog/Preprocess.hs
+++ /dev/null
@@ -1,111 +0,0 @@
-{-|
-Module      : VeriSmith.Verilog.Preprocess
-Description : Simple preprocessor for `define and comments.
-Copyright   : (c) 2011-2015 Tom Hawkins, 2019 Yann Herklotz
-License     : GPL-3
-Maintainer  : yann [at] yannherklotz [dot] com
-Stability   : experimental
-Portability : POSIX
-
-Simple preprocessor for `define and comments.
-
-The code is from https://github.com/tomahawkins/verilog.
-
-Edits to the original code are warning fixes and formatting changes.
--}
-
-module VeriSmith.Verilog.Preprocess
-    ( uncomment
-    , preprocess
-    )
-where
-
--- | Remove comments from code. There is no difference between @(* *)@ and
--- @/* */@, therefore in this implementation, @*/@ could close @(*@ and vice-versa,
--- This will be fixed in an upcoming version.
-uncomment :: FilePath -> String -> String
-uncomment file = uncomment'
-  where
-    uncomment' a = case a of
-        ""               -> ""
-        '/' : '/' : rest -> "  " ++ removeEOL rest
-        '/' : '*' : rest -> "  " ++ remove rest
-        '(' : '*' : rest -> "  " ++ remove rest
-        '"'       : rest -> '"' : ignoreString rest
-        b         : rest -> b : uncomment' rest
-
-    removeEOL a = case a of
-        ""          -> ""
-        '\n' : rest -> '\n' : uncomment' rest
-        '\t' : rest -> '\t' : removeEOL rest
-        _    : rest -> ' ' : removeEOL rest
-
-    remove a = case a of
-        "" -> error $ "File ended without closing comment (*/): " ++ file
-        '"'       : rest -> removeString rest
-        '\n'      : rest -> '\n' : remove rest
-        '\t'      : rest -> '\t' : remove rest
-        '*' : '/' : rest -> "  " ++ uncomment' rest
-        '*' : ')' : rest -> "  " ++ uncomment' rest
-        _         : rest -> " " ++ remove rest
-
-    removeString a = case a of
-        "" -> error $ "File ended without closing string: " ++ file
-        '"'        : rest -> " " ++ remove rest
-        '\\' : '"' : rest -> "  " ++ removeString rest
-        '\n'       : rest -> '\n' : removeString rest
-        '\t'       : rest -> '\t' : removeString rest
-        _          : rest -> ' ' : removeString rest
-
-    ignoreString a = case a of
-        "" -> error $ "File ended without closing string: " ++ file
-        '"'        : rest -> '"' : uncomment' rest
-        '\\' : '"' : rest -> "\\\"" ++ ignoreString rest
-        b          : rest -> b : ignoreString rest
-
--- | A simple `define preprocessor.
-preprocess :: [(String, String)] -> FilePath -> String -> String
-preprocess env file content = unlines $ pp True [] env $ lines $ uncomment
-    file
-    content
-  where
-    pp :: Bool -> [Bool] -> [(String, String)] -> [String] -> [String]
-    pp _  _     _    []         = []
-    pp on stack env_ (a : rest) = case words a of
-        "`define" : name : value ->
-            ""
-                : pp
-                      on
-                      stack
-                      (if on
-                          then (name, ppLine env_ $ unwords value) : env_
-                          else env_
-                      )
-                      rest
-        "`ifdef" : name : _ ->
-            "" : pp (on && elem name (map fst env_)) (on : stack) env_ rest
-        "`ifndef" : name : _ ->
-            "" : pp (on && notElem name (map fst env_)) (on : stack) env_ rest
-        "`else" : _
-            | not $ null stack
-            -> "" : pp (head stack && not on) stack env_ rest
-            | otherwise
-            -> error $ "`else  without associated `ifdef/`ifndef: " ++ file
-        "`endif" : _
-            | not $ null stack
-            -> "" : pp (head stack) (tail stack) env_ rest
-            | otherwise
-            -> error $ "`endif  without associated `ifdef/`ifndef: " ++ file
-        _ -> (if on then ppLine env_ a else "") : pp on stack env_ rest
-
-ppLine :: [(String, String)] -> String -> String
-ppLine _   ""        = ""
-ppLine env ('`' : a) = case lookup name env of
-    Just value -> value ++ ppLine env rest
-    Nothing    -> error $ "Undefined macro: `" ++ name ++ "  Env: " ++ show env
-  where
-    name = takeWhile
-        (flip elem $ ['A' .. 'Z'] ++ ['a' .. 'z'] ++ ['0' .. '9'] ++ ['_'])
-        a
-    rest = drop (length name) a
-ppLine env (a : b) = a : ppLine env b
-- 
cgit