difftreelog
feat support standalone super
in: master
3 files changed
crates/jrsonnet-evaluator/src/error.rsdiffbeforeafterboth1use crate::{2 builtin::{format::FormatError, sort::SortError},3 typed::TypeLocError,4};5use jrsonnet_interner::IStr;6use jrsonnet_parser::{BinaryOpType, ExprLocation, UnaryOpType};7use jrsonnet_types::ValType;8use std::{path::PathBuf, rc::Rc};9use thiserror::Error;1011#[derive(Error, Debug, Clone)]12pub enum Error {13 #[error("intrinsic not found: {0}")]14 IntrinsicNotFound(IStr),15 #[error("argument reordering in intrisics not supported yet")]16 IntrinsicArgumentReorderingIsNotSupportedYet,1718 #[error("operator {0} does not operate on type {1}")]19 UnaryOperatorDoesNotOperateOnType(UnaryOpType, ValType),20 #[error("binary operation {1} {0} {2} is not implemented")]21 BinaryOperatorDoesNotOperateOnValues(BinaryOpType, ValType, ValType),2223 #[error("no top level object in this context")]24 NoTopLevelObjectFound,25 #[error("self is only usable inside objects")]26 CantUseSelfOutsideOfObject,27 #[error("super is only usable inside objects")]28 CantUseSuperOutsideOfObject,2930 #[error("for loop can only iterate over arrays")]31 InComprehensionCanOnlyIterateOverArray,3233 #[error("array out of bounds: {0} is not within [0,{1})")]34 ArrayBoundsError(usize, usize),3536 #[error("assert failed: {0}")]37 AssertionFailed(IStr),3839 #[error("variable is not defined: {0}")]40 VariableIsNotDefined(IStr),41 #[error("type mismatch: expected {}, got {2} {0}", .1.iter().map(|e| format!("{}", e)).collect::<Vec<_>>().join(", "))]42 TypeMismatch(&'static str, Vec<ValType>, ValType),43 #[error("no such field: {0}")]44 NoSuchField(IStr),4546 #[error("only functions can be called, got {0}")]47 OnlyFunctionsCanBeCalledGot(ValType),48 #[error("parameter {0} is not defined")]49 UnknownFunctionParameter(String),50 #[error("argument {0} is already bound")]51 BindingParameterASecondTime(IStr),52 #[error("too many args, function has {0}")]53 TooManyArgsFunctionHas(usize),54 #[error("founction argument is not passed: {0}")]55 FunctionParameterNotBoundInCall(IStr),5657 #[error("external variable is not defined: {0}")]58 UndefinedExternalVariable(IStr),59 #[error("native is not defined: {0}")]60 UndefinedExternalFunction(IStr),6162 #[error("field name should be string, got {0}")]63 FieldMustBeStringGot(ValType),6465 #[error("attempted to index array with string {0}")]66 AttemptedIndexAnArrayWithString(IStr),67 #[error("{0} index type should be {1}, got {2}")]68 ValueIndexMustBeTypeGot(ValType, ValType, ValType),69 #[error("cant index into {0}")]70 CantIndexInto(ValType),7172 #[error("super can't be used standalone")]73 StandaloneSuper,7475 #[error("can't resolve {1} from {0}")]76 ImportFileNotFound(PathBuf, PathBuf),77 #[error("resolved file not found: {0}")]78 ResolvedFileNotFound(PathBuf),79 #[error("imported file is not valid utf-8: {0:?}")]80 ImportBadFileUtf8(PathBuf),81 #[error("tried to import {1} from {0}, but imports is not supported")]82 ImportNotSupported(PathBuf, PathBuf),83 #[error(84 "syntax error, expected one of {}, got {:?}",85 .error.expected,86 .source_code.chars().nth(error.location.offset).map(|c| c.to_string()).unwrap_or_else(|| "EOF".into())87 )]88 ImportSyntaxError {89 path: Rc<PathBuf>,90 source_code: IStr,91 error: Box<jrsonnet_parser::ParseError>,92 },9394 #[error("runtime error: {0}")]95 RuntimeError(IStr),96 #[error("stack overflow, try to reduce recursion, or set --max-stack to bigger value")]97 StackOverflow,98 #[error("tried to index by fractional value")]99 FractionalIndex,100 #[error("attempted to divide by zero")]101 DivisionByZero,102103 #[error("string manifest output is not an string")]104 StringManifestOutputIsNotAString,105 #[error("stream manifest output is not an array")]106 StreamManifestOutputIsNotAArray,107 #[error("multi manifest output is not an object")]108 MultiManifestOutputIsNotAObject,109110 #[error("cant recurse stream manifest")]111 StreamManifestOutputCannotBeRecursed,112 #[error("stream manifest output cannot consist of raw strings")]113 StreamManifestCannotNestString,114115 #[error("{0}")]116 ImportCallbackError(String),117 #[error("invalid unicode codepoint: {0}")]118 InvalidUnicodeCodepointGot(u32),119120 #[error("format error: {0}")]121 Format(#[from] FormatError),122 #[error("type error: {0}")]123 TypeError(TypeLocError),124 #[error("sort error: {0}")]125 Sort(#[from] SortError),126127 #[cfg(feature = "anyhow-error")]128 #[error(transparent)]129 Other(Rc<anyhow::Error>),130}131132#[cfg(feature = "anyhow-error")]133impl From<anyhow::Error> for LocError {134 fn from(e: anyhow::Error) -> Self {135 Self::new(Error::Other(Rc::new(e)))136 }137}138139impl From<Error> for LocError {140 fn from(e: Error) -> Self {141 Self::new(e)142 }143}144145#[derive(Clone, Debug)]146pub struct StackTraceElement {147 pub location: Option<ExprLocation>,148 pub desc: String,149}150#[derive(Debug, Clone)]151pub struct StackTrace(pub Vec<StackTraceElement>);152153#[derive(Debug, Clone)]154pub struct LocError(Box<(Error, StackTrace)>);155impl LocError {156 pub fn new(e: Error) -> Self {157 Self(Box::new((e, StackTrace(vec![]))))158 }159160 pub const fn error(&self) -> &Error {161 &(self.0).0162 }163 pub fn error_mut(&mut self) -> &mut Error {164 &mut (self.0).0165 }166 pub const fn trace(&self) -> &StackTrace {167 &(self.0).1168 }169 pub fn trace_mut(&mut self) -> &mut StackTrace {170 &mut (self.0).1171 }172}173174pub type Result<V> = std::result::Result<V, LocError>;175176#[macro_export]177macro_rules! throw {178 ($e: expr) => {179 return Err($e.into());180 };181}1use crate::{2 builtin::{format::FormatError, sort::SortError},3 typed::TypeLocError,4};5use jrsonnet_interner::IStr;6use jrsonnet_parser::{BinaryOpType, ExprLocation, UnaryOpType};7use jrsonnet_types::ValType;8use std::{path::PathBuf, rc::Rc};9use thiserror::Error;1011#[derive(Error, Debug, Clone)]12pub enum Error {13 #[error("intrinsic not found: {0}")]14 IntrinsicNotFound(IStr),15 #[error("argument reordering in intrisics not supported yet")]16 IntrinsicArgumentReorderingIsNotSupportedYet,1718 #[error("operator {0} does not operate on type {1}")]19 UnaryOperatorDoesNotOperateOnType(UnaryOpType, ValType),20 #[error("binary operation {1} {0} {2} is not implemented")]21 BinaryOperatorDoesNotOperateOnValues(BinaryOpType, ValType, ValType),2223 #[error("no top level object in this context")]24 NoTopLevelObjectFound,25 #[error("self is only usable inside objects")]26 CantUseSelfOutsideOfObject,27 #[error("no super found")]28 NoSuperFound,2930 #[error("for loop can only iterate over arrays")]31 InComprehensionCanOnlyIterateOverArray,3233 #[error("array out of bounds: {0} is not within [0,{1})")]34 ArrayBoundsError(usize, usize),3536 #[error("assert failed: {0}")]37 AssertionFailed(IStr),3839 #[error("variable is not defined: {0}")]40 VariableIsNotDefined(IStr),41 #[error("type mismatch: expected {}, got {2} {0}", .1.iter().map(|e| format!("{}", e)).collect::<Vec<_>>().join(", "))]42 TypeMismatch(&'static str, Vec<ValType>, ValType),43 #[error("no such field: {0}")]44 NoSuchField(IStr),4546 #[error("only functions can be called, got {0}")]47 OnlyFunctionsCanBeCalledGot(ValType),48 #[error("parameter {0} is not defined")]49 UnknownFunctionParameter(String),50 #[error("argument {0} is already bound")]51 BindingParameterASecondTime(IStr),52 #[error("too many args, function has {0}")]53 TooManyArgsFunctionHas(usize),54 #[error("founction argument is not passed: {0}")]55 FunctionParameterNotBoundInCall(IStr),5657 #[error("external variable is not defined: {0}")]58 UndefinedExternalVariable(IStr),59 #[error("native is not defined: {0}")]60 UndefinedExternalFunction(IStr),6162 #[error("field name should be string, got {0}")]63 FieldMustBeStringGot(ValType),6465 #[error("attempted to index array with string {0}")]66 AttemptedIndexAnArrayWithString(IStr),67 #[error("{0} index type should be {1}, got {2}")]68 ValueIndexMustBeTypeGot(ValType, ValType, ValType),69 #[error("cant index into {0}")]70 CantIndexInto(ValType),7172 #[error("super can't be used standalone")]73 StandaloneSuper,7475 #[error("can't resolve {1} from {0}")]76 ImportFileNotFound(PathBuf, PathBuf),77 #[error("resolved file not found: {0}")]78 ResolvedFileNotFound(PathBuf),79 #[error("imported file is not valid utf-8: {0:?}")]80 ImportBadFileUtf8(PathBuf),81 #[error("tried to import {1} from {0}, but imports is not supported")]82 ImportNotSupported(PathBuf, PathBuf),83 #[error(84 "syntax error, expected one of {}, got {:?}",85 .error.expected,86 .source_code.chars().nth(error.location.offset).map(|c| c.to_string()).unwrap_or_else(|| "EOF".into())87 )]88 ImportSyntaxError {89 path: Rc<PathBuf>,90 source_code: IStr,91 error: Box<jrsonnet_parser::ParseError>,92 },9394 #[error("runtime error: {0}")]95 RuntimeError(IStr),96 #[error("stack overflow, try to reduce recursion, or set --max-stack to bigger value")]97 StackOverflow,98 #[error("tried to index by fractional value")]99 FractionalIndex,100 #[error("attempted to divide by zero")]101 DivisionByZero,102103 #[error("string manifest output is not an string")]104 StringManifestOutputIsNotAString,105 #[error("stream manifest output is not an array")]106 StreamManifestOutputIsNotAArray,107 #[error("multi manifest output is not an object")]108 MultiManifestOutputIsNotAObject,109110 #[error("cant recurse stream manifest")]111 StreamManifestOutputCannotBeRecursed,112 #[error("stream manifest output cannot consist of raw strings")]113 StreamManifestCannotNestString,114115 #[error("{0}")]116 ImportCallbackError(String),117 #[error("invalid unicode codepoint: {0}")]118 InvalidUnicodeCodepointGot(u32),119120 #[error("format error: {0}")]121 Format(#[from] FormatError),122 #[error("type error: {0}")]123 TypeError(TypeLocError),124 #[error("sort error: {0}")]125 Sort(#[from] SortError),126127 #[cfg(feature = "anyhow-error")]128 #[error(transparent)]129 Other(Rc<anyhow::Error>),130}131132#[cfg(feature = "anyhow-error")]133impl From<anyhow::Error> for LocError {134 fn from(e: anyhow::Error) -> Self {135 Self::new(Error::Other(Rc::new(e)))136 }137}138139impl From<Error> for LocError {140 fn from(e: Error) -> Self {141 Self::new(e)142 }143}144145#[derive(Clone, Debug)]146pub struct StackTraceElement {147 pub location: Option<ExprLocation>,148 pub desc: String,149}150#[derive(Debug, Clone)]151pub struct StackTrace(pub Vec<StackTraceElement>);152153#[derive(Debug, Clone)]154pub struct LocError(Box<(Error, StackTrace)>);155impl LocError {156 pub fn new(e: Error) -> Self {157 Self(Box::new((e, StackTrace(vec![]))))158 }159160 pub const fn error(&self) -> &Error {161 &(self.0).0162 }163 pub fn error_mut(&mut self) -> &mut Error {164 &mut (self.0).0165 }166 pub const fn trace(&self) -> &StackTrace {167 &(self.0).1168 }169 pub fn trace_mut(&mut self) -> &mut StackTrace {170 &mut (self.0).1171 }172}173174pub type Result<V> = std::result::Result<V, LocError>;175176#[macro_export]177macro_rules! throw {178 ($e: expr) => {179 return Err($e.into());180 };181}crates/jrsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/evaluate.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate.rs
@@ -418,6 +418,13 @@
Literal(LiteralType::This) => {
Val::Obj(context.this().clone().ok_or(CantUseSelfOutsideOfObject)?)
}
+ Literal(LiteralType::Super) => Val::Obj(
+ context
+ .super_obj()
+ .clone()
+ .ok_or(NoSuperFound)?
+ .with_this(context.this().clone().unwrap()),
+ ),
Literal(LiteralType::Dollar) => {
Val::Obj(context.dollar().clone().ok_or(NoTopLevelObjectFound)?)
}
@@ -434,15 +441,6 @@
|| format!("variable <{}>", name),
|| Ok(context.binding(name.clone())?.evaluate()?),
)?,
- Index(LocExpr(v, _), index) if matches!(&**v, Expr::Literal(LiteralType::Super)) => {
- let name = evaluate(context.clone(), index)?.try_cast_str("object index")?;
- context
- .super_obj()
- .clone()
- .expect("no super found")
- .get_raw(name, Some(&context.this().clone().expect("no this found")))?
- .expect("value not found")
- }
Index(value, index) => {
match (evaluate(context.clone(), value)?, evaluate(context, index)?) {
(Val::Obj(v), Val::Str(s)) => {
@@ -620,6 +618,5 @@
import_location.pop();
Val::Str(with_state(|s| s.import_file_str(import_location, path))?)
}
- Literal(LiteralType::Super) => throw!(StandaloneSuper),
})
}
crates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -931,6 +931,25 @@
Ok(())
}
+ #[test]
+ fn standalone_super() -> crate::error::Result<()> {
+ assert_eval!(
+ r#"
+ local obj = {
+ a: 1,
+ b: 2,
+ c: 3,
+ };
+ local test = obj + {
+ fields: std.objectFields(super),
+ d: 5,
+ };
+ test.fields == ['a', 'b', 'c']
+ "#
+ );
+ Ok(())
+ }
+
struct TestImportResolver(IStr);
impl crate::import::ImportResolver for TestImportResolver {
fn resolve_file(&self, _: &PathBuf, _: &PathBuf) -> crate::error::Result<Rc<PathBuf>> {