git.delta.rocks / jrsonnet / refs/commits / cead2c336a71

53    needs: [test]53    needs: [test]
54    strategy:54    strategy:
55      matrix:55      matrix:
56        os: [ubuntu-latest, macOS-latest, windows-latest]56        target:
57          # Tier 1
58          - aarch64-unknown-linux-gnu
59          - i686-pc-windows-gnu
60          - i686-pc-windows-msvc
61          - i686-unknown-linux-gnu
62          - x86_64-apple-darwin
63          - x86_64-pc-windows-gnu
64          - x86_64-pc-windows-msvc
65          - x86_64-unknown-linux-gnu
66
67          # Other
68          - x86_64-unknown-linux-musl
57        include:69        include:
58          - os: ubuntu-latest70          - target: aarch64-unknown-linux-gnu
59            rust: stable71            os: ubuntu-latest
60            target: x86_64-unknown-linux-musl
61            bin: jrsonnet72            bin: jrsonnet
62            name: jrsonnet-linux-amd6473            name: jrsonnet-linux-gnu-aarch64
63          - os: windows-latest74          - target: i686-pc-windows-gnu
64            rust: stable75            os: windows-latest
65            target: x86_64-pc-windows-msvc
66            bin: jrsonnet.exe76            bin: jrsonnet.exe
67            name: jrsonnet-windows-amd64.exe77            name: jrsonnet-windows-gnu-i686.exe
78          - target: i686-pc-windows-msvc
79            os: windows-latest
80            bin: jrsonnet.exe
81            name: jrsonnet-windows-msvc-i686.exe
82          - target: i686-unknown-linux-gnu
83            os: ubuntu-latest
84            bin: jrsonnet
85            name: jrsonnet-linux-gnu-i686
68          - os: macOS-latest86          - target: x86_64-apple-darwin
69            rust: stable87            os: macOS-latest
70            target: x86_64-apple-darwin
71            bin: jrsonnet88            bin: jrsonnet
72            name: jrsonnet-darwin-amd6489            name: jrsonnet-darwin-amd64
90          - target: x86_64-pc-windows-gnu
91            os: windows-latest
92            bin: jrsonnet.exe
93            name: jrsonnet-windows-gnu-amd64.exe
94          - target: x86_64-pc-windows-msvc
95            os: windows-latest
96            bin: jrsonnet.exe
97            name: jrsonnet-windows-msvc-amd64.exe
98          - target: x86_64-unknown-linux-gnu
99            os: ubuntu-latest
100            bin: jrsonnet
101            name: jrsonnet-linux-gnu-amd64
102
103          - target: x86_64-unknown-linux-musl
104            os: ubuntu-latest
105            bin: jrsonnet
106            name: jrsonnet-linux-musl-amd64
73    runs-on: ${{ matrix.os }}107    runs-on: ${{ matrix.os }}
74    steps:108    steps:
75      - name: Install stable toolchain109      - name: Install stable toolchain
76        uses: actions-rs/toolchain@v1110        uses: actions-rs/toolchain@v1
77        with:111        with:
78          toolchain: ${{ matrix.rust }}112          toolchain: stable
79          override: true113          override: true
80          target: ${{ matrix.target }}114          target: ${{ matrix.target }}
115
81      - name: Checkout116      - name: Checkout
82        uses: actions/checkout@v2117        uses: actions/checkout@v2
118
119      - name: Linux x86 cross compiler
120        if: ${{ matrix.target == 'i686-unknown-linux-gnu' }}
121        run: sudo apt install gcc-multilib
122
123      - name: Windows x86 cross compiler
124        if: ${{ matrix.target == 'i686-pc-windows-gnu' }}
125        uses: egor-tensin/setup-mingw@v2
126        with:
127          platform: x86
128
129      - name: ARM cross compiler
130        if: ${{ matrix.target == 'aarch64-unknown-linux-gnu' }}
131        uses: actions-rs/cargo@v1
132        with:
133          command: install
134          args: cross
135
136      - name: Run ARM build
137        if: ${{ matrix.target == 'aarch64-unknown-linux-gnu' }}
138        shell: bash
139        run: cross --bin=jrsonnet --release --target ${{ matrix.target }}
140
83      - name: Run build141      - name: Run build
142        if: ${{ matrix.target != 'aarch64-unknown-linux-gnu' }}
84        uses: actions-rs/cargo@v1143        uses: actions-rs/cargo@v1
85        with:144        with:
86          command: build145          command: build

--- a/crates/jrsonnet-evaluator/src/builtin/mod.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/mod.rs
@@ -1,8 +1,8 @@
 use crate::{
 	equals,
 	error::{Error::*, Result},
-	parse_args, primitive_equals, push, throw, with_state, ArrValue, Context, FuncVal, LazyVal,
-	Val,
+	parse_args, primitive_equals, push, throw, with_state, ArrValue, Context, EvaluationState,
+	FuncVal, LazyVal, Val,
 };
 use format::{format_arr, format_obj};
 use jrsonnet_interner::IStr;
@@ -74,6 +74,7 @@
 			("reverse".into(), builtin_reverse),
 			("id".into(), builtin_id),
 			("strReplace".into(), builtin_str_replace),
+			("parseJson".into(), builtin_parse_json),
 		].iter().cloned().collect()
 	};
 }
@@ -164,6 +165,20 @@
 	})
 }
 
+fn builtin_parse_json(
+	context: Context,
+	_loc: Option<&ExprLocation>,
+	args: &ArgsDesc,
+) -> Result<Val> {
+	parse_args!(context, "parseJson", args, 1, [
+		0, s: ty!(string) => Val::Str;
+	], {
+		let state = EvaluationState::default();
+		let path = Rc::new(PathBuf::from("std.parseJson"));
+		state.evaluate_snippet_raw(path ,s)
+	})
+}
+
 // faster
 fn builtin_slice(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
 	parse_args!(context, "slice", args, 4, [

--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -809,6 +809,21 @@
 	}
 
 	#[test]
+	fn parse_json() {
+		assert_json!(
+			r#"std.parseJson('{"a": -1,"b": 1,"c": 3.141,"d": []}')"#,
+			r#"{"a": -1,"b": 1,"c": 3.141,"d": []}"#
+		);
+		// TODO: this should in fact fail as is no proper JSON syntax
+		assert_json!(
+			r#"std.parseJson("{a:-1, b:1, c:3.141, d:[]}")"#,
+			r#"{"a": -1,"b": 1,"c": 3.141,"d": []}"#
+		);
+		// TODO: this is also no valid JSON
+		assert_json!(r#"std.parseJson('local x = 2; x * x')"#, r#"4"#);
+	}
+
+	#[test]
 	fn test() {
 		assert_json!(
 			r#"[[a, b] for a in [1,2,3] for b in [4,5,6]]"#,