From 377fa5bd42ee54a2fb7cee568c33e51a3c67a6e5 Mon Sep 17 00:00:00 2001
From: dalance <dalance@gmail.com>
Date: Mon, 12 Aug 2019 02:33:23 +0900
Subject: [PATCH] Fix bugs

---
 .../declarations/net_and_variable_types.rs    | 18 +++++++-
 .../src/declarations/task_declarations.rs     |  6 +--
 sv-parser-parser/src/tests.rs                 | 44 +++++++++----------
 3 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/sv-parser-parser/src/declarations/net_and_variable_types.rs b/sv-parser-parser/src/declarations/net_and_variable_types.rs
index 18bcd11..042f587 100644
--- a/sv-parser-parser/src/declarations/net_and_variable_types.rs
+++ b/sv-parser-parser/src/declarations/net_and_variable_types.rs
@@ -215,11 +215,27 @@ pub(crate) fn enum_name_declaration(s: Span) -> IResult<Span, EnumNameDeclaratio
 #[tracable_parser]
 #[packrat_parser]
 pub(crate) fn class_scope(s: Span) -> IResult<Span, ClassScope> {
-    let (s, a) = class_type(s)?;
+    let (s, a) = class_type_class_scope(s)?;
     let (s, b) = symbol("::")(s)?;
     Ok((s, ClassScope { nodes: (a, b) }))
 }
 
+#[tracable_parser]
+#[packrat_parser]
+pub(crate) fn class_type_class_scope(s: Span) -> IResult<Span, ClassType> {
+    let (s, a) = ps_class_identifier(s)?;
+    let (s, b) = opt(parameter_value_assignment)(s)?;
+    let (s, c) = many0(terminated(
+        triple(
+            symbol("::"),
+            class_identifier,
+            opt(parameter_value_assignment),
+        ),
+        peek(symbol("::")),
+    ))(s)?;
+    Ok((s, ClassType { nodes: (a, b, c) }))
+}
+
 #[tracable_parser]
 #[packrat_parser]
 pub(crate) fn class_type(s: Span) -> IResult<Span, ClassType> {
diff --git a/sv-parser-parser/src/declarations/task_declarations.rs b/sv-parser-parser/src/declarations/task_declarations.rs
index e3c0183..a65b5a2 100644
--- a/sv-parser-parser/src/declarations/task_declarations.rs
+++ b/sv-parser-parser/src/declarations/task_declarations.rs
@@ -87,7 +87,7 @@ pub(crate) fn tf_port_item(s: Span) -> IResult<Span, TfPortItem> {
     let (s, e) = opt(triple(
         port_identifier,
         many0(variable_dimension),
-        opt(pair(symbol(":"), expression)),
+        opt(pair(symbol("="), expression)),
     ))(s)?;
     Ok((
         s,
@@ -108,7 +108,7 @@ pub(crate) fn data_type_or_implicit_tf_port_item(s: Span) -> IResult<Span, DataT
                     opt(triple(
                         port_identifier,
                         many0(variable_dimension),
-                        opt(pair(symbol(":"), expression)),
+                        opt(pair(symbol("="), expression)),
                     )),
                     alt((symbol(","), symbol(")"))),
                 )),
@@ -122,7 +122,7 @@ pub(crate) fn data_type_or_implicit_tf_port_item(s: Span) -> IResult<Span, DataT
                     opt(triple(
                         port_identifier,
                         many0(variable_dimension),
-                        opt(pair(symbol(":"), expression)),
+                        opt(pair(symbol("="), expression)),
                     )),
                     alt((symbol(","), symbol(")"))),
                 )),
diff --git a/sv-parser-parser/src/tests.rs b/sv-parser-parser/src/tests.rs
index 0a7ca4f..07b2b34 100644
--- a/sv-parser-parser/src/tests.rs
+++ b/sv-parser-parser/src/tests.rs
@@ -2469,17 +2469,17 @@ mod spec {
             r##"initial $display (p.ERR_OVERFLOW);"##,
             Ok((_, _))
         );
-        //test!(
-        //    many1(module_item),
-        //    r##"class vector #(parameter width = 7, type T = int);
-        //        endclass
+        test!(
+            many1(module_item),
+            r##"class vector #(parameter width = 7, type T = int);
+                endclass
 
-        //        vector #(3) v = new;
-        //        initial $display (vector #(3)::T'(3.45)); // Typecasting
-        //        initial $display ((v.T)'(3.45)); //ILLEGAL
-        //        initial $display (v.width);"##,
-        //    Ok((_, _))
-        //);
+                vector #(3) v = new;
+                initial $display (vector #(3)::T'(3.45)); // Typecasting
+                initial $display ((v.T)'(3.45)); //ILLEGAL
+                initial $display (v.width);"##,
+            Ok((_, _))
+        );
         test!(
             many1(module_item),
             r##"Packet p = new;
@@ -2530,17 +2530,17 @@ mod spec {
             r##"Packet p = new(STARTUP, $random, $time);"##,
             Ok((_, _))
         );
-        //test!(
-        //    many1(module_item),
-        //    r##"class c;
-        //          function new(int cmd = IDLE, bit[12:0] adrs = 0, int cmd_time );
-        //            command = cmd;
-        //            address = adrs;
-        //            time_requested = cmd_time;
-        //          endfunction
-        //        endclass"##,
-        //    Ok((_, _))
-        //);
+        test!(
+            many1(module_item),
+            r##"class c;
+                  function new(int cmd = IDLE, bit[12:0] adrs = 0, int cmd_time );
+                    command = cmd;
+                    address = adrs;
+                    time_requested = cmd_time;
+                  endfunction
+                endclass"##,
+            Ok((_, _))
+        );
         //test!(
         //    many1(module_item),
         //    r##"class C; endclass
@@ -15503,7 +15503,7 @@ mod spec {
 fn debug() {
     test!(
         many1(module_item),
-        r##"always_comb d <= #1ns b & c;"##,
+        r##"function a(int cmd = IDLE, bit[12:0] adrs = 0, int cmd_time ); endfunction"##,
         Ok((_, _))
     );
 }