Verilog: Do not include newline in whitespace tokens. #587

VUnit · Nov 19, 2019 · 39a2bfe · 39a2bfe
1 parent b92057c
commit 39a2bfe
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/tests/unit/test_verilog_tokenizer.py b/tests/unit/test_verilog_tokenizer.py
@@ -31,6 +31,18 @@ def test_tokenizes_define(self):
             ],
         )
 
+    def test_newline_is_not_whitespace(self):
+        self.check(
+            " \n  \n\n",
+            [
+                WHITESPACE(value=" "),
+                NEWLINE(),
+                WHITESPACE(value="  "),
+                NEWLINE(),
+                NEWLINE(),
+            ],
+        )
+
     def test_tokenizes_string_literal(self):
         self.check('"hello"', [STRING(value="hello")])
 

diff --git a/vunit/parsing/verilog/tokenizer.py b/vunit/parsing/verilog/tokenizer.py
@@ -67,7 +67,7 @@ def replace_keywords(token):  # pylint: disable=missing-docstring
 
         add(NEWLINE, r"\n", remove_value)
 
-        add(WHITESPACE, r"\s +")
+        add(WHITESPACE, r"[ \t]+")
 
         add(
             MULTI_COMMENT,