From fb967d4c7b7e4220c87d031f133f202083805c10 Mon Sep 17 00:00:00 2001 From: rvcas Date: Thu, 31 Aug 2023 17:20:48 -0400 Subject: [PATCH] fix: uplc formatter of Data closes #716 --- crates/uplc/src/parser.rs | 2 +- crates/uplc/src/pretty.rs | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/crates/uplc/src/parser.rs b/crates/uplc/src/parser.rs index 0ff8e0ec..5b33b6b2 100644 --- a/crates/uplc/src/parser.rs +++ b/crates/uplc/src/parser.rs @@ -158,7 +158,7 @@ peg::parser! { = "unit" _+ "()" { Constant::Unit } rule constant_data() -> Constant - = "data" _+ "(" d:data() ")" { Constant::Data(d) } + = "data" _+ "(" _* d:data() _* ")" { Constant::Data(d) } rule constant_list() -> Constant = "(" _* "list" _* t:type_info() _* ")" _+ ls:list(Some(&t)) { diff --git a/crates/uplc/src/pretty.rs b/crates/uplc/src/pretty.rs index e06c5e7d..93cadf09 100644 --- a/crates/uplc/src/pretty.rs +++ b/crates/uplc/src/pretty.rs @@ -226,7 +226,10 @@ impl Constant { .append(RcDoc::text(", ")) .append(right.to_doc_list()) .append(RcDoc::text(")")), - d @ Constant::Data(_) => RcDoc::text("data ").append(d.to_doc_list()), + Constant::Data(d) => RcDoc::text("data ") + .append(RcDoc::text("(")) + .append(Self::to_doc_list_plutus_data(d)) + .append(RcDoc::text(")")), } } @@ -251,9 +254,7 @@ impl Constant { .append((*right).to_doc_list()) .append(RcDoc::text(")")), - Constant::Data(data) => RcDoc::text("(") - .append(Self::to_doc_list_plutus_data(data)) - .append(RcDoc::text(")")), + Constant::Data(data) => Self::to_doc_list_plutus_data(data), } }