Skip to content

Commit c7187e2

Browse files
stringhandlerstringhandler
committed
fix(simpcli): display word value instead of bit length in const nodes
1 parent 978589a commit c7187e2

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

‎simpcli/enum.md‎

24 KB

%%{init: {"flowchart": {"defaultRenderer": "elk"}, "elk": {"elk.layered.layering.strategy": "LONGEST_PATH"}}}%% flowchart TD START([START]) END([END]) START --> SP2 J100 --> END N0["[0] witness"] N1["[1] iden"] SP2("[2] pair") J2("[2] -> 2^8 * 1") N3["[3] iden"] N4["[4] take"] N5["[5] unit"] N6["[6] const(0x01)"] SP8("[8] pair") J8("[8] -> 2^16") N9["[9] eq_8"] style N9 fill:#2a7,color:#fff,stroke:#195 N11["[11] iden"] SP12("[12] pair") J12("[12] -> 2 * (2^8 * 1)") N13["[3] iden"] N14["[4] take"] N15["[13] drop"] N16["[14] unit"] N17["[15] const(0x03)"] SP19("[17] pair") J19("[17] -> 2^16") N20["[9] eq_8"] style N20 fill:#2a7,color:#fff,stroke:#195 N22["[19] iden"] SP23("[20] pair") J23("[20] -> 2 * (1 * (2^8 * 1))") N24["[3] iden"] N25["[4] take"] N26["[13] drop"] N27["[21] drop"] N28["[22] unit"] N29["[23] const(0x04)"] SP31("[25] pair") J31("[25] -> 2^16") N32["[9] eq_8"] style N32 fill:#2a7,color:#fff,stroke:#195 N34["[27] iden"] SP35("[28] pair") J35("[28] -> 2 * (1 * (1 * (2^8 * 1)))") N36["[29] unit"] N37["[30] fail
[can fail]"] N39["[32] witness"] N40["[33] iden"] SP41("[34] pair") J41("[34] -> 2^8 * (1 * (1 * (1 * (2^8 * 1))))") N42["[3] iden"] N43["[35] take"] N44["[36] unit"] N45["[23] const(0x04)"] SP47("[38] pair") J47("[38] -> 2^16") N48["[9] eq_8"] style N48 fill:#2a7,color:#fff,stroke:#195 N50["[40] verify
[can fail]"] style N50 fill:#2a7,color:#fff,stroke:#195 N52["[36] unit"] SP53("[42] pair") J53("[42] -> 1 * 1
[can fail]") N54["[1] iden"] N55["[43] drop"] D58{"[46] case"} J58("[46] -> 1
[can fail]") N60["[48] witness"] N61["[27] iden"] SP62("[49] pair") J62("[49] -> 2^8 * (1 * (1 * (2^8 * 1)))") N63["[3] iden"] N64["[50] take"] N65["[51] unit"] N66["[15] const(0x03)"] SP68("[53] pair") J68("[53] -> 2^16") N69["[9] eq_8"] style N69 fill:#2a7,color:#fff,stroke:#195 N71["[40] verify
[can fail]"] style N71 fill:#2a7,color:#fff,stroke:#195 N73["[51] unit"] SP74("[56] pair") J74("[56] -> 1 * 1
[can fail]") N75["[1] iden"] N76["[43] drop"] D79{"[59] case"} J79("[59] -> 1
[can fail]") N81["[61] witness"] N82["[19] iden"] SP83("[62] pair") J83("[62] -> 2^8 * (1 * (2^8 * 1))") N84["[3] iden"] N85["[63] take"] N86["[64] unit"] N87["[65] const(0x02)"] SP89("[67] pair") J89("[67] -> 2^16") N90["[9] eq_8"] style N90 fill:#2a7,color:#fff,stroke:#195 N92["[40] verify
[can fail]"] style N92 fill:#2a7,color:#fff,stroke:#195 N94["[64] unit"] SP95("[70] pair") J95("[70] -> 1 * 1
[can fail]") N96["[1] iden"] N97["[43] drop"] D100{"[73] case"} J100("[73] -> 1
[can fail]") subgraph SG7["[7] comp"] N5 N6 end subgraph SG10["[10] comp"] SP8 J8 N4 N3 N5 N6 SG7 N9 end subgraph SG18["[16] comp"] N16 N17 end subgraph SG21["[18] comp"] SP19 J19 N15 N14 N13 N16 N17 SG18 N20 end subgraph SG30["[24] comp"] N28 N29 end subgraph SG33["[26] comp"] SP31 J31 N27 N26 N25 N24 N28 N29 SG30 N32 end subgraph SG38["[31] comp
[can fail]"] N36 N37 end style SG38 stroke:#cc0000,stroke-width:2px subgraph SG46["[37] comp"] N44 N45 end subgraph SG49["[39] comp"] SP47 J47 N43 N42 N44 N45 SG46 N48 end subgraph SG51["[41] comp
[can fail]"] SP47 J47 N43 N42 N44 N45 SG46 N48 SG49 N50 end style SG51 stroke:#cc0000,stroke-width:2px subgraph SG56["[44] comp
[can fail]"] SP53 J53 SP47 J47 N43 N42 N44 N45 SG46 N48 SG49 N50 SG51 N52 N55 N54 end style SG56 stroke:#cc0000,stroke-width:2px subgraph SG57["[45] comp
[can fail]"] SP41 J41 N39 N40 SP53 J53 SP47 J47 N43 N42 N44 N45 SG46 N48 SG49 N50 SG51 N52 N55 N54 SG56 end style SG57 stroke:#cc0000,stroke-width:2px subgraph SG59["[47] comp
[can fail]"] SP35 J35 SP31 J31 N27 N26 N25 N24 N28 N29 SG30 N32 SG33 N34 D58 J58 N36 N37 SG38 SP41 J41 N39 N40 SP53 J53 SP47 J47 N43 N42 N44 N45 SG46 N48 SG49 N50 SG51 N52 N55 N54 SG56 SG57 end style SG59 stroke:#cc0000,stroke-width:2px subgraph SG67["[52] comp"] N65 N66 end subgraph SG70["[54] comp"] SP68 J68 N64 N63 N65 N66 SG67 N69 end subgraph SG72["[55] comp
[can fail]"] SP68 J68 N64 N63 N65 N66 SG67 N69 SG70 N71 end style SG72 stroke:#cc0000,stroke-width:2px subgraph SG77["[57] comp
[can fail]"] SP74 J74 SP68 J68 N64 N63 N65 N66 SG67 N69 SG70 N71 SG72 N73 N76 N75 end style SG77 stroke:#cc0000,stroke-width:2px subgraph SG78["[58] comp
[can fail]"] SP62 J62 N60 N61 SP74 J74 SP68 J68 N64 N63 N65 N66 SG67 N69 SG70 N71 SG72 N73 N76 N75 SG77 end style SG78 stroke:#cc0000,stroke-width:2px subgraph SG80["[60] comp
[can fail]"] SP23 J23 SP19 J19 N15 N14 N13 N16 N17 SG18 N20 SG21 N22 D79 J79 SP35 J35 SP31 J31 N27 N26 N25 N24 N28 N29 SG30 N32 SG33 N34 D58 J58 N36 N37 SG38 SP41 J41 N39 N40 SP53 J53 SP47 J47 N43 N42 N44 N45 SG46 N48 SG49 N50 SG51 N52 N55 N54 SG56 SG57 SG59 SP62 J62 N60 N61 SP74 J74 SP68 J68 N64 N63 N65 N66 SG67 N69 SG70 N71 SG72 N73 N76 N75 SG77 SG78 end style SG80 stroke:#cc0000,stroke-width:2px subgraph SG88["[66] comp"] N86 N87 end subgraph SG91["[68] comp"] SP89 J89 N85 N84 N86 N87 SG88 N90 end subgraph SG93["[69] comp
[can fail]"] SP89 J89 N85 N84 N86 N87 SG88 N90 SG91 N92 end style SG93 stroke:#cc0000,stroke-width:2px subgraph SG98["[71] comp
[can fail]"] SP95 J95 SP89 J89 N85 N84 N86 N87 SG88 N90 SG91 N92 SG93 N94 N97 N96 end style SG98 stroke:#cc0000,stroke-width:2px subgraph SG99["[72] comp
[can fail]"] SP83 J83 N81 N82 SP95 J95 SP89 J89 N85 N84 N86 N87 SG88 N90 SG91 N92 SG93 N94 N97 N96 SG98 end style SG99 stroke:#cc0000,stroke-width:2px subgraph SG101["[74] comp
[can fail]"] SP12 J12 SP8 J8 N4 N3 N5 N6 SG7 N9 SG10 N11 D100 J100 SP23 J23 SP19 J19 N15 N14 N13 N16 N17 SG18 N20 SG21 N22 D79 J79 SP35 J35 SP31 J31 N27 N26 N25 N24 N28 N29 SG30 N32 SG33 N34 D58 J58 N36 N37 SG38 SP41 J41 N39 N40 SP53 J53 SP47 J47 N43 N42 N44 N45 SG46 N48 SG49 N50 SG51 N52 N55 N54 SG56 SG57 SG59 SP62 J62 N60 N61 SP74 J74 SP68 J68 N64 N63 N65 N66 SG67 N69 SG70 N71 SG72 N73 N76 N75 SG77 SG78 SG80 SP83 J83 N81 N82 SP95 J95 SP89 J89 N85 N84 N86 N87 SG88 N90 SG91 N92 SG93 N94 N97 N96 SG98 SG99 end style SG101 stroke:#cc0000,stroke-width:2px subgraph SG102["[75] comp
[can fail]"] SP2 J2 N0 N1 SP12 J12 SP8 J8 N4 N3 N5 N6 SG7 N9 SG10 N11 D100 J100 SP23 J23 SP19 J19 N15 N14 N13 N16 N17 SG18 N20 SG21 N22 D79 J79 SP35 J35 SP31 J31 N27 N26 N25 N24 N28 N29 SG30 N32 SG33 N34 D58 J58 N36 N37 SG38 SP41 J41 N39 N40 SP53 J53 SP47 J47 N43 N42 N44 N45 SG46 N48 SG49 N50 SG51 N52 N55 N54 SG56 SG57 SG59 SP62 J62 N60 N61 SP74 J74 SP68 J68 N64 N63 N65 N66 SG67 N69 SG70 N71 SG72 N73 N76 N75 SG77 SG78 SG80 SP83 J83 N81 N82 SP95 J95 SP89 J89 N85 N84 N86 N87 SG88 N90 SG91 N92 SG93 N94 N97 N96 SG98 SG99 SG101 end style SG102 stroke:#cc0000,stroke-width:2px SP2 --> N0 SP2 --> N1 N0 --> J2 N1 --> J2 N3 --> N4 N5 --> N6 SP8 --> N3 SP8 --> N5 N4 --> J8 N6 --> J8 J8 --> N9 SP12 --> SP8 SP12 --> N11 N9 --> J12 N11 --> J12 N13 --> N14 N14 --> N15 N16 --> N17 SP19 --> N13 SP19 --> N16 N15 --> J19 N17 --> J19 J19 --> N20 SP23 --> SP19 SP23 --> N22 N20 --> J23 N22 --> J23 N24 --> N25 N25 --> N26 N26 --> N27 N28 --> N29 SP31 --> N24 SP31 --> N28 N27 --> J31 N29 --> J31 J31 --> N32 SP35 --> SP31 SP35 --> N34 N32 --> J35 N34 --> J35 N36 --> N37 SP41 --> N39 SP41 --> N40 N39 --> J41 N40 --> J41 N42 --> N43 N44 --> N45 SP47 --> N42 SP47 --> N44 N43 --> J47 N45 --> J47 J47 --> N48 N48 --> N50 SP53 --> SP47 SP53 --> N52 N50 --> J53 N52 --> J53 N54 --> N55 J53 --> N54 J41 --> SP53 D58 -->|right| SP41 D58 -->|left| N36 N37 --> J58 N55 --> J58 J35 --> D58 SP62 --> N60 SP62 --> N61 N60 --> J62 N61 --> J62 N63 --> N64 N65 --> N66 SP68 --> N63 SP68 --> N65 N64 --> J68 N66 --> J68 J68 --> N69 N69 --> N71 SP74 --> SP68 SP74 --> N73 N71 --> J74 N73 --> J74 N75 --> N76 J74 --> N75 J62 --> SP74 D79 -->|right| SP62 D79 -->|left| SP35 J58 --> J79 N76 --> J79 J23 --> D79 SP83 --> N81 SP83 --> N82 N81 --> J83 N82 --> J83 N84 --> N85 N86 --> N87 SP89 --> N84 SP89 --> N86 N85 --> J89 N87 --> J89 J89 --> N90 N90 --> N92 SP95 --> SP89 SP95 --> N94 N92 --> J95 N94 --> J95 N96 --> N97 J95 --> N96 J83 --> SP95 D100 -->|right| SP83 D100 -->|left| SP23 J79 --> J100 N97 --> J100 J12 --> D100 J2 --> SP12 style N37 fill:#cc0000,color:#fff,stroke:#880000 style N50 fill:#cc0000,color:#fff,stroke:#880000 style J53 fill:#cc0000,color:#fff,stroke:#880000 style J58 fill:#cc0000,color:#fff,stroke:#880000 style N71 fill:#cc0000,color:#fff,stroke:#880000 style J74 fill:#cc0000,color:#fff,stroke:#880000 style J79 fill:#cc0000,color:#fff,stroke:#880000 style N92 fill:#cc0000,color:#fff,stroke:#880000 style J95 fill:#cc0000,color:#fff,stroke:#880000 style J100 fill:#cc0000,color:#fff,stroke:#880000

‎simpcli/src/main.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ fn main() -> Result<(), String> {
471471
Inner::Unit => "unit".to_owned(),
472472
Inner::Witness(_) => "witness".to_owned(),
473473
Inner::Fail(_) => "fail".to_owned(),
474-
Inner::Word(w) => format!("const({}b)", w.len()),
474+
Inner::Word(w) => format!("const({})", w),
475475
Inner::Jet(j) => format!("{}", j),
476476
_ => "?".to_owned(),
477477
};
@@ -540,7 +540,7 @@ fn main() -> Result<(), String> {
540540
Inner::Disconnect(_, _) => ("disconnect".to_owned(), false),
541541
Inner::Witness(_) => ("witness".to_owned(), false),
542542
Inner::Fail(_) => ("fail".to_owned(), true),
543-
Inner::Word(w) => (format!("const({}b)", w.len()), false),
543+
Inner::Word(w) => (format!("const({})", w), false),
544544
Inner::Jet(j) => {
545545
let sf = j.has_write_effect();
546546
(format!("{}", j), sf)

0 commit comments

Comments
 (0)