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

Whitespace cleanup. No functional change.

This commit is contained in:
Wilson Snyder 2019-06-11 20:20:04 -04:00
parent 6f2f668449
commit cfb05cd70a
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/verilog.l
View File

@ -52,7 +52,7 @@ extern void yyerrorf(const char* format, ...);
if (!v3Global.opt.bboxSys()) yyerrorf(msg, yytext); \ if (!v3Global.opt.bboxSys()) yyerrorf(msg, yytext); \
return yaD_IGNORE; } return yaD_IGNORE; }
void V3ParseImp::ppline (const char* textp) { void V3ParseImp::ppline(const char* textp) {
// Handle `line directive // Handle `line directive
int enterExit; int enterExit;
fileline()->lineDirective(textp, enterExit/*ref*/); fileline()->lineDirective(textp, enterExit/*ref*/);

54
src/verilog.y
View File

@ -1630,7 +1630,7 @@ enumDecl<dtypep>:
; ;
enum_base_typeE<dtypep>: // IEEE: enum_base_type enum_base_typeE<dtypep>: // IEEE: enum_base_type
/* empty */ { $$ = new AstBasicDType(CRELINE(),AstBasicDTypeKwd::INT); } /* empty */ { $$ = new AstBasicDType(CRELINE(), AstBasicDTypeKwd::INT); }
// // Not in spec, but obviously "enum [1:0]" should work // // Not in spec, but obviously "enum [1:0]" should work
// // implicit_type expanded, without empty // // implicit_type expanded, without empty
// // Note enum base types are always packed data types // // Note enum base types are always packed data types
@ -2223,7 +2223,7 @@ cellpinItList<pinp>: // IEEE: list_of_port_connections
cellparamItemE<pinp>: // IEEE: named_parameter_assignment + empty cellparamItemE<pinp>: // IEEE: named_parameter_assignment + empty
// Note empty can match either () or (,); V3LinkCells cleans up () // Note empty can match either () or (,); V3LinkCells cleans up ()
/* empty: ',,' is legal */ { $$ = new AstPin(CRELINE(),PINNUMINC(),"",NULL); } /* empty: ',,' is legal */ { $$ = new AstPin(CRELINE(), PINNUMINC(), "", NULL); }
| yP_DOTSTAR { $$ = new AstPin($1,PINNUMINC(),".*",NULL); } | yP_DOTSTAR { $$ = new AstPin($1,PINNUMINC(),".*",NULL); }
| '.' idSVKwd { $$ = new AstPin($1,PINNUMINC(),*$2,new AstParseRef($1,AstParseRefExp::PX_TEXT,*$2,NULL,NULL)); $$->svImplicit(true);} | '.' idSVKwd { $$ = new AstPin($1,PINNUMINC(),*$2,new AstParseRef($1,AstParseRefExp::PX_TEXT,*$2,NULL,NULL)); $$->svImplicit(true);}
| '.' idAny { $$ = new AstPin($1,PINNUMINC(),*$2,new AstParseRef($1,AstParseRefExp::PX_TEXT,*$2,NULL,NULL)); $$->svImplicit(true);} | '.' idAny { $$ = new AstPin($1,PINNUMINC(),*$2,new AstParseRef($1,AstParseRefExp::PX_TEXT,*$2,NULL,NULL)); $$->svImplicit(true);}
@ -2244,7 +2244,7 @@ cellparamItemE<pinp>: // IEEE: named_parameter_assignment + empty
cellpinItemE<pinp>: // IEEE: named_port_connection + empty cellpinItemE<pinp>: // IEEE: named_port_connection + empty
// Note empty can match either () or (,); V3LinkCells cleans up () // Note empty can match either () or (,); V3LinkCells cleans up ()
/* empty: ',,' is legal */ { $$ = new AstPin(CRELINE(),PINNUMINC(),"",NULL); } /* empty: ',,' is legal */ { $$ = new AstPin(CRELINE(), PINNUMINC(), "", NULL); }
| yP_DOTSTAR { $$ = new AstPin($1,PINNUMINC(),".*",NULL); } | yP_DOTSTAR { $$ = new AstPin($1,PINNUMINC(),".*",NULL); }
| '.' idSVKwd { $$ = new AstPin($1,PINNUMINC(),*$2,new AstParseRef($1,AstParseRefExp::PX_TEXT,*$2,NULL,NULL)); $$->svImplicit(true);} | '.' idSVKwd { $$ = new AstPin($1,PINNUMINC(),*$2,new AstParseRef($1,AstParseRefExp::PX_TEXT,*$2,NULL,NULL)); $$->svImplicit(true);}
| '.' idAny { $$ = new AstPin($1,PINNUMINC(),*$2,new AstParseRef($1,AstParseRefExp::PX_TEXT,*$2,NULL,NULL)); $$->svImplicit(true);} | '.' idAny { $$ = new AstPin($1,PINNUMINC(),*$2,new AstParseRef($1,AstParseRefExp::PX_TEXT,*$2,NULL,NULL)); $$->svImplicit(true);}
@ -3009,23 +3009,23 @@ funcId<ftaskp>: // IEEE: function_data_type_or_implicit + part of function_bod
// // IEEE: function_data_type_or_implicit must be expanded here to prevent conflict // // IEEE: function_data_type_or_implicit must be expanded here to prevent conflict
// // function_data_type expanded here to prevent conflicts with implicit_type:empty vs data_type:ID // // function_data_type expanded here to prevent conflicts with implicit_type:empty vs data_type:ID
/**/ tfIdScoped /**/ tfIdScoped
{ $$ = new AstFunc ($<fl>1,*$<strp>1,NULL, { $$ = new AstFunc($<fl>1,*$<strp>1,NULL,
new AstBasicDType($<fl>1, LOGIC_IMPLICIT)); new AstBasicDType($<fl>1, LOGIC_IMPLICIT));
SYMP->pushNewUnder($$, NULL); } SYMP->pushNewUnder($$, NULL); }
| signingE rangeList tfIdScoped | signingE rangeList tfIdScoped
{ $$ = new AstFunc ($<fl>3,*$<strp>3,NULL, { $$ = new AstFunc($<fl>3,*$<strp>3,NULL,
GRAMMARP->addRange(new AstBasicDType($<fl>3, LOGIC_IMPLICIT, $1), $2,true)); GRAMMARP->addRange(new AstBasicDType($<fl>3, LOGIC_IMPLICIT, $1), $2,true));
SYMP->pushNewUnder($$, NULL); } SYMP->pushNewUnder($$, NULL); }
| signing tfIdScoped | signing tfIdScoped
{ $$ = new AstFunc ($<fl>2,*$<strp>2,NULL, { $$ = new AstFunc($<fl>2,*$<strp>2,NULL,
new AstBasicDType($<fl>2, LOGIC_IMPLICIT, $1)); new AstBasicDType($<fl>2, LOGIC_IMPLICIT, $1));
SYMP->pushNewUnder($$, NULL); } SYMP->pushNewUnder($$, NULL); }
| data_type tfIdScoped | data_type tfIdScoped
{ $$ = new AstFunc ($<fl>2,*$<strp>2,NULL,$1); { $$ = new AstFunc($<fl>2,*$<strp>2,NULL,$1);
SYMP->pushNewUnder($$, NULL); } SYMP->pushNewUnder($$, NULL); }
// // To verilator tasks are the same as void functions (we separately detect time passing) // // To verilator tasks are the same as void functions (we separately detect time passing)
| yVOID tfIdScoped | yVOID tfIdScoped
{ $$ = new AstTask ($<fl>2,*$<strp>2,NULL); { $$ = new AstTask($<fl>2,*$<strp>2,NULL);
SYMP->pushNewUnder($$, NULL); } SYMP->pushNewUnder($$, NULL); }
; ;
@ -3180,8 +3180,8 @@ expr<nodep>: // IEEE: part of expression/constant_expression/primary
| '~' ~r~expr %prec prNEGATION { $$ = new AstNot ($1,$2); } | '~' ~r~expr %prec prNEGATION { $$ = new AstNot ($1,$2); }
| '|' ~r~expr %prec prREDUCTION { $$ = new AstRedOr ($1,$2); } | '|' ~r~expr %prec prREDUCTION { $$ = new AstRedOr ($1,$2); }
| '^' ~r~expr %prec prREDUCTION { $$ = new AstRedXor ($1,$2); } | '^' ~r~expr %prec prREDUCTION { $$ = new AstRedXor ($1,$2); }
| yP_NAND ~r~expr %prec prREDUCTION { $$ = new AstLogNot($1,new AstRedAnd($1,$2)); } | yP_NAND ~r~expr %prec prREDUCTION { $$ = new AstLogNot($1, new AstRedAnd($1, $2)); }
| yP_NOR ~r~expr %prec prREDUCTION { $$ = new AstLogNot($1,new AstRedOr ($1,$2)); } | yP_NOR ~r~expr %prec prREDUCTION { $$ = new AstLogNot($1, new AstRedOr($1, $2)); }
| yP_XNOR ~r~expr %prec prREDUCTION { $$ = new AstRedXnor ($1,$2); } | yP_XNOR ~r~expr %prec prREDUCTION { $$ = new AstRedXnor ($1,$2); }
// //
// // IEEE: inc_or_dec_expression // // IEEE: inc_or_dec_expression
@ -3444,8 +3444,8 @@ argsExprListE<nodep>: // IEEE: part of list_of_arguments
; ;
argsExprOneE<nodep>: // IEEE: part of list_of_arguments argsExprOneE<nodep>: // IEEE: part of list_of_arguments
/*empty*/ { $$ = new AstArg(CRELINE(),"",NULL); } /*empty*/ { $$ = new AstArg(CRELINE(), "", NULL); }
| expr { $$ = new AstArg(CRELINE(),"",$1); } | expr { $$ = new AstArg(CRELINE(), "", $1); }
; ;
argsDottedList<nodep>: // IEEE: part of list_of_arguments argsDottedList<nodep>: // IEEE: part of list_of_arguments
@ -3593,60 +3593,60 @@ gateRangeE<nodep>:
gateBuf<nodep>: gateBuf<nodep>:
gateIdE gateRangeE '(' variable_lvalue ',' gatePinExpr ')' gateIdE gateRangeE '(' variable_lvalue ',' gatePinExpr ')'
{ $$ = new AstAssignW ($3,$4,$6); DEL($2); } { $$ = new AstAssignW($3,$4,$6); DEL($2); }
; ;
gateBufif0<nodep>: gateBufif0<nodep>:
gateIdE gateRangeE '(' variable_lvalue ',' gatePinExpr ',' gatePinExpr ')' gateIdE gateRangeE '(' variable_lvalue ',' gatePinExpr ',' gatePinExpr ')'
{ $$ = new AstAssignW ($3,$4,new AstBufIf1($3,new AstNot($3,$8),$6)); DEL($2); } { $$ = new AstAssignW($3,$4,new AstBufIf1($3,new AstNot($3,$8),$6)); DEL($2); }
; ;
gateBufif1<nodep>: gateBufif1<nodep>:
gateIdE gateRangeE '(' variable_lvalue ',' gatePinExpr ',' gatePinExpr ')' gateIdE gateRangeE '(' variable_lvalue ',' gatePinExpr ',' gatePinExpr ')'
{ $$ = new AstAssignW ($3,$4,new AstBufIf1($3,$8,$6)); DEL($2); } { $$ = new AstAssignW($3,$4,new AstBufIf1($3,$8,$6)); DEL($2); }
; ;
gateNot<nodep>: gateNot<nodep>:
gateIdE gateRangeE '(' variable_lvalue ',' gatePinExpr ')' gateIdE gateRangeE '(' variable_lvalue ',' gatePinExpr ')'
{ $$ = new AstAssignW ($3,$4,new AstNot($5,$6)); DEL($2); } { $$ = new AstAssignW($3,$4,new AstNot($5,$6)); DEL($2); }
; ;
gateNotif0<nodep>: gateNotif0<nodep>:
gateIdE gateRangeE '(' variable_lvalue ',' gatePinExpr ',' gatePinExpr ')' gateIdE gateRangeE '(' variable_lvalue ',' gatePinExpr ',' gatePinExpr ')'
{ $$ = new AstAssignW ($3,$4,new AstBufIf1($3,new AstNot($3,$8), new AstNot($3, $6))); DEL($2); } { $$ = new AstAssignW($3,$4,new AstBufIf1($3,new AstNot($3,$8), new AstNot($3, $6))); DEL($2); }
; ;
gateNotif1<nodep>: gateNotif1<nodep>:
gateIdE gateRangeE '(' variable_lvalue ',' gatePinExpr ',' gatePinExpr ')' gateIdE gateRangeE '(' variable_lvalue ',' gatePinExpr ',' gatePinExpr ')'
{ $$ = new AstAssignW ($3,$4,new AstBufIf1($3,$8, new AstNot($3,$6))); DEL($2); } { $$ = new AstAssignW($3,$4,new AstBufIf1($3,$8, new AstNot($3,$6))); DEL($2); }
; ;
gateAnd<nodep>: gateAnd<nodep>:
gateIdE gateRangeE '(' variable_lvalue ',' gateAndPinList ')' gateIdE gateRangeE '(' variable_lvalue ',' gateAndPinList ')'
{ $$ = new AstAssignW ($3,$4,$6); DEL($2); } { $$ = new AstAssignW($3,$4,$6); DEL($2); }
; ;
gateNand<nodep>: gateNand<nodep>:
gateIdE gateRangeE '(' variable_lvalue ',' gateAndPinList ')' gateIdE gateRangeE '(' variable_lvalue ',' gateAndPinList ')'
{ $$ = new AstAssignW ($3,$4,new AstNot($5,$6)); DEL($2); } { $$ = new AstAssignW($3,$4,new AstNot($5,$6)); DEL($2); }
; ;
gateOr<nodep>: gateOr<nodep>:
gateIdE gateRangeE '(' variable_lvalue ',' gateOrPinList ')' gateIdE gateRangeE '(' variable_lvalue ',' gateOrPinList ')'
{ $$ = new AstAssignW ($3,$4,$6); DEL($2); } { $$ = new AstAssignW($3,$4,$6); DEL($2); }
; ;
gateNor<nodep>: gateNor<nodep>:
gateIdE gateRangeE '(' variable_lvalue ',' gateOrPinList ')' gateIdE gateRangeE '(' variable_lvalue ',' gateOrPinList ')'
{ $$ = new AstAssignW ($3,$4,new AstNot($5,$6)); DEL($2); } { $$ = new AstAssignW($3,$4,new AstNot($5,$6)); DEL($2); }
; ;
gateXor<nodep>: gateXor<nodep>:
gateIdE gateRangeE '(' variable_lvalue ',' gateXorPinList ')' gateIdE gateRangeE '(' variable_lvalue ',' gateXorPinList ')'
{ $$ = new AstAssignW ($3,$4,$6); DEL($2); } { $$ = new AstAssignW($3,$4,$6); DEL($2); }
; ;
gateXnor<nodep>: gateXnor<nodep>:
gateIdE gateRangeE '(' variable_lvalue ',' gateXorPinList ')' gateIdE gateRangeE '(' variable_lvalue ',' gateXorPinList ')'
{ $$ = new AstAssignW ($3,$4,new AstNot($5,$6)); DEL($2); } { $$ = new AstAssignW($3,$4,new AstNot($5,$6)); DEL($2); }
; ;
gatePullup<nodep>: gatePullup<nodep>:
gateIdE gateRangeE '(' variable_lvalue ')' { $$ = new AstPull ($3, $4, true); DEL($2); } gateIdE gateRangeE '(' variable_lvalue ')' { $$ = new AstPull($3, $4, true); DEL($2); }
; ;
gatePulldown<nodep>: gatePulldown<nodep>:
gateIdE gateRangeE '(' variable_lvalue ')' { $$ = new AstPull ($3, $4, false); DEL($2); } gateIdE gateRangeE '(' variable_lvalue ')' { $$ = new AstPull($3, $4, false); DEL($2); }
; ;
gateUnsup<nodep>: gateUnsup<nodep>:
gateIdE gateRangeE '(' gateUnsupPinList ')' { $$ = new AstImplicit ($3,$4); DEL($2); } gateIdE gateRangeE '(' gateUnsupPinList ')' { $$ = new AstImplicit($3,$4); DEL($2); }
; ;
gateIdE: gateIdE: