expanded support for macros in preprocessor directives

src/Language/SystemVerilog/Parser/Lex.x

@@ -32,6 +32,7 @@ module Language.SystemVerilog.Parser.Lex
 import System.FilePath (dropFileName)
 import System.Directory (findFile)
 import System.IO.Unsafe (unsafePerformIO)
+import Text.Read (readMaybe)
 import qualified Data.Map.Strict as Map
 import qualified Data.Set as Set
 import Data.List (span, elemIndex, dropWhileEnd)
@@ -732,21 +733,31 @@ dropWhitespace = do
                 else return()
         [] -> return ()
 
--- removes and returns a quoted string such as <foo.bar> or "foo.bar"
+-- lex the remainder of the current line into tokens and return them, rather
-takeQuotedString :: Alex String
+-- than storing them in the lexer state
-takeQuotedString = do
+tokenizeLine :: Alex [Token]
-    dropSpaces
+tokenizeLine = do
-    ch <- takeChar
+    -- read in the rest of the current line
-    end <-
+    str <- takeUntilNewline
-        case ch of
+    dropWhitespace
-            '"' -> return '"'
+    -- save the current lexer state
-            '<' -> return '>'
+    currInput <- alexGetInput
-            _ -> lexicalError $ "bad beginning of include arg: " ++ (show ch)
+    currFile <- getCurrentFile
-    rest <- takeThrough end
+    currToks <- gets lsToks
-    let res = ch : rest
+    -- parse the line into tokens (which includes macro processing)
-    if end == '>'
+    modify $ \s -> s { lsToks = [] }
-        then lexicalError $ "library includes are not supported: " ++ res
+    let newInput = (alexStartPos, ' ', [], str)
-        else return res
+    alexSetInput newInput
+    alexMonadScan
+    toks <- gets lsToks
+    -- return to the previous state
+    alexSetInput currInput
+    setCurrentFile currFile
+    modify $ \s -> s { lsToks = currToks }
+    -- remove macro boundary tokens and put the tokens in order
+    let isntMacroBoundary = \(Token t _ _ ) -> t /= MacroBoundary
+    let toks' = filter isntMacroBoundary toks
+    return $ reverse toks'
 
 -- removes and returns a decimal number
 takeNumber :: Alex Int
@@ -772,9 +783,9 @@ takeNumber = do
 peekChar :: Alex Char
 peekChar = do
     (_, _, _, str) <- alexGetInput
-    return $ if null str
+    if null str
-        then '\n'
+        then lexicalError "unexpected end of input"
-        else head str
+        else return $head str
 
 takeMacroDefinition :: Alex (String, [(String, Maybe String)])
 takeMacroDefinition = do
@@ -856,6 +867,7 @@ findUnescapedQuote ('`' : '\\' : '`' : '"' : rest) = ('\\' : '"' : start, end)
 findUnescapedQuote ('\\' : '"' : rest) = ('\\' : '"' : start, end)
     where (start, end) = findUnescapedQuote rest
 findUnescapedQuote ('"' : rest) = ("\"", rest)
+findUnescapedQuote ('`' : '"' : rest) = ("\"", rest)
 findUnescapedQuote (ch : rest) = (ch : start, end)
     where (start, end) = findUnescapedQuote rest
 
@@ -939,7 +951,10 @@ handleDirective (posOrig, _, _, strOrig) len = do
         "resetall" -> passThrough
 
         "begin_keywords" -> do
-            quotedSpec <- takeQuotedString
+            toks <- tokenizeLine
+            quotedSpec <- case toks of
+                [Token Lit_string str _] -> return str
+                _ -> lexicalError $ "unexpected tokens following `begin_keywords: " ++ show toks
             let spec = tail $ init quotedSpec
             case Map.lookup spec specMap of
                 Nothing ->
@@ -973,9 +988,16 @@ handleDirective (posOrig, _, _, strOrig) len = do
             alexMonadScan
 
         "line" -> do
-            lineNumber <- takeNumber
+            toks <- tokenizeLine
-            quotedFilename <- takeQuotedString
+            (lineNumber, quotedFilename, levelNumber) <-
-            levelNumber <- takeNumber -- level, ignored
+                case toks of
+                    [ Token Lit_number lineStr _,
+                      Token Lit_string filename _,
+                      Token Lit_number levelStr _] -> do
+                        let Just line = readMaybe lineStr :: Maybe Int
+                        let Just level = readMaybe levelStr :: Maybe Int
+                        return (line, filename, level)
+                    _ -> lexicalError $ "unexpected tokens following `begin_keywords: " ++ show toks
             let filename = init $ tail quotedFilename
             setCurrentFile filename
             (AlexPn f _ c, prev, _, str) <- alexGetInput
@@ -985,7 +1007,10 @@ handleDirective (posOrig, _, _, strOrig) len = do
                 else lexicalError "line directive invalid level number"
 
         "include" -> do
-            quotedFilename <- takeQuotedString
+            toks <- tokenizeLine
+            quotedFilename <- case toks of
+                [Token Lit_string str _] -> return str
+                _ -> lexicalError $ "unexpected tokens following `include: " ++ show toks
             inputFollow <- alexGetInput
             fileFollow <- getCurrentFile
             -- process the included file

test/lex/line.sv

@@ -3,5 +3,10 @@ module top;
         $display(`__FILE__, `__LINE__);
 `line 101 "fake.v" 1
         $display(`__FILE__, `__LINE__);
+`define foo(filename) `"filename.vh`"
+`include `foo(line)
+`define new_line_num 200
+`line `new_line_num `foo(line) 1
+        $display(`__FILE__, `__LINE__);
     end
 endmodule

test/lex/line.v

@@ -1,7 +1,8 @@
 module top;
     initial begin
         $display("line.sv", `__LINE__);
-        ;
         $display("fake.v", 102);
+        $display("via include: ", "./line.vh", 1);
+        $display("line.vh", 201);
     end
 endmodule

test/lex/line.vh

@@ -0,0 +1 @@
+$display("via include: ", `__FILE__, `__LINE__);