Skip to content

fix(parser): preserve the original text of COND equations #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ThVerg wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(parser): preserve the original text of COND equations #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/sdf_toolkit/parser/sdf.lark
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ rvalue: FLOAT
real_triple: [FLOAT] ":" [FLOAT] ":" [FLOAT]

// Equations (for conditions)
equation: (operator | STRING | FLOAT | SCALARCONSTANT)+
equation: (operator | STRING | EQNUMBER | SCALARCONSTANT)+

operator: ARITHMETIC | SLASH | MODULO | LOGIC_NOT | BIT_NOT | LOGIC_AND
| BIT_AND | NAND | LOGIC_OR | BIT_OR | NOR | XOR | XNOR | EQUAL
Expand Down Expand Up @@ -171,7 +171,9 @@ ASTERISK: "*"

// Improved values (better patterns but compatible)
FLOAT: /-?(?:[0-9]+\.?[0-9]*|\.[0-9]+)(?:[eE][+-]?[0-9]+)?/
SCALARCONSTANT: /[01]?'[bB][01]/
SCALARCONSTANT.3: /[01]?'[bB][01]/
// Numbers inside a condition keep their original text (see equation)
EQNUMBER.2: /[-+]?[0-9]+(?:\.[0-9]+)?(?:[eE][+-]?[0-9]+)?/
QFLOAT: /"[-+]?(?:[0-9]+\.?[0-9]*|\.[0-9]+)(?:[eE][+-]?[0-9]+)?"/
QSTRING: /"[^"]*"/
STRING: /[a-zA-Z0-9_\/.\[\]\\$]+/
Expand Down
8 changes: 4 additions & 4 deletions tests/data/golden/fixpoint.sdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@
(INSTANCE slicem/lut_c)
(DELAY
(ABSOLUTE
(COND (B == 1.0 'b0 && C == 1.0 'b0 && D == 1.0 'b0)
(COND (B == 1'b0 && C == 1'b0 && D == 1'b0)
(IOPATH A Z (61.5:100.0:150.9)(26.9:40.0:61.4))
)
(COND (A == 1.0 'b0 && C == 1.0 'b0 && D == 1.0 'b0)
(COND (A == 1'b0 && C == 1'b0 && D == 1'b0)
(IOPATH B Z (58.9:95.1:141.9)(24.5:36.0:55.8))
)
(COND (A == 1.0 'b0 && B == 1.0 'b0 && D == 1.0 'b0)
(COND (A == 1'b0 && B == 1'b0 && D == 1'b0)
(IOPATH C Z (59.9:95.6:141.1)(24.2:35.2:55.0))
)
(COND (A == 1.0 'b0 && B == 1.0 'b0 && C == 1.0 'b0)
(COND (A == 1'b0 && B == 1'b0 && C == 1'b0)
(IOPATH D Z (62.7:100.9:149.7)(26.1:38.3:59.9))
)
)
Expand Down
8 changes: 4 additions & 4 deletions tests/data/golden/spec-example2.sdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
(INSTANCE top.ff1)
(DELAY
(ABSOLUTE
(COND (TE == 0.0 && RB == 1.0 && SB == 1.0)
(COND (TE == 0 && RB == 1 && SB == 1)
(IOPATH (posedge CP) Q (2.0:2.0:2.0)(3.0:3.0:3.0))
)
(COND (TE == 0.0 && RB == 1.0 && SB == 1.0)
(COND (TE == 0 && RB == 1 && SB == 1)
(IOPATH (posedge CP) QN (4.0:4.0:4.0)(5.0:5.0:5.0))
)
(COND (TE == 1.0 && RB == 1.0 && SB == 1.0)
(COND (TE == 1 && RB == 1 && SB == 1)
(IOPATH (posedge CP) QN (8.0:8.0:8.0)(9.0:9.0:9.0))
)
(COND (TE == 1.0 && RB == 1.0 && SB == 1.0)
(COND (TE == 1 && RB == 1 && SB == 1)
(IOPATH (posedge CP) Q (6.0:6.0:6.0)(7.0:7.0:7.0))
)
(IOPATH (negedge RB) Q (1.0:1.0:1.0)(1.0:1.0:1.0))
Expand Down