luke
/
sv2v
mirror of https://github.com/zachjs/sv2v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pursue a different approach and update test case

This commit is contained in:
Zachary Snow 2025-11-01 23:31:52 -04:00
parent d8ca66cbbe
commit 6404cbb2f1
3 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Language/SystemVerilog/Parser/Parse.y
View File

@ -33,7 +33,7 @@ import Language.SystemVerilog.Parser.Tokens
%tokentype { Token } %tokentype { Token }
%error { parseErrorTok } %error { parseErrorTok }
%expect 4 %expect 0
%token %token
@ -947,17 +947,9 @@ ImportOrExport :: { [PackageItem] }
: "import" PackageImportItems ";" { map (uncurry Import) $2 } : "import" PackageImportItems ";" { map (uncurry Import) $2 }
| "export" PackageImportItems ";" { map (uncurry Export) $2 } | "export" PackageImportItems ";" { map (uncurry Export) $2 }
| "export" "*" "::" "*" ";" { [Export "" ""] } | "export" "*" "::" "*" ";" { [Export "" ""] }
BlockItemDecls :: { [Decl] }
: {- empty -} { [] }
| ";" BlockItemDecls { $2 }
| BlockItemDecl BlockItemDecls { $1 ++ $2 }
BlockItemDecl :: { [Decl] }
: DataDecl { $1 }
DataDecl :: { [Decl] }
: Typedef { [$1] }
TaskOrFunction :: { PackageItem } TaskOrFunction :: { PackageItem }
: "function" Lifetime FuncRetAndName TFItems BlockItemDecls DeclsAndStmts endfunction StrTag {% checkTag (snd $3) $8 $ Function $2 (fst $3) (snd $3) (map makeInput $4 ++ $5 ++ fst $6) (snd $6) } : "function" Lifetime FuncRetAndName TFItems DeclsAndStmts endfunction StrTag {% checkTag (snd $3) $7 $ Function $2 (fst $3) (snd $3) (map makeInput $4 ++ fst $5) (snd $5) }
| "task" Lifetime Identifier TFItems BlockItemDecls DeclsAndStmts endtask StrTag {% checkTag $3 $8 $ Task $2 $3 ($4 ++ $5 ++ fst $6) (snd $6) } | "task" Lifetime Identifier TFItems DeclsAndStmts endtask StrTag {% checkTag $3 $7 $ Task $2 $3 ($4 ++ fst $5) (snd $5) }
Typedef :: { Decl } Typedef :: { Decl }
: "typedef" Type Identifier ";" { ParamType Localparam $3 $2 } : "typedef" Type Identifier ";" { ParamType Localparam $3 $2 }
| "typedef" Type Identifier DimensionsNonEmpty ";" { ParamType Localparam $3 (UnpackedType $2 $4) } | "typedef" Type Identifier DimensionsNonEmpty ";" { ParamType Localparam $3 (UnpackedType $2 $4) }
@ -1234,6 +1226,7 @@ DeclsAndStmts :: { ([Decl], [Stmt]) }
DeclOrStmt :: { ([Decl], [Stmt]) } DeclOrStmt :: { ([Decl], [Stmt]) }
: DeclTokens(";") { parseDTsAsDeclOrStmt $1 } : DeclTokens(";") { parseDTsAsDeclOrStmt $1 }
| ParameterDecl(";") { ($1, []) } | ParameterDecl(";") { ($1, []) }
| Typedef { ([$1], []) }
ParameterDecl(delim) :: { [Decl] } ParameterDecl(delim) :: { [Decl] }
: ParameterDeclKW DeclAsgns delim { makeParamDecls $1 (Implicit Unspecified []) $2 } : ParameterDeclKW DeclAsgns delim { makeParamDecls $1 (Implicit Unspecified []) $2 }

19
test/core/tf_typedef.sv
View File

@ -1,12 +1,17 @@
module top; module top;
task t; task t;
typedef bit u; typedef byte u;
$display("t = %d", u'(0)); $display("t %b", u'('1));
endtask endtask
function f; function integer f;
typedef bit u; input reg signed i;
return u'(1); typedef shortint v;
$display("i %b", v'(i));
return $bits(v);
endfunction endfunction
initial t(); initial begin
initial $display("f = %d", f()); t();
$display("f %b", f(0));
$display("f %b", f(1));
end
endmodule endmodule

26
test/core/tf_typedef.v
View File

@ -1,11 +1,19 @@
module top; module top;
task t; task t;
$display("t = %d", 1'd0); $display("t %b", 8'hFF);
endtask endtask
function f; function integer f;
input reg _sv2v_unused; input reg signed i;
f = 1'd1; reg [15:0] j;
endfunction begin
initial t; j = i;
initial $display("f = %d", f(0)); $display("i %b", j);
f = 16;
end
endfunction
initial begin
t;
$display("f %b", f(0));
$display("f %b", f(1));
end
endmodule endmodule