From 0f905045e7b6dd4588f65c22997ef12be9229d89 Mon Sep 17 00:00:00 2001 From: KtorZ Date: Fri, 23 Aug 2024 10:39:37 +0200 Subject: [PATCH] Rename mk_nil_data, mk_pair_data & mk_nil_pair_data builtins. --- crates/aiken-lang/src/tipo/error.rs | 22 +++++++++++++++++----- crates/uplc/src/builtins.rs | 14 ++++++-------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/crates/aiken-lang/src/tipo/error.rs b/crates/aiken-lang/src/tipo/error.rs index 041573cf..91dbb988 100644 --- a/crates/aiken-lang/src/tipo/error.rs +++ b/crates/aiken-lang/src/tipo/error.rs @@ -831,11 +831,23 @@ Perhaps, try the following: #[diagnostic(code("unknown::module_value"))] #[diagnostic(help( "{}", - suggest_neighbor( - name, - value_constructors.iter(), - &suggest_make_public() - ) + if ["mk_nil_data", "mk_pair_data", "mk_nil_pair_data"].contains(&.name.as_str()) { + format!( + "It seems like you're looking for a builtin function that has been (recently) renamed. Sorry about that, but take notes of the new names of the following functions:\n\n{:<16} -> {}\n{:<16} -> {}\n{:<16} -> {}", + "mk_nil_data".if_supports_color(Stderr, |s| s.red()), + "new_list".if_supports_color(Stderr, |s| s.green()), + "mk_pair_data".if_supports_color(Stderr, |s| s.red()), + "new_pair".if_supports_color(Stderr, |s| s.green()), + "mk_nil_pair_data".if_supports_color(Stderr, |s| s.red()), + "new_pairs".if_supports_color(Stderr, |s| s.green()), + ) + } else { + suggest_neighbor( + name, + value_constructors.iter(), + &suggest_make_public() + ) + } ))] UnknownModuleValue { #[label] diff --git a/crates/uplc/src/builtins.rs b/crates/uplc/src/builtins.rs index a9bd2a48..2a777c41 100644 --- a/crates/uplc/src/builtins.rs +++ b/crates/uplc/src/builtins.rs @@ -1,9 +1,7 @@ -use std::{fmt::Display, rc::Rc, str::FromStr}; - -use pallas_codec::flat::de; -use strum_macros::EnumIter; - use crate::ast::Term; +use pallas_codec::flat::de; +use std::{fmt::Display, rc::Rc, str::FromStr}; +use strum_macros::EnumIter; /// All the possible builtin functions in Untyped Plutus Core. #[repr(u8)] @@ -516,9 +514,9 @@ impl DefaultFunction { UnBData => "un_b_data", EqualsData => "equals_data", SerialiseData => "serialise_data", - MkPairData => "mk_pair_data", - MkNilData => "mk_nil_data", - MkNilPairData => "mk_nil_pair_data", + MkPairData => "new_pair", + MkNilData => "new_list", + MkNilPairData => "new_pairs", Bls12_381_G1_Add => "bls12_381_g1_add", Bls12_381_G1_Neg => "bls12_381_g1_neg", Bls12_381_G1_ScalarMul => "bls12_381_g1_scalar_mul",