git.delta.rocks / jrsonnet / refs/commits / 5a21a2e9327c

difftreelog

refactor(parser)! remove intrinsic syntax

Yaroslav Bolyukin2022-07-23parent: #146d9d9.patch.diff
in: master
There was special support to refer to native functions for stdlib, as
otherwise `std.native` was not implementable.
However, now evaluator contains support for fancy builtins, and it is
possible to reimplement standard library without any parser magic.

BREAKING CHANGE: This syntax no longer works: $intrinsic(name),
$intrinsicId, $intrinsicThisFile

3 files changed

modifiedcrates/jrsonnet-parser/src/expr.rsdiffbeforeafterboth
341 Index(LocExpr, LocExpr),341 Index(LocExpr, LocExpr),
342 /// function(x) x342 /// function(x) x
343 Function(ParamsDesc, LocExpr),343 Function(ParamsDesc, LocExpr),
344 /// std.thisFile
345 IntrinsicThisFile,
346 /// std.id,
347 IntrinsicId,
348 /// std.primitiveEquals
349 Intrinsic(IStr),
350 /// if true == false then 1 else 2344 /// if true == false then 1 else 2
351 IfElse {345 IfElse {
352 cond: IfSpecData,346 cond: IfSpecData,
modifiedcrates/jrsonnet-parser/src/lib.rsdiffbeforeafterboth
252 pub rule expr_basic(s: &ParserSettings) -> Expr252 pub rule expr_basic(s: &ParserSettings) -> Expr
253 = literal(s)253 = literal(s)
254
255 / quiet!{"$intrinsicThisFile" {Expr::IntrinsicThisFile}}
256 / quiet!{"$intrinsicId" {Expr::IntrinsicId}}
257 / quiet!{"$intrinsic(" name:id() ")" {Expr::Intrinsic(name)}}
258254
259 / string_expr(s) / number_expr(s)255 / string_expr(s) / number_expr(s)
260 / array_expr(s)256 / array_expr(s)
modifiedcrates/jrsonnet-parser/src/source.rsdiffbeforeafterboth
51 pub fn short_display(&self) -> ShortDisplay {51 pub fn short_display(&self) -> ShortDisplay {
52 ShortDisplay(self.clone())52 ShortDisplay(self.clone())
53 }53 }
54 pub fn full_path(&self) -> String {
55 match self.inner() {
56 Inner::Real(r) => r.display().to_string(),
57 Inner::Virtual(v) => v.to_string(),
58 }
59 }
6054
61 /// Returns None if file is virtual55 /// Returns None if file is virtual
62 pub fn path(&self) -> Option<&Path> {56 pub fn path(&self) -> Option<&Path> {