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

difftreelog

feat(bindings) snippet evaluation

Лач2020-06-28parent: #b41226a.patch.diff
in: master

2 files changed

modifiedbindings/jsonnet/src/lib.rsdiffbeforeafterboth
307 })307 })
308}308}
309
310/// # Safety
311///
312/// This function is safe, if received v is a pointer to normal C string
309#[no_mangle]313#[no_mangle]
310pub extern "C" fn jsonnet_evaluate_snippet() {314pub unsafe extern "C" fn jsonnet_evaluate_snippet(
315 vm: &EvaluationState,
316 filename: *const c_char,
317 snippet: *const c_char,
318 error: &mut c_int,
319) -> *const c_char {
320 vm.run_in_state(|| {
321 use std::fmt::Write;
322 let filename = CStr::from_ptr(filename);
323 let snippet = CStr::from_ptr(snippet);
324 match vm.evaluate_snippet_to_json(
325 &PathBuf::from(filename.to_str().unwrap()),
326 &snippet.to_str().unwrap(),
327 ) {
328 Ok(v) => {
329 *error = 0;
330 CString::new(&*v as &str).unwrap().into_raw()
331 }
332 Err(e) => {
333 *error = 1;
334 let mut out = String::new();
311 todo!()335 writeln!(out, "{:?}", e.0).unwrap();
336 for i in (e.1).0.iter() {
337 writeln!(out, "{:?} ---- {}", i.0, i.1).unwrap();
338 }
339 CString::new(&out as &str).unwrap().into_raw()
340 }
312}341 }
342 })
343}
344
313#[no_mangle]345#[no_mangle]
314pub extern "C" fn jsonnet_evaluate_file_multi() {346pub extern "C" fn jsonnet_evaluate_file_multi() {
modifiedcrates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth
140 ) -> std::result::Result<Rc<str>, LocError> {140 ) -> std::result::Result<Rc<str>, LocError> {
141 self.import_file(&PathBuf::new(), &path).and_then(|v|v.into_json(4))141 self.import_file(&PathBuf::new(), &path).and_then(|v|v.into_json(4))
142 }142 }
143 pub fn evaluate_snippet_to_json(
144 &self,
145 path: &PathBuf,
146 snippet: &str,
147 ) -> std::result::Result<Rc<str>, LocError> {
148 self.parse_evaluate_raw_with_source(Rc::new(path.clone()), snippet).and_then(|v|v.into_json(4))
149 }
150
143 pub fn add_file(151 pub fn add_file(
144 &self,152 &self,
228 Ok(self.data().str_files.get(&path).cloned().unwrap())236 Ok(self.data().str_files.get(&path).cloned().unwrap())
229 }237 }
230238
231 pub fn parse_evaluate_raw(&self, code: &str) -> Result<Val> {239 pub fn parse_evaluate_raw_with_source(&self, source: Rc<PathBuf>, code: &str) -> Result<Val> {
232 let parsed = parse(240 let parsed = parse(
233 &code,241 &code,
234 &ParserSettings {242 &ParserSettings {
235 file_name: Rc::new(PathBuf::from("raw.jsonnet")),243 file_name: source,
236 loc_data: true,244 loc_data: true,
237 },245 },
238 )246 )
239 .unwrap();247 .unwrap();
240 self.evaluate_raw(parsed)248 self.evaluate_raw(parsed)
241 }249 }
250 pub fn parse_evaluate_raw(&self, code: &str) -> Result<Val> {
251 self.parse_evaluate_raw_with_source(Rc::new(PathBuf::from("raw.jsonnet")), code)
252 }
242253
243 pub fn evaluate_raw(&self, code: LocExpr) -> Result<Val> {254 pub fn evaluate_raw(&self, code: LocExpr) -> Result<Val> {
244 self.run_in_state(|| evaluate(self.create_default_context()?, &code))255 self.run_in_state(|| evaluate(self.create_default_context()?, &code))