fix identifier parser in verilog-parser

Author: erihsu

src/parser/base.rs

@@ -30,18 +30,25 @@ pub fn tstring(s: &str) -> ParseRes<&str, &str> {
     )))(s)
 }
 
-/// module name identifier
-/// this parser allow hierachical representation of module name
-pub fn identifier(s: &str) -> ParseRes<&str, &str> {
+fn identifier(input: &str) -> ParseRes<&str, &str> {
+    recognize(pair(
+        alt((alpha1, tag("_"))),
+        many0(alt((alphanumeric1, tag("_")))),
+    ))(input)
+}
+
+/// hierachical identifier
+/// this parser allow hierachical representation of module name, net name or pin name
+pub fn hier_identifier(s: &str) -> ParseRes<&str, &str> {
     ws(recognize(pair(
-        pair(opt(tag("\\")), tstring),
+        pair(opt(tag("\\")), identifier),
         many0(alt((
             recognize(many1(tuple((tag("\\\\["), digit1, tag("\\\\]"))))),
             recognize(many1(tuple((tag("\\["), digit1, tag("\\]"))))),
             recognize(many1(tuple((tag("["), digit1, tag("]"))))),
-            recognize(pair(tag("\\\\/"), tstring)),
-            recognize(pair(tag("\\/"), tstring)),
-            recognize(pair(tag("/"), tstring)),
+            recognize(pair(tag("\\\\/"), identifier)),
+            recognize(pair(tag("\\/"), identifier)),
+            recognize(pair(tag("/"), identifier)),
         ))),
     )))(s)
 }

src/parser/subparser.rs

@@ -1,4 +1,4 @@
-use super::base::{identifier, number, tstring, ws};
+use super::base::{hier_identifier, number, tstring, ws};
 use crate::model::PinDirection;
 use nom::branch::alt;
 use nom::bytes::complete::{is_not, tag};
@@ -17,7 +17,7 @@ pub fn instantiate_stmt(s: &str) -> ParseRes<&str, (&str, &str, Vec<BindingT>)>
         terminated(
             tuple((
                 tstring,
-                identifier,
+                hier_identifier,
                 delimited(
                     tag("("),
                     separated_list1(ws(tag(",")), binding_parser),
@@ -35,7 +35,7 @@ pub fn port_map_stmt(s: &str) -> ParseRes<&str, Vec<&str>> {
         terminated(
             delimited(
                 tag("("),
-                separated_list1(ws(tag(",")), identifier),
+                separated_list1(ws(tag(",")), hier_identifier),
                 tag(")"),
             ),
             ws(tag(";")),
@@ -52,15 +52,15 @@ pub fn port_direction_declare_stmt(
             map(
                 delimited(
                     ws(tag("input")),
-                    tuple((opt(bitwidth), separated_list1(tag(","), identifier))),
+                    tuple((opt(bitwidth), separated_list1(tag(","), hier_identifier))),
                     ws(tag(";")),
                 ),
                 |d| (PinDirection::Input, d.0, d.1),
             ),
             map(
                 delimited(
                     ws(tag("output")),
-                    tuple((opt(bitwidth), separated_list1(tag(","), identifier))),
+                    tuple((opt(bitwidth), separated_list1(tag(","), hier_identifier))),
                     ws(tag(";")),
                 ),
                 |d| (PinDirection::Output, d.0, d.1),
@@ -80,7 +80,7 @@ pub fn wire_declare_stmt(s: &str) -> ParseRes<&str, (Option<(u32, u32)>, Vec<&st
         "Wire Declare Statement",
         delimited(
             ws(tag("wire")),
-            tuple((opt(bitwidth), separated_list1(tag(","), identifier))),
+            tuple((opt(bitwidth), separated_list1(tag(","), hier_identifier))),
             ws(tag(";")),
         ),
     )(s)
@@ -114,7 +114,7 @@ pub fn comment(s: &str) -> ParseRes<&str, ()> {
 fn binding_parser(s: &str) -> ParseRes<&str, BindingT> {
     tuple((
         preceded(ws(tag(".")), tstring),
-        delimited(ws(tag("(")), identifier, ws(tag(")"))),
+        delimited(ws(tag("(")), hier_identifier, ws(tag(")"))),
     ))(s)
 }