difftreelog
feat(evaluator) readable error messages
in: master
6 files changed
crates/jrsonnet-evaluator/Cargo.tomldiffbeforeafterboth--- a/crates/jrsonnet-evaluator/Cargo.toml
+++ b/crates/jrsonnet-evaluator/Cargo.toml
@@ -37,6 +37,8 @@
base64 = "0.12.3"
rustc-hash = "1.1.0"
+thiserror = "1.0.20"
+
# Serialized stdlib
[dependencies.serde]
version = "1.0.115"
crates/jrsonnet-evaluator/src/builtin/format.rsdiffbeforeafterboth1//! faster std.format impl2#![allow(clippy::too_many_arguments)]34use crate::{error::Error::*, throw, LocError, ObjValue, Result, Val, ValType};56#[derive(Debug, Clone)]7pub enum FormatError {8 TruncatedFormatCode,9 UnrecognizedConversionType(char),1011 NotEnoughValues,1213 CannotUseStarWidthWithObject,14 MappingKeysRequired,15 NoSuchFormatField(Rc<str>),16}1718impl From<FormatError> for LocError {19 fn from(e: FormatError) -> Self {20 Self::new(Format(e))21 }22}2324use std::rc::Rc;25use FormatError::*;2627type ParseResult<'t, T> = std::result::Result<(T, &'t str), FormatError>;2829pub fn try_parse_mapping_key(str: &str) -> ParseResult<&str> {30 if str.is_empty() {31 return Err(TruncatedFormatCode);32 }33 let bytes = str.as_bytes();34 if bytes[0] == b'(' {35 let mut i = 1;36 while i < bytes.len() {37 if bytes[i] == b')' {38 return Ok((&str[1..i as usize], &str[i as usize + 1..]));39 }40 i += 1;41 }42 Err(TruncatedFormatCode)43 } else {44 Ok(("", str))45 }46}4748#[cfg(test)]49pub mod tests_key {50 use super::*;5152 #[test]53 fn parse_key() {54 assert_eq!(55 try_parse_mapping_key("(hello ) world").unwrap(),56 ("hello ", " world")57 );58 assert_eq!(try_parse_mapping_key("() world").unwrap(), ("", " world"));59 assert_eq!(try_parse_mapping_key(" world").unwrap(), ("", " world"));60 assert_eq!(61 try_parse_mapping_key(" () world").unwrap(),62 ("", " () world")63 );64 }6566 #[test]67 #[should_panic]68 fn parse_key_missing_start() {69 try_parse_mapping_key("").unwrap();70 }7172 #[test]73 #[should_panic]74 fn parse_key_missing_end() {75 try_parse_mapping_key("( ").unwrap();76 }77}7879#[derive(Default, Debug)]80pub struct CFlags {81 pub alt: bool,82 pub zero: bool,83 pub left: bool,84 pub blank: bool,85 pub sign: bool,86}8788pub fn try_parse_cflags(str: &str) -> ParseResult<CFlags> {89 if str.is_empty() {90 return Err(TruncatedFormatCode);91 }92 let bytes = str.as_bytes();93 let mut i = 0;94 let mut out = CFlags::default();95 loop {96 if bytes.len() == i {97 return Err(TruncatedFormatCode);98 }99 match bytes[i] {100 b'#' => out.alt = true,101 b'0' => out.zero = true,102 b'-' => out.left = true,103 b' ' => out.blank = true,104 b'+' => out.sign = true,105 _ => break,106 }107 i += 1;108 }109 Ok((out, &str[i..]))110}111112#[derive(Debug, PartialEq)]113pub enum Width {114 Star,115 Fixed(usize),116}117pub fn try_parse_field_width(str: &str) -> ParseResult<Width> {118 if str.is_empty() {119 return Err(TruncatedFormatCode);120 }121 let bytes = str.as_bytes();122 if bytes[0] == b'*' {123 return Ok((Width::Star, &str[1..]));124 }125 let mut out: usize = 0;126 let mut digits = 0;127 while let Some(digit) = (bytes[digits] as char).to_digit(10) {128 out *= 10;129 out += digit as usize;130 digits += 1;131 if digits == bytes.len() {132 return Err(TruncatedFormatCode);133 }134 }135 Ok((Width::Fixed(out), &str[digits..]))136}137138pub fn try_parse_precision(str: &str) -> ParseResult<Option<Width>> {139 if str.is_empty() {140 return Err(TruncatedFormatCode);141 }142 let bytes = str.as_bytes();143 if bytes[0] == b'.' {144 try_parse_field_width(&str[1..]).map(|(r, s)| (Some(r), s))145 } else {146 Ok((None, str))147 }148}149150// Only skips151pub fn try_parse_length_modifier(str: &str) -> ParseResult<()> {152 if str.is_empty() {153 return Err(TruncatedFormatCode);154 }155 let bytes = str.as_bytes();156 let mut idx = 0;157 while bytes[idx] == b'h' || bytes[idx] == b'l' || bytes[idx] == b'L' {158 idx += 1;159 if bytes.len() == idx {160 return Err(TruncatedFormatCode);161 }162 }163 Ok(((), &str[idx..]))164}165166#[derive(Debug, PartialEq)]167pub enum ConvTypeV {168 Decimal,169 Octal,170 Hexadecimal,171 Scientific,172 Float,173 Shorter,174 Char,175 String,176 Percent,177}178pub struct ConvType {179 v: ConvTypeV,180 caps: bool,181}182183pub fn parse_conversion_type(str: &str) -> ParseResult<ConvType> {184 if str.is_empty() {185 return Err(TruncatedFormatCode);186 }187188 let code = str.as_bytes()[0];189 let v: (ConvTypeV, bool) = match code {190 b'd' | b'i' | b'u' => (ConvTypeV::Decimal, false),191 b'o' => (ConvTypeV::Octal, false),192 b'x' => (ConvTypeV::Hexadecimal, false),193 b'X' => (ConvTypeV::Hexadecimal, true),194 b'e' => (ConvTypeV::Scientific, false),195 b'E' => (ConvTypeV::Scientific, true),196 b'f' => (ConvTypeV::Float, false),197 b'F' => (ConvTypeV::Float, true),198 b'g' => (ConvTypeV::Shorter, false),199 b'G' => (ConvTypeV::Shorter, true),200 b'c' => (ConvTypeV::Char, false),201 b's' => (ConvTypeV::String, false),202 b'%' => (ConvTypeV::Percent, false),203 c => return Err(UnrecognizedConversionType(c as char)),204 };205206 Ok((ConvType { v: v.0, caps: v.1 }, &str[1..]))207}208209#[derive(Debug)]210pub struct Code<'s> {211 mkey: &'s str,212 cflags: CFlags,213 width: Width,214 precision: Option<Width>,215 convtype: ConvTypeV,216 caps: bool,217}218pub fn parse_code(str: &str) -> ParseResult<Code> {219 if str.is_empty() {220 return Err(TruncatedFormatCode);221 }222 let (mkey, str) = try_parse_mapping_key(str)?;223 let (cflags, str) = try_parse_cflags(str)?;224 let (width, str) = try_parse_field_width(str)?;225 let (precision, str) = try_parse_precision(str)?;226 let (_, str) = try_parse_length_modifier(str)?;227 let (convtype, str) = parse_conversion_type(str)?;228229 Ok((230 Code {231 mkey,232 cflags,233 width,234 precision,235 convtype: convtype.v,236 caps: convtype.caps,237 },238 str,239 ))240}241242#[derive(Debug)]243pub enum Element<'s> {244 String(&'s str),245 Code(Code<'s>),246}247pub fn parse_codes(mut str: &str) -> Result<Vec<Element>> {248 let mut bytes = str.as_bytes();249 let mut out = vec![];250 let mut offset = 0;251252 loop {253 while offset != bytes.len() && bytes[offset] != b'%' {254 offset += 1;255 }256 if offset != 0 {257 out.push(Element::String(&str[0..offset]));258 }259 if offset == bytes.len() {260 return Ok(out);261 }262 str = &str[offset + 1..];263 let (code, nstr) = parse_code(str)?;264 str = nstr;265 bytes = str.as_bytes();266 offset = 0;267268 out.push(Element::Code(code))269 }270}271272const NUMBERS: &[u8] = b"0123456789abcdefghijklmnopqrstuvwxyz";273274#[inline]275pub fn render_integer(276 out: &mut String,277 iv: i64,278 padding: usize,279 precision: usize,280 blank: bool,281 sign: bool,282 radix: i64,283 prefix: &str,284 caps: bool,285) {286 // Digit char indexes in reverse order, i.e287 // for radix = 16 and n = 12f: [15, 2, 1]288 let digits = if iv == 0 {289 vec![0u8]290 } else {291 let mut v = iv.abs();292 let mut nums = Vec::with_capacity(1);293 while v > 0 {294 nums.push((v % radix) as u8);295 v /= radix;296 }297 nums298 };299 let neg = iv < 0;300 let zp = padding.saturating_sub(if neg || blank || sign { 1 } else { 0 });301 let zp2 = zp302 .max(precision)303 .saturating_sub(prefix.len() + digits.len());304305 if neg {306 out.push('-')307 } else if sign {308 out.push('+');309 } else if blank {310 out.push(' ');311 }312313 out.reserve(zp2);314 for _ in 0..zp2 {315 out.push('0');316 }317 out.push_str(prefix);318319 for digit in digits.into_iter().rev() {320 let ch = NUMBERS[digit as usize] as char;321 out.push(if caps { ch.to_ascii_uppercase() } else { ch });322 }323}324325pub fn render_decimal(326 out: &mut String,327 iv: i64,328 padding: usize,329 precision: usize,330 blank: bool,331 sign: bool,332) {333 render_integer(out, iv, padding, precision, blank, sign, 10, "", false)334}335pub fn render_octal(336 out: &mut String,337 iv: i64,338 padding: usize,339 precision: usize,340 alt: bool,341 blank: bool,342 sign: bool,343) {344 render_integer(345 out,346 iv,347 padding,348 precision,349 blank,350 sign,351 8,352 if alt && iv != 0 { "0" } else { "" },353 false,354 )355}356pub fn render_hexadecimal(357 out: &mut String,358 iv: i64,359 padding: usize,360 precision: usize,361 alt: bool,362 blank: bool,363 sign: bool,364 caps: bool,365) {366 render_integer(367 out,368 iv,369 padding,370 precision,371 blank,372 sign,373 16,374 match (alt, caps) {375 (true, true) => "0X",376 (true, false) => "0x",377 (false, _) => "",378 },379 caps,380 )381}382383pub fn render_float(384 out: &mut String,385 n: f64,386 mut padding: usize,387 precision: usize,388 blank: bool,389 sign: bool,390 ensure_pt: bool,391 trailing: bool,392) {393 let dot_size = if precision == 0 && !ensure_pt { 0 } else { 1 };394 padding = padding.saturating_sub(dot_size + precision);395 render_decimal(out, n.floor() as i64, padding, 0, blank, sign);396 if precision == 0 {397 if ensure_pt {398 out.push('.');399 }400 return;401 }402 let frac = n403 .fract()404 .mul_add(10.0_f64.powf(precision as f64), 0.5)405 .floor();406 if trailing || frac > 0.0 {407 out.push('.');408 let mut frac_str = String::new();409 render_decimal(&mut frac_str, frac as i64, precision, 0, false, false);410 let mut trim = frac_str.len();411 if !trailing {412 for b in frac_str.as_bytes().iter().rev() {413 if *b == b'0' {414 trim -= 1;415 }416 }417 }418 out.push_str(&frac_str[..trim]);419 } else if ensure_pt {420 out.push('.');421 }422}423424pub fn render_float_sci(425 out: &mut String,426 n: f64,427 mut padding: usize,428 precision: usize,429 blank: bool,430 sign: bool,431 ensure_pt: bool,432 trailing: bool,433 caps: bool,434) {435 let exponent = n.log10().floor();436 let mantissa = if exponent as i16 == -324 {437 n * 10.0 / 10.0_f64.powf(exponent + 1.0)438 } else {439 n / 10.0_f64.powf(exponent)440 };441 let mut exponent_str = String::new();442 render_decimal(&mut exponent_str, exponent as i64, 3, 0, false, true);443444 // +1 for e445 padding = padding.saturating_sub(exponent_str.len() + 1);446447 render_float(448 out, mantissa, padding, precision, blank, sign, ensure_pt, trailing,449 );450 out.push(if caps { 'E' } else { 'e' });451 out.push_str(&exponent_str);452}453454pub fn format_code(455 out: &mut String,456 value: &Val,457 code: &Code,458 width: usize,459 precision: Option<usize>,460) -> Result<()> {461 let clfags = &code.cflags;462 let (fpprec, iprec) = match precision {463 Some(v) => (v, v),464 None => (6, 0),465 };466 let padding = if clfags.zero && !clfags.left {467 width468 } else {469 0470 };471472 // TODO: If left padded, can optimize by writing directly to out473 let mut tmp_out = String::new();474475 match code.convtype {476 ConvTypeV::String => tmp_out.push_str(&value.clone().to_string()?),477 ConvTypeV::Decimal => {478 let value = value.clone().try_cast_num("%d/%u/%i requires number")?;479 render_decimal(480 &mut tmp_out,481 value as i64,482 padding,483 iprec,484 clfags.blank,485 clfags.sign,486 );487 }488 ConvTypeV::Octal => {489 let value = value.clone().try_cast_num("%o requires number")?;490 render_octal(491 &mut tmp_out,492 value as i64,493 padding,494 iprec,495 clfags.alt,496 clfags.blank,497 clfags.sign,498 );499 }500 ConvTypeV::Hexadecimal => {501 let value = value.clone().try_cast_num("%x/%X requires number")?;502 render_hexadecimal(503 &mut tmp_out,504 value as i64,505 padding,506 iprec,507 clfags.alt,508 clfags.blank,509 clfags.sign,510 code.caps,511 );512 }513 ConvTypeV::Scientific => {514 let value = value.clone().try_cast_num("%e/%E requires number")?;515 render_float_sci(516 &mut tmp_out,517 value,518 padding,519 fpprec,520 clfags.blank,521 clfags.sign,522 clfags.alt,523 true,524 code.caps,525 );526 }527 ConvTypeV::Float => {528 let value = value.clone().try_cast_num("%e/%E requires number")?;529 render_float(530 &mut tmp_out,531 value,532 padding,533 fpprec,534 clfags.blank,535 clfags.sign,536 clfags.alt,537 true,538 );539 }540 ConvTypeV::Shorter => {541 let value = value.clone().try_cast_num("%g/%G requires number")?;542 let exponent = value.log10().floor();543 if exponent < -4.0 || exponent >= fpprec as f64 {544 render_float_sci(545 &mut tmp_out,546 value,547 padding,548 fpprec - 1,549 clfags.blank,550 clfags.sign,551 clfags.alt,552 clfags.alt,553 code.caps,554 );555 } else {556 let digits_before_pt = 1.max(exponent as usize + 1);557 render_float(558 &mut tmp_out,559 value,560 padding,561 fpprec - digits_before_pt,562 clfags.blank,563 clfags.sign,564 clfags.alt,565 clfags.alt,566 );567 }568 }569 ConvTypeV::Char => match value.clone().unwrap_if_lazy()? {570 Val::Num(n) => tmp_out.push(571 std::char::from_u32(n as u32)572 .ok_or_else(|| InvalidUnicodeCodepointGot(n as u32))?,573 ),574 Val::Str(s) => {575 if s.chars().count() != 1 {576 throw!(RuntimeError(577 format!("%c expected 1 char string, got {}", s.chars().count()).into(),578 ));579 }580 tmp_out.push_str(&s);581 }582 _ => {583 throw!(TypeMismatch(584 "%c requires number/string",585 vec![ValType::Num, ValType::Str],586 value.value_type()?,587 ));588 }589 },590 ConvTypeV::Percent => tmp_out.push('%'),591 };592593 let padding = width.saturating_sub(tmp_out.len());594595 if !clfags.left {596 for _ in 0..padding {597 out.push(' ');598 }599 }600 out.push_str(&tmp_out);601 if clfags.left {602 for _ in 0..padding {603 out.push(' ');604 }605 }606607 Ok(())608}609610pub fn format_arr(str: &str, mut values: &[Val]) -> Result<String> {611 let codes = parse_codes(str)?;612 let mut out = String::new();613614 for code in codes {615 match code {616 Element::String(s) => {617 out.push_str(s);618 }619 Element::Code(c) => {620 let width = match c.width {621 Width::Star => {622 if values.is_empty() {623 throw!(NotEnoughValues);624 }625 let value = &values[0];626 values = &values[1..];627 value.clone().try_cast_num("field width")? as usize628 }629 Width::Fixed(n) => n,630 };631 let precision = match c.precision {632 Some(Width::Star) => {633 if values.is_empty() {634 throw!(NotEnoughValues);635 }636 let value = &values[0];637 values = &values[1..];638 Some(value.clone().try_cast_num("field precision")? as usize)639 }640 Some(Width::Fixed(n)) => Some(n),641 None => None,642 };643644 // %% should not consume a value645 let value = if c.convtype == ConvTypeV::Percent {646 &Val::Null647 } else {648 if values.is_empty() {649 throw!(NotEnoughValues);650 }651 let value = &values[0];652 values = &values[1..];653 value654 };655656 format_code(&mut out, value, &c, width, precision)?;657 }658 }659 }660661 Ok(out)662}663664pub fn format_obj(str: &str, values: &ObjValue) -> Result<String> {665 let codes = parse_codes(str)?;666 let mut out = String::new();667668 for code in codes {669 match code {670 Element::String(s) => {671 out.push_str(s);672 }673 Element::Code(c) => {674 // TODO: Operate on ref675 let f: Rc<str> = c.mkey.into();676 let width = match c.width {677 Width::Star => {678 throw!(CannotUseStarWidthWithObject);679 }680 Width::Fixed(n) => n,681 };682 let precision = match c.precision {683 Some(Width::Star) => {684 throw!(CannotUseStarWidthWithObject);685 }686 Some(Width::Fixed(n)) => Some(n),687 None => None,688 };689690 let value = if c.convtype == ConvTypeV::Percent {691 Val::Null692 } else {693 if f.is_empty() {694 throw!(MappingKeysRequired);695 }696 if let Some(v) = values.get(f.clone())? {697 v698 } else {699 throw!(NoSuchFormatField(f));700 }701 };702703 format_code(&mut out, &value, &c, width, precision)?;704 }705 }706 }707708 Ok(out)709}710711#[cfg(test)]712pub mod test_format {713 use super::*;714715 #[test]716 fn parse() {717 assert_eq!(718 parse_codes(719 "How much error budget is left looking at our %.3f%% availability gurantees?"720 )721 .unwrap()722 .len(),723 4724 );725 }726727 #[test]728 fn octals() {729 assert_eq!(format_arr("%#o", &[Val::Num(8.0)]).unwrap(), "010");730 assert_eq!(format_arr("%#4o", &[Val::Num(8.0)]).unwrap(), " 010");731 assert_eq!(format_arr("%4o", &[Val::Num(8.0)]).unwrap(), " 10");732 assert_eq!(format_arr("%04o", &[Val::Num(8.0)]).unwrap(), "0010");733 assert_eq!(format_arr("%+4o", &[Val::Num(8.0)]).unwrap(), " +10");734 assert_eq!(format_arr("%+04o", &[Val::Num(8.0)]).unwrap(), "+010");735 assert_eq!(format_arr("%-4o", &[Val::Num(8.0)]).unwrap(), "10 ");736 assert_eq!(format_arr("%+-4o", &[Val::Num(8.0)]).unwrap(), "+10 ");737 assert_eq!(format_arr("%+-04o", &[Val::Num(8.0)]).unwrap(), "+10 ");738 }739740 #[test]741 fn percent_doesnt_consumes_values() {742 assert_eq!(743 format_arr(744 "How much error budget is left looking at our %.3f%% availability gurantees?",745 &[Val::Num(4.0)]746 )747 .unwrap(),748 "How much error budget is left looking at our 4.000% availability gurantees?"749 );750 }751}1//! faster std.format impl2#![allow(clippy::too_many_arguments)]34use crate::{error::Error::*, throw, LocError, ObjValue, Result, Val, ValType};5use thiserror::Error;67#[derive(Debug, Clone, Error)]8pub enum FormatError {9 #[error("truncated format code")]10 TruncatedFormatCode,11 #[error("unrecognized conversion type: {0}")]12 UnrecognizedConversionType(char),1314 #[error("not enough values")]15 NotEnoughValues,1617 #[error("cannot use * width with object")]18 CannotUseStarWidthWithObject,19 #[error("mapping keys required")]20 MappingKeysRequired,21 #[error("no such format field: {0}")]22 NoSuchFormatField(Rc<str>),23}2425impl From<FormatError> for LocError {26 fn from(e: FormatError) -> Self {27 Self::new(Format(e))28 }29}3031use std::rc::Rc;32use FormatError::*;3334type ParseResult<'t, T> = std::result::Result<(T, &'t str), FormatError>;3536pub fn try_parse_mapping_key(str: &str) -> ParseResult<&str> {37 if str.is_empty() {38 return Err(TruncatedFormatCode);39 }40 let bytes = str.as_bytes();41 if bytes[0] == b'(' {42 let mut i = 1;43 while i < bytes.len() {44 if bytes[i] == b')' {45 return Ok((&str[1..i as usize], &str[i as usize + 1..]));46 }47 i += 1;48 }49 Err(TruncatedFormatCode)50 } else {51 Ok(("", str))52 }53}5455#[cfg(test)]56pub mod tests_key {57 use super::*;5859 #[test]60 fn parse_key() {61 assert_eq!(62 try_parse_mapping_key("(hello ) world").unwrap(),63 ("hello ", " world")64 );65 assert_eq!(try_parse_mapping_key("() world").unwrap(), ("", " world"));66 assert_eq!(try_parse_mapping_key(" world").unwrap(), ("", " world"));67 assert_eq!(68 try_parse_mapping_key(" () world").unwrap(),69 ("", " () world")70 );71 }7273 #[test]74 #[should_panic]75 fn parse_key_missing_start() {76 try_parse_mapping_key("").unwrap();77 }7879 #[test]80 #[should_panic]81 fn parse_key_missing_end() {82 try_parse_mapping_key("( ").unwrap();83 }84}8586#[derive(Default, Debug)]87pub struct CFlags {88 pub alt: bool,89 pub zero: bool,90 pub left: bool,91 pub blank: bool,92 pub sign: bool,93}9495pub fn try_parse_cflags(str: &str) -> ParseResult<CFlags> {96 if str.is_empty() {97 return Err(TruncatedFormatCode);98 }99 let bytes = str.as_bytes();100 let mut i = 0;101 let mut out = CFlags::default();102 loop {103 if bytes.len() == i {104 return Err(TruncatedFormatCode);105 }106 match bytes[i] {107 b'#' => out.alt = true,108 b'0' => out.zero = true,109 b'-' => out.left = true,110 b' ' => out.blank = true,111 b'+' => out.sign = true,112 _ => break,113 }114 i += 1;115 }116 Ok((out, &str[i..]))117}118119#[derive(Debug, PartialEq)]120pub enum Width {121 Star,122 Fixed(usize),123}124pub fn try_parse_field_width(str: &str) -> ParseResult<Width> {125 if str.is_empty() {126 return Err(TruncatedFormatCode);127 }128 let bytes = str.as_bytes();129 if bytes[0] == b'*' {130 return Ok((Width::Star, &str[1..]));131 }132 let mut out: usize = 0;133 let mut digits = 0;134 while let Some(digit) = (bytes[digits] as char).to_digit(10) {135 out *= 10;136 out += digit as usize;137 digits += 1;138 if digits == bytes.len() {139 return Err(TruncatedFormatCode);140 }141 }142 Ok((Width::Fixed(out), &str[digits..]))143}144145pub fn try_parse_precision(str: &str) -> ParseResult<Option<Width>> {146 if str.is_empty() {147 return Err(TruncatedFormatCode);148 }149 let bytes = str.as_bytes();150 if bytes[0] == b'.' {151 try_parse_field_width(&str[1..]).map(|(r, s)| (Some(r), s))152 } else {153 Ok((None, str))154 }155}156157// Only skips158pub fn try_parse_length_modifier(str: &str) -> ParseResult<()> {159 if str.is_empty() {160 return Err(TruncatedFormatCode);161 }162 let bytes = str.as_bytes();163 let mut idx = 0;164 while bytes[idx] == b'h' || bytes[idx] == b'l' || bytes[idx] == b'L' {165 idx += 1;166 if bytes.len() == idx {167 return Err(TruncatedFormatCode);168 }169 }170 Ok(((), &str[idx..]))171}172173#[derive(Debug, PartialEq)]174pub enum ConvTypeV {175 Decimal,176 Octal,177 Hexadecimal,178 Scientific,179 Float,180 Shorter,181 Char,182 String,183 Percent,184}185pub struct ConvType {186 v: ConvTypeV,187 caps: bool,188}189190pub fn parse_conversion_type(str: &str) -> ParseResult<ConvType> {191 if str.is_empty() {192 return Err(TruncatedFormatCode);193 }194195 let code = str.as_bytes()[0];196 let v: (ConvTypeV, bool) = match code {197 b'd' | b'i' | b'u' => (ConvTypeV::Decimal, false),198 b'o' => (ConvTypeV::Octal, false),199 b'x' => (ConvTypeV::Hexadecimal, false),200 b'X' => (ConvTypeV::Hexadecimal, true),201 b'e' => (ConvTypeV::Scientific, false),202 b'E' => (ConvTypeV::Scientific, true),203 b'f' => (ConvTypeV::Float, false),204 b'F' => (ConvTypeV::Float, true),205 b'g' => (ConvTypeV::Shorter, false),206 b'G' => (ConvTypeV::Shorter, true),207 b'c' => (ConvTypeV::Char, false),208 b's' => (ConvTypeV::String, false),209 b'%' => (ConvTypeV::Percent, false),210 c => return Err(UnrecognizedConversionType(c as char)),211 };212213 Ok((ConvType { v: v.0, caps: v.1 }, &str[1..]))214}215216#[derive(Debug)]217pub struct Code<'s> {218 mkey: &'s str,219 cflags: CFlags,220 width: Width,221 precision: Option<Width>,222 convtype: ConvTypeV,223 caps: bool,224}225pub fn parse_code(str: &str) -> ParseResult<Code> {226 if str.is_empty() {227 return Err(TruncatedFormatCode);228 }229 let (mkey, str) = try_parse_mapping_key(str)?;230 let (cflags, str) = try_parse_cflags(str)?;231 let (width, str) = try_parse_field_width(str)?;232 let (precision, str) = try_parse_precision(str)?;233 let (_, str) = try_parse_length_modifier(str)?;234 let (convtype, str) = parse_conversion_type(str)?;235236 Ok((237 Code {238 mkey,239 cflags,240 width,241 precision,242 convtype: convtype.v,243 caps: convtype.caps,244 },245 str,246 ))247}248249#[derive(Debug)]250pub enum Element<'s> {251 String(&'s str),252 Code(Code<'s>),253}254pub fn parse_codes(mut str: &str) -> Result<Vec<Element>> {255 let mut bytes = str.as_bytes();256 let mut out = vec![];257 let mut offset = 0;258259 loop {260 while offset != bytes.len() && bytes[offset] != b'%' {261 offset += 1;262 }263 if offset != 0 {264 out.push(Element::String(&str[0..offset]));265 }266 if offset == bytes.len() {267 return Ok(out);268 }269 str = &str[offset + 1..];270 let (code, nstr) = parse_code(str)?;271 str = nstr;272 bytes = str.as_bytes();273 offset = 0;274275 out.push(Element::Code(code))276 }277}278279const NUMBERS: &[u8] = b"0123456789abcdefghijklmnopqrstuvwxyz";280281#[inline]282pub fn render_integer(283 out: &mut String,284 iv: i64,285 padding: usize,286 precision: usize,287 blank: bool,288 sign: bool,289 radix: i64,290 prefix: &str,291 caps: bool,292) {293 // Digit char indexes in reverse order, i.e294 // for radix = 16 and n = 12f: [15, 2, 1]295 let digits = if iv == 0 {296 vec![0u8]297 } else {298 let mut v = iv.abs();299 let mut nums = Vec::with_capacity(1);300 while v > 0 {301 nums.push((v % radix) as u8);302 v /= radix;303 }304 nums305 };306 let neg = iv < 0;307 let zp = padding.saturating_sub(if neg || blank || sign { 1 } else { 0 });308 let zp2 = zp309 .max(precision)310 .saturating_sub(prefix.len() + digits.len());311312 if neg {313 out.push('-')314 } else if sign {315 out.push('+');316 } else if blank {317 out.push(' ');318 }319320 out.reserve(zp2);321 for _ in 0..zp2 {322 out.push('0');323 }324 out.push_str(prefix);325326 for digit in digits.into_iter().rev() {327 let ch = NUMBERS[digit as usize] as char;328 out.push(if caps { ch.to_ascii_uppercase() } else { ch });329 }330}331332pub fn render_decimal(333 out: &mut String,334 iv: i64,335 padding: usize,336 precision: usize,337 blank: bool,338 sign: bool,339) {340 render_integer(out, iv, padding, precision, blank, sign, 10, "", false)341}342pub fn render_octal(343 out: &mut String,344 iv: i64,345 padding: usize,346 precision: usize,347 alt: bool,348 blank: bool,349 sign: bool,350) {351 render_integer(352 out,353 iv,354 padding,355 precision,356 blank,357 sign,358 8,359 if alt && iv != 0 { "0" } else { "" },360 false,361 )362}363pub fn render_hexadecimal(364 out: &mut String,365 iv: i64,366 padding: usize,367 precision: usize,368 alt: bool,369 blank: bool,370 sign: bool,371 caps: bool,372) {373 render_integer(374 out,375 iv,376 padding,377 precision,378 blank,379 sign,380 16,381 match (alt, caps) {382 (true, true) => "0X",383 (true, false) => "0x",384 (false, _) => "",385 },386 caps,387 )388}389390pub fn render_float(391 out: &mut String,392 n: f64,393 mut padding: usize,394 precision: usize,395 blank: bool,396 sign: bool,397 ensure_pt: bool,398 trailing: bool,399) {400 let dot_size = if precision == 0 && !ensure_pt { 0 } else { 1 };401 padding = padding.saturating_sub(dot_size + precision);402 render_decimal(out, n.floor() as i64, padding, 0, blank, sign);403 if precision == 0 {404 if ensure_pt {405 out.push('.');406 }407 return;408 }409 let frac = n410 .fract()411 .mul_add(10.0_f64.powf(precision as f64), 0.5)412 .floor();413 if trailing || frac > 0.0 {414 out.push('.');415 let mut frac_str = String::new();416 render_decimal(&mut frac_str, frac as i64, precision, 0, false, false);417 let mut trim = frac_str.len();418 if !trailing {419 for b in frac_str.as_bytes().iter().rev() {420 if *b == b'0' {421 trim -= 1;422 }423 }424 }425 out.push_str(&frac_str[..trim]);426 } else if ensure_pt {427 out.push('.');428 }429}430431pub fn render_float_sci(432 out: &mut String,433 n: f64,434 mut padding: usize,435 precision: usize,436 blank: bool,437 sign: bool,438 ensure_pt: bool,439 trailing: bool,440 caps: bool,441) {442 let exponent = n.log10().floor();443 let mantissa = if exponent as i16 == -324 {444 n * 10.0 / 10.0_f64.powf(exponent + 1.0)445 } else {446 n / 10.0_f64.powf(exponent)447 };448 let mut exponent_str = String::new();449 render_decimal(&mut exponent_str, exponent as i64, 3, 0, false, true);450451 // +1 for e452 padding = padding.saturating_sub(exponent_str.len() + 1);453454 render_float(455 out, mantissa, padding, precision, blank, sign, ensure_pt, trailing,456 );457 out.push(if caps { 'E' } else { 'e' });458 out.push_str(&exponent_str);459}460461pub fn format_code(462 out: &mut String,463 value: &Val,464 code: &Code,465 width: usize,466 precision: Option<usize>,467) -> Result<()> {468 let clfags = &code.cflags;469 let (fpprec, iprec) = match precision {470 Some(v) => (v, v),471 None => (6, 0),472 };473 let padding = if clfags.zero && !clfags.left {474 width475 } else {476 0477 };478479 // TODO: If left padded, can optimize by writing directly to out480 let mut tmp_out = String::new();481482 match code.convtype {483 ConvTypeV::String => tmp_out.push_str(&value.clone().to_string()?),484 ConvTypeV::Decimal => {485 let value = value.clone().try_cast_num("%d/%u/%i requires number")?;486 render_decimal(487 &mut tmp_out,488 value as i64,489 padding,490 iprec,491 clfags.blank,492 clfags.sign,493 );494 }495 ConvTypeV::Octal => {496 let value = value.clone().try_cast_num("%o requires number")?;497 render_octal(498 &mut tmp_out,499 value as i64,500 padding,501 iprec,502 clfags.alt,503 clfags.blank,504 clfags.sign,505 );506 }507 ConvTypeV::Hexadecimal => {508 let value = value.clone().try_cast_num("%x/%X requires number")?;509 render_hexadecimal(510 &mut tmp_out,511 value as i64,512 padding,513 iprec,514 clfags.alt,515 clfags.blank,516 clfags.sign,517 code.caps,518 );519 }520 ConvTypeV::Scientific => {521 let value = value.clone().try_cast_num("%e/%E requires number")?;522 render_float_sci(523 &mut tmp_out,524 value,525 padding,526 fpprec,527 clfags.blank,528 clfags.sign,529 clfags.alt,530 true,531 code.caps,532 );533 }534 ConvTypeV::Float => {535 let value = value.clone().try_cast_num("%e/%E requires number")?;536 render_float(537 &mut tmp_out,538 value,539 padding,540 fpprec,541 clfags.blank,542 clfags.sign,543 clfags.alt,544 true,545 );546 }547 ConvTypeV::Shorter => {548 let value = value.clone().try_cast_num("%g/%G requires number")?;549 let exponent = value.log10().floor();550 if exponent < -4.0 || exponent >= fpprec as f64 {551 render_float_sci(552 &mut tmp_out,553 value,554 padding,555 fpprec - 1,556 clfags.blank,557 clfags.sign,558 clfags.alt,559 clfags.alt,560 code.caps,561 );562 } else {563 let digits_before_pt = 1.max(exponent as usize + 1);564 render_float(565 &mut tmp_out,566 value,567 padding,568 fpprec - digits_before_pt,569 clfags.blank,570 clfags.sign,571 clfags.alt,572 clfags.alt,573 );574 }575 }576 ConvTypeV::Char => match value.clone().unwrap_if_lazy()? {577 Val::Num(n) => tmp_out.push(578 std::char::from_u32(n as u32)579 .ok_or_else(|| InvalidUnicodeCodepointGot(n as u32))?,580 ),581 Val::Str(s) => {582 if s.chars().count() != 1 {583 throw!(RuntimeError(584 format!("%c expected 1 char string, got {}", s.chars().count()).into(),585 ));586 }587 tmp_out.push_str(&s);588 }589 _ => {590 throw!(TypeMismatch(591 "%c requires number/string",592 vec![ValType::Num, ValType::Str],593 value.value_type()?,594 ));595 }596 },597 ConvTypeV::Percent => tmp_out.push('%'),598 };599600 let padding = width.saturating_sub(tmp_out.len());601602 if !clfags.left {603 for _ in 0..padding {604 out.push(' ');605 }606 }607 out.push_str(&tmp_out);608 if clfags.left {609 for _ in 0..padding {610 out.push(' ');611 }612 }613614 Ok(())615}616617pub fn format_arr(str: &str, mut values: &[Val]) -> Result<String> {618 let codes = parse_codes(str)?;619 let mut out = String::new();620621 for code in codes {622 match code {623 Element::String(s) => {624 out.push_str(s);625 }626 Element::Code(c) => {627 let width = match c.width {628 Width::Star => {629 if values.is_empty() {630 throw!(NotEnoughValues);631 }632 let value = &values[0];633 values = &values[1..];634 value.clone().try_cast_num("field width")? as usize635 }636 Width::Fixed(n) => n,637 };638 let precision = match c.precision {639 Some(Width::Star) => {640 if values.is_empty() {641 throw!(NotEnoughValues);642 }643 let value = &values[0];644 values = &values[1..];645 Some(value.clone().try_cast_num("field precision")? as usize)646 }647 Some(Width::Fixed(n)) => Some(n),648 None => None,649 };650651 // %% should not consume a value652 let value = if c.convtype == ConvTypeV::Percent {653 &Val::Null654 } else {655 if values.is_empty() {656 throw!(NotEnoughValues);657 }658 let value = &values[0];659 values = &values[1..];660 value661 };662663 format_code(&mut out, value, &c, width, precision)?;664 }665 }666 }667668 Ok(out)669}670671pub fn format_obj(str: &str, values: &ObjValue) -> Result<String> {672 let codes = parse_codes(str)?;673 let mut out = String::new();674675 for code in codes {676 match code {677 Element::String(s) => {678 out.push_str(s);679 }680 Element::Code(c) => {681 // TODO: Operate on ref682 let f: Rc<str> = c.mkey.into();683 let width = match c.width {684 Width::Star => {685 throw!(CannotUseStarWidthWithObject);686 }687 Width::Fixed(n) => n,688 };689 let precision = match c.precision {690 Some(Width::Star) => {691 throw!(CannotUseStarWidthWithObject);692 }693 Some(Width::Fixed(n)) => Some(n),694 None => None,695 };696697 let value = if c.convtype == ConvTypeV::Percent {698 Val::Null699 } else {700 if f.is_empty() {701 throw!(MappingKeysRequired);702 }703 if let Some(v) = values.get(f.clone())? {704 v705 } else {706 throw!(NoSuchFormatField(f));707 }708 };709710 format_code(&mut out, &value, &c, width, precision)?;711 }712 }713 }714715 Ok(out)716}717718#[cfg(test)]719pub mod test_format {720 use super::*;721722 #[test]723 fn parse() {724 assert_eq!(725 parse_codes(726 "How much error budget is left looking at our %.3f%% availability gurantees?"727 )728 .unwrap()729 .len(),730 4731 );732 }733734 #[test]735 fn octals() {736 assert_eq!(format_arr("%#o", &[Val::Num(8.0)]).unwrap(), "010");737 assert_eq!(format_arr("%#4o", &[Val::Num(8.0)]).unwrap(), " 010");738 assert_eq!(format_arr("%4o", &[Val::Num(8.0)]).unwrap(), " 10");739 assert_eq!(format_arr("%04o", &[Val::Num(8.0)]).unwrap(), "0010");740 assert_eq!(format_arr("%+4o", &[Val::Num(8.0)]).unwrap(), " +10");741 assert_eq!(format_arr("%+04o", &[Val::Num(8.0)]).unwrap(), "+010");742 assert_eq!(format_arr("%-4o", &[Val::Num(8.0)]).unwrap(), "10 ");743 assert_eq!(format_arr("%+-4o", &[Val::Num(8.0)]).unwrap(), "+10 ");744 assert_eq!(format_arr("%+-04o", &[Val::Num(8.0)]).unwrap(), "+10 ");745 }746747 #[test]748 fn percent_doesnt_consumes_values() {749 assert_eq!(750 format_arr(751 "How much error budget is left looking at our %.3f%% availability gurantees?",752 &[Val::Num(4.0)]753 )754 .unwrap(),755 "How much error budget is left looking at our 4.000% availability gurantees?"756 );757 }758}crates/jrsonnet-evaluator/src/builtin/sort.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/builtin/sort.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/sort.rs
@@ -4,9 +4,11 @@
};
use std::rc::Rc;
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, thiserror::Error)]
pub enum SortError {
+ #[error("sort key should be string or number")]
SortKeyShouldBeStringOrNumber,
+ #[error("sort elements should have equal types")]
SortElementsShouldHaveEqualType,
}
crates/jrsonnet-evaluator/src/ctx.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/ctx.rs
+++ b/crates/jrsonnet-evaluator/src/ctx.rs
@@ -63,7 +63,7 @@
.bindings
.get(&name)
.cloned()
- .ok_or_else(|| UnknownVariable(name))?)
+ .ok_or_else(|| VariableIsNotDefined(name))?)
}
pub fn into_future(self, ctx: FutureContext) -> Self {
{
crates/jrsonnet-evaluator/src/error.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/error.rs
+++ b/crates/jrsonnet-evaluator/src/error.rs
@@ -4,75 +4,117 @@
};
use jrsonnet_parser::{BinaryOpType, ExprLocation, UnaryOpType};
use std::{path::PathBuf, rc::Rc};
+use thiserror::Error;
-#[derive(Debug, Clone)]
+#[derive(Error, Debug, Clone)]
pub enum Error {
+ #[error("intrinsic not found: {0}.{1}")]
IntrinsicNotFound(Rc<str>, Rc<str>),
+ #[error("argument reordering in intrisics not supported yet")]
IntrinsicArgumentReorderingIsNotSupportedYet,
+ #[error("operator {0} does not operate on type {1}")]
UnaryOperatorDoesNotOperateOnType(UnaryOpType, ValType),
+ #[error("binary operation {1} {0} {2} is not implemented")]
BinaryOperatorDoesNotOperateOnValues(BinaryOpType, ValType, ValType),
+ #[error("no top level object in this context")]
NoTopLevelObjectFound,
+ #[error("self is only usable inside objects")]
CantUseSelfOutsideOfObject,
+ #[error("super is only usable inside objects")]
CantUseSuperOutsideOfObject,
+ #[error("for loop can only iterate over arrays")]
InComprehensionCanOnlyIterateOverArray,
+ #[error("array out of bounds: {0} is not within [0,{1})")]
ArrayBoundsError(usize, usize),
+ #[error("assert failed: {0}")]
AssertionFailed(Rc<str>),
- VariableIsNotDefined(String),
+ #[error("variable is not defined: {0}")]
+ VariableIsNotDefined(Rc<str>),
+ #[error("type mismatch: expected {2}, got {1:?} {0}")]
TypeMismatch(&'static str, Vec<ValType>, ValType),
+ #[error("no such field: {0}")]
NoSuchField(Rc<str>),
- UnknownVariable(Rc<str>),
-
+ #[error("only functions can be called, got {0}")]
OnlyFunctionsCanBeCalledGot(ValType),
+ #[error("parameter {0} is not defined")]
UnknownFunctionParameter(String),
+ #[error("argument {0} is already bound")]
BindingParameterASecondTime(Rc<str>),
+ #[error("too many args, function has {0}")]
TooManyArgsFunctionHas(usize),
+ #[error("founction argument is not passed: {0}")]
FunctionParameterNotBoundInCall(Rc<str>),
+ #[error("external variable is not defined: {0}")]
UndefinedExternalVariable(Rc<str>),
+ #[error("native is not defined: {0}")]
UndefinedExternalFunction(Rc<str>),
+ #[error("field name should be string, got {0}")]
FieldMustBeStringGot(ValType),
+ #[error("attempted to index array with string {0}")]
AttemptedIndexAnArrayWithString(Rc<str>),
+ #[error("{0} index type should be {1}, got {2}")]
ValueIndexMustBeTypeGot(ValType, ValType, ValType),
+ #[error("cant index into {0}")]
CantIndexInto(ValType),
+ #[error("super can't be used standalone")]
StandaloneSuper,
+ #[error("can't resolve {1} from {0}")]
ImportFileNotFound(PathBuf, PathBuf),
+ #[error("resolved file not found: {0}")]
ResolvedFileNotFound(PathBuf),
+ #[error("imported file is not valid utf-8: {0:?}")]
ImportBadFileUtf8(PathBuf),
+ #[error("tried to import {1} from {0}, but imports is not supported")]
ImportNotSupported(PathBuf, PathBuf),
+ #[error("syntax error")]
ImportSyntaxError {
path: Rc<PathBuf>,
source_code: Rc<str>,
error: Box<jrsonnet_parser::ParseError>,
},
+ #[error("runtime error: {0}")]
RuntimeError(Rc<str>),
+ #[error("stack overflow, try to reduce recursion, or set --max-stack to bigger value")]
StackOverflow,
+ #[error("tried to index by fractional value")]
FractionalIndex,
+ #[error("attempted to divide by zero")]
DivisionByZero,
+ #[error("string manifest output is not an string")]
StringManifestOutputIsNotAString,
+ #[error("stream manifest output is not an array")]
StreamManifestOutputIsNotAArray,
+ #[error("multi manifest output is not an object")]
MultiManifestOutputIsNotAObject,
+ #[error("cant recurse stream manifest")]
StreamManifestOutputCannotBeRecursed,
+ #[error("stream manifest output cannot consist of raw strings")]
StreamManifestCannotNestString,
+ #[error("{0}")]
ImportCallbackError(String),
+ #[error("invalid unicode codepoint: {0}")]
InvalidUnicodeCodepointGot(u32),
- Format(FormatError),
- Sort(SortError),
+ #[error("format error: {0}")]
+ Format(#[from] FormatError),
+ #[error("sort error: {0}")]
+ Sort(#[from] SortError),
}
impl From<Error> for LocError {
fn from(e: Error) -> Self {
crates/jrsonnet-evaluator/src/trace/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/trace/mod.rs
+++ b/crates/jrsonnet-evaluator/src/trace/mod.rs
@@ -86,7 +86,7 @@
evaluation_state: &EvaluationState,
error: &LocError,
) -> Result<(), std::fmt::Error> {
- writeln!(out, "{:?}", error.error())?;
+ writeln!(out, "{}", error.error())?;
let file_names = error
.trace()
.0
@@ -132,7 +132,7 @@
evaluation_state: &EvaluationState,
error: &LocError,
) -> Result<(), std::fmt::Error> {
- writeln!(out, "{:?}", error.error())?;
+ writeln!(out, "{}", error.error())?;
for (i, item) in error.trace().0.iter().enumerate() {
if i != 0 {
writeln!(out)?;
@@ -171,7 +171,7 @@
display_list::{DisplayList, FormatOptions},
snippet::{AnnotationType, Slice, Snippet, SourceAnnotation},
};
- writeln!(out, "{:?}", error.error())?;
+ writeln!(out, "{}", error.error())?;
let trace = &error.trace();
for item in trace.0.iter() {
let desc = &item.desc;