From bfddd80f43f5ba3354d2c595e15b9331ad7a3ceb Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Tue, 19 Jun 2007 23:43:14 +0000
Subject: [PATCH] Support V2K function/task argument lists.

git-svn-id: file://localhost/svn/verilator/trunk/verilator@941 77ca24e4-aefa-0310-84f0-b9a241c72d87
---
 Changes                 |  2 ++
 src/verilog.y           | 18 +++++++++++-------
 test_regress/t/t_func.v |  9 +++++----
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/Changes b/Changes
index 8a79b4496..c89d02a29 100644
--- a/Changes
+++ b/Changes
@@ -9,6 +9,8 @@ indicates the contributor was also the author of the fix; Thanks!
 
 **** Support V2K portlists with "input a,b,...".  [Mark Nodine]
 
+**** Support V2K function/task argument lists.
+
 **** Optimize constant $display arguments.
 
 **** Fix Preprocessor dropping some `line directives.  [Mark Nodine]
diff --git a/src/verilog.y b/src/verilog.y
index 764a97a74..b75ce6678 100644
--- a/src/verilog.y
+++ b/src/verilog.y
@@ -325,7 +325,7 @@ class AstSenTree;
 %type<nodep>	taskDecl
 %type<nodep>	varDeclList
 %type<funcp>	funcDecl
-%type<nodep>	funcBody funcVarList funcVar
+%type<nodep>	funcBody funcGuts funcVarList funcVar
 %type<rangep>	funcTypeE
 %type<rangep>	instRangeE
 %type<nodep>	gateDecl
@@ -858,21 +858,25 @@ taskRef:	idDotted		 		{ $$ = new AstTaskRef(CRELINE(),new AstParseRef($1->fileli
 funcRef:	idDotted '(' exprList ')'		{ $$ = new AstFuncRef($2,new AstParseRef($1->fileline(), AstParseRefExp::FUNC, $1), $3); }
 	;
 
-taskDecl: 	yTASK taskAutoE yaID ';'             stmtBlock yENDTASK	{ $$ = new AstTask ($1,*$3,$5);}
-	| 	yTASK taskAutoE yaID ';' funcVarList stmtBlock yENDTASK	{ $$ = new AstTask ($1,*$3,$5); $5->addNextNull($6); }
+taskDecl: 	yTASK taskAutoE yaID funcGuts yENDTASK	{ $$ = new AstTask ($1,*$3,$4);}
 	;
 
-funcDecl: 	yFUNCTION taskAutoE         funcTypeE yaID			 ';' funcBody yENDFUNCTION { $$ = new AstFunc ($1,*$4,$6,$3); }
-	|	yFUNCTION taskAutoE ySIGNED funcTypeE yaID			 ';' funcBody yENDFUNCTION { $$ = new AstFunc ($1,*$5,$7,$4); $$->isSigned(true); }
-	| 	yFUNCTION taskAutoE         funcTypeE yaID yVL_ISOLATE_ASSIGNMENTS ';' funcBody yENDFUNCTION { $$ = new AstFunc ($1,*$4,$7,$3); $$->attrIsolateAssign(true);}
-	|	yFUNCTION taskAutoE ySIGNED funcTypeE yaID yVL_ISOLATE_ASSIGNMENTS ';' funcBody yENDFUNCTION { $$ = new AstFunc ($1,*$5,$8,$4); $$->attrIsolateAssign(true); $$->isSigned(true); }
+funcDecl: 	yFUNCTION taskAutoE         funcTypeE yaID			   funcGuts yENDFUNCTION { $$ = new AstFunc ($1,*$4,$5,$3); }
+	|	yFUNCTION taskAutoE ySIGNED funcTypeE yaID			   funcGuts yENDFUNCTION { $$ = new AstFunc ($1,*$5,$6,$4); $$->isSigned(true); }
+	| 	yFUNCTION taskAutoE         funcTypeE yaID yVL_ISOLATE_ASSIGNMENTS funcGuts yENDFUNCTION { $$ = new AstFunc ($1,*$4,$6,$3); $$->attrIsolateAssign(true);}
+	|	yFUNCTION taskAutoE ySIGNED funcTypeE yaID yVL_ISOLATE_ASSIGNMENTS funcGuts yENDFUNCTION { $$ = new AstFunc ($1,*$5,$7,$4); $$->attrIsolateAssign(true); $$->isSigned(true); }
 	;
 
 taskAutoE:	/* empty */		 		{ }
 	|	yAUTOMATIC		 		{ }
 	;
 
+funcGuts:	'(' {V3Parse::s_pinNum=1;} portV2kArgs ')' ';' funcBody	{ $$ = $3->addNextNull($6); }
+	|	';' funcBody				{ $$ = $2; }
+	;
+
 funcBody:	funcVarList stmtBlock			{ $$ = $1;$1->addNextNull($2); }
+	|	stmtBlock				{ $$ = $1; }
 	;
 
 funcTypeE:	/* empty */				{ $$ = NULL; }
diff --git a/test_regress/t/t_func.v b/test_regress/t/t_func.v
index e6b3aaf72..d29a9fdd5 100644
--- a/test_regress/t/t_func.v
+++ b/test_regress/t/t_func.v
@@ -67,10 +67,11 @@ module t;
       end
    endtask
 
-   task incr;
-      output [31:0] z;
-      input [31:0] a;
-      input [31:0] inc;
+   task incr (
+	      // Check a V2K style input/output list
+    output [31:0] z,
+    input [31:0]  a, inc
+	      );
       z = a + inc;
    endtask