difftreelog
chore(bindings) change C directory
in: master
5 files changed
bindings/Makefilediffbeforeafterboth--- a/bindings/Makefile
+++ b/bindings/Makefile
@@ -1,11 +1,12 @@
../target/release/libjsonnet.so:
cargo build --release -p jsonnet
-libjsonnet_test_file: libjsonnet_test_file.c ../target/release/libjsonnet.so
- gcc -L../target/release/ -ljsonnet libjsonnet_test_file.c -o libjsonnet_test_file
+./c/libjsonnet_test_file: ./c/libjsonnet_test_file.c ../target/release/libjsonnet.so
+ gcc -L../target/release/ -ljsonnet ./c/libjsonnet_test_file.c -o ./c/libjsonnet_test_file
-.PHONY: test
-test: libjsonnet_test_file ../target/release/libjsonnet.so
+.PHONY: test-c
+test-c: ./c/libjsonnet_test_file ../target/release/libjsonnet.so
export LD_LIBRARY_PATH=../target/release/
- ldd libjsonnet_test_file
- ./libjsonnet_test_file test.jsonnet
+ ldd ./c/libjsonnet_test_file
+ valgrind --leak-check=full ./c/libjsonnet_test_file test.jsonnet
+
bindings/c/libjsonnet.hdiffbeforeafterbothno changes
bindings/c/libjsonnet_test_file.cdiffbeforeafterboth--- /dev/null
+++ b/bindings/c/libjsonnet_test_file.c
@@ -0,0 +1,40 @@
+/*
+Copyright 2015 Google Inc. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "libjsonnet.h"
+
+int main(int argc, const char **argv)
+{
+ int error;
+ char *output;
+ struct JsonnetVm *vm;
+ if (argc != 2) {
+ fprintf(stderr, "libjsonnet_test_file <file>\n");
+ return EXIT_FAILURE;
+ }
+ vm = jsonnet_make();
+ output = jsonnet_evaluate_file(vm, argv[1], &error);
+ if (error) {
+ fprintf(stderr, "%s", output);
+ jsonnet_realloc(vm, output, 0);
+ jsonnet_destroy(vm);
+ return EXIT_FAILURE;
+ }
+ printf("%s", output);
+ jsonnet_realloc(vm, output, 0);
+ jsonnet_destroy(vm);
+ return EXIT_SUCCESS;
+}
bindings/libjsonnet.hdiffbeforeafterboth--- a/bindings/libjsonnet.h
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
-Copyright 2015 Google Inc. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-#ifndef LIB_JSONNET_H
-#define LIB_JSONNET_H
-
-#include <stddef.h>
-
-/** \file This file is a library interface for evaluating Jsonnet. It is written in C++ but exposes
- * a C interface for easier wrapping by other languages. See \see jsonnet_lib_test.c for an example
- * of using the library.
- */
-
-/** The version string of th Jsonnet interpreter.
- *
- * This is currently grepped out of this file by setup.py, Makefile, and CMakeLists.txt so be aware
- * of that when making changes.
- *
- * If this isn't the sae as jsonnet_version() then you've got a mismatched binary / header.
- */
-#define LIB_JSONNET_VERSION "v0.16.0"
-
-/** Return the version string of the Jsonnet interpreter. Conforms to semantic versioning
- * http://semver.org/ If this does not match LIB_JSONNET_VERSION then there is a mismatch between
- * header and compiled library.
- */
-const char *jsonnet_version(void);
-
-/** Jsonnet virtual machine context. */
-struct JsonnetVm;
-
-/** Create a new Jsonnet virtual machine. */
-struct JsonnetVm *jsonnet_make(void);
-
-/** Set the maximum stack depth. */
-void jsonnet_max_stack(struct JsonnetVm *vm, unsigned v);
-
-/** Set the number of objects required before a garbage collection cycle is allowed. */
-void jsonnet_gc_min_objects(struct JsonnetVm *vm, unsigned v);
-
-/** Run the garbage collector after this amount of growth in the number of objects. */
-void jsonnet_gc_growth_trigger(struct JsonnetVm *vm, double v);
-
-/** Expect a string as output and don't JSON encode it. */
-void jsonnet_string_output(struct JsonnetVm *vm, int v);
-
-/** Callback used to load imports.
- *
- * The returned char* should be allocated with jsonnet_realloc. It will be cleaned up by
- * libjsonnet when no-longer needed.
- *
- * \param ctx User pointer, given in jsonnet_import_callback.
- * \param base The directory containing the code that did the import.
- * \param rel The path imported by the code.
- * \param found_here Set this byref param to path to the file, absolute or relative to the
- * process's CWD. This is necessary so that imports from the content of the imported file can
- * be resolved correctly. Allocate memory with jsonnet_realloc. Only use when *success = 1.
- * \param success Set this byref param to 1 to indicate success and 0 for failure.
- * \returns The content of the imported file, or an error message.
- */
-typedef char *JsonnetImportCallback(void *ctx, const char *base, const char *rel, char **found_here,
- int *success);
-
-/** An opaque type which can only be utilized via the jsonnet_json_* family of functions.
- */
-struct JsonnetJsonValue;
-
-/** If the value is a string, return it as UTF8 otherwise return NULL.
- */
-const char *jsonnet_json_extract_string(struct JsonnetVm *vm, const struct JsonnetJsonValue *v);
-
-/** If the value is a number, return 1 and store the number in out, otherwise return 0.
- */
-int jsonnet_json_extract_number(struct JsonnetVm *vm, const struct JsonnetJsonValue *v,
- double *out);
-
-/** Return 0 if the value is false, 1 if it is true, and 2 if it is not a bool.
- */
-int jsonnet_json_extract_bool(struct JsonnetVm *vm, const struct JsonnetJsonValue *v);
-
-/** Return 1 if the value is null, else 0.
- */
-int jsonnet_json_extract_null(struct JsonnetVm *vm, const struct JsonnetJsonValue *v);
-
-/** Convert the given UTF8 string to a JsonnetJsonValue.
- */
-struct JsonnetJsonValue *jsonnet_json_make_string(struct JsonnetVm *vm, const char *v);
-
-/** Convert the given double to a JsonnetJsonValue.
- */
-struct JsonnetJsonValue *jsonnet_json_make_number(struct JsonnetVm *vm, double v);
-
-/** Convert the given bool (1 or 0) to a JsonnetJsonValue.
- */
-struct JsonnetJsonValue *jsonnet_json_make_bool(struct JsonnetVm *vm, int v);
-
-/** Make a JsonnetJsonValue representing null.
- */
-struct JsonnetJsonValue *jsonnet_json_make_null(struct JsonnetVm *vm);
-
-/** Make a JsonnetJsonValue representing an array.
- *
- * Assign elements with jsonnet_json_array_append.
- */
-struct JsonnetJsonValue *jsonnet_json_make_array(struct JsonnetVm *vm);
-
-/** Add v to the end of the array.
- */
-void jsonnet_json_array_append(struct JsonnetVm *vm, struct JsonnetJsonValue *arr,
- struct JsonnetJsonValue *v);
-
-/** Make a JsonnetJsonValue representing an object with the given number of fields.
- *
- * Every index of the array must have a unique value assigned with jsonnet_json_array_element.
- */
-struct JsonnetJsonValue *jsonnet_json_make_object(struct JsonnetVm *vm);
-
-/** Add the field f to the object, bound to v.
- *
- * This replaces any previous binding of the field.
- */
-void jsonnet_json_object_append(struct JsonnetVm *vm, struct JsonnetJsonValue *obj, const char *f,
- struct JsonnetJsonValue *v);
-
-/** Clean up a JSON subtree.
- *
- * This is useful if you want to abort with an error mid-way through building a complex value.
- */
-void jsonnet_json_destroy(struct JsonnetVm *vm, struct JsonnetJsonValue *v);
-
-/** Callback to provide native extensions to Jsonnet.
- *
- * The returned JsonnetJsonValue* should be allocated with jsonnet_realloc. It will be cleaned up
- * along with the objects rooted at argv by libjsonnet when no-longer needed. Return a string upon
- * failure, which will appear in Jsonnet as an error. The argv pointer is an array whose size
- * matches the array of parameters supplied when the native callback was originally registered.
- *
- * \param ctx User pointer, given in jsonnet_native_callback.
- * \param argv Array of arguments from Jsonnet code.
- * \param success Set this byref param to 1 to indicate success and 0 for failure.
- * \returns The content of the imported file, or an error message.
- */
-typedef struct JsonnetJsonValue *JsonnetNativeCallback(void *ctx,
- const struct JsonnetJsonValue *const *argv,
- int *success);
-
-/** Allocate, resize, or free a buffer. This will abort if the memory cannot be allocated. It will
- * only return NULL if sz was zero.
- *
- * \param buf If NULL, allocate a new buffer. If an previously allocated buffer, resize it.
- * \param sz The size of the buffer to return. If zero, frees the buffer.
- * \returns The new buffer.
- */
-char *jsonnet_realloc(struct JsonnetVm *vm, char *buf, size_t sz);
-
-/** Override the callback used to locate imports.
- */
-void jsonnet_import_callback(struct JsonnetVm *vm, JsonnetImportCallback *cb, void *ctx);
-
-/** Register a native extension.
- *
- * This will appear in Jsonnet as a function type and can be accessed from std.nativeExt("foo").
- *
- * DO NOT register native callbacks with side-effects! Jsonnet is a lazy functional language and
- * will call your function when you least expect it, more times than you expect, or not at all.
- *
- * \param vm The vm.
- * \param name The name of the function as visible to Jsonnet code, e.g. "foo".
- * \param cb The PURE function that implements the behavior you want.
- * \param ctx User pointer, stash non-global state you need here.
- * \param params NULL-terminated array of the names of the params. Must be valid identifiers.
- */
-void jsonnet_native_callback(struct JsonnetVm *vm, const char *name, JsonnetNativeCallback *cb,
- void *ctx, const char *const *params);
-
-/** Bind a Jsonnet external var to the given string.
- *
- * Argument values are copied so memory should be managed by caller.
- */
-void jsonnet_ext_var(struct JsonnetVm *vm, const char *key, const char *val);
-
-/** Bind a Jsonnet external var to the given code.
- *
- * Argument values are copied so memory should be managed by caller.
- */
-void jsonnet_ext_code(struct JsonnetVm *vm, const char *key, const char *val);
-
-/** Bind a string top-level argument for a top-level parameter.
- *
- * Argument values are copied so memory should be managed by caller.
- */
-void jsonnet_tla_var(struct JsonnetVm *vm, const char *key, const char *val);
-
-/** Bind a code top-level argument for a top-level parameter.
- *
- * Argument values are copied so memory should be managed by caller.
- */
-void jsonnet_tla_code(struct JsonnetVm *vm, const char *key, const char *val);
-
-/** Set the number of lines of stack trace to display (0 for all of them). */
-void jsonnet_max_trace(struct JsonnetVm *vm, unsigned v);
-
-/** Add to the default import callback's library search path.
- *
- * The search order is last to first, so more recently appended paths take precedence.
- */
-void jsonnet_jpath_add(struct JsonnetVm *vm, const char *v);
-
-/** Evaluate a file containing Jsonnet code, return a JSON string.
- *
- * The returned string should be cleaned up with jsonnet_realloc.
- *
- * \param filename Path to a file containing Jsonnet code.
- * \param error Return by reference whether or not there was an error.
- * \returns Either JSON or the error message.
- */
-char *jsonnet_evaluate_file(struct JsonnetVm *vm, const char *filename, int *error);
-
-/** Evaluate a string containing Jsonnet code, return a JSON string.
- *
- * The returned string should be cleaned up with jsonnet_realloc.
- *
- * \param filename Path to a file (used in error messages).
- * \param snippet Jsonnet code to execute.
- * \param error Return by reference whether or not there was an error.
- * \returns Either JSON or the error message.
- */
-char *jsonnet_evaluate_snippet(struct JsonnetVm *vm, const char *filename, const char *snippet,
- int *error);
-
-/** Evaluate a file containing Jsonnet code, return a number of named JSON files.
- *
- * The returned character buffer contains an even number of strings, the filename and JSON for each
- * JSON file interleaved. It should be cleaned up with jsonnet_realloc.
- *
- * \param filename Path to a file containing Jsonnet code.
- * \param error Return by reference whether or not there was an error.
- * \returns Either the error, or a sequence of strings separated by \0, terminated with \0\0.
- */
-char *jsonnet_evaluate_file_multi(struct JsonnetVm *vm, const char *filename, int *error);
-
-/** Evaluate a string containing Jsonnet code, return a number of named JSON files.
- *
- * The returned character buffer contains an even number of strings, the filename and JSON for each
- * JSON file interleaved. It should be cleaned up with jsonnet_realloc.
- *
- * \param filename Path to a file containing Jsonnet code.
- * \param snippet Jsonnet code to execute.
- * \param error Return by reference whether or not there was an error.
- * \returns Either the error, or a sequence of strings separated by \0, terminated with \0\0.
- */
-char *jsonnet_evaluate_snippet_multi(struct JsonnetVm *vm, const char *filename,
- const char *snippet, int *error);
-
-/** Evaluate a file containing Jsonnet code, return a number of JSON files.
- *
- * The returned character buffer contains several strings. It should be cleaned up with
- * jsonnet_realloc.
- *
- * \param filename Path to a file containing Jsonnet code.
- * \param error Return by reference whether or not there was an error.
- * \returns Either the error, or a sequence of strings separated by \0, terminated with \0\0.
- */
-char *jsonnet_evaluate_file_stream(struct JsonnetVm *vm, const char *filename, int *error);
-
-/** Evaluate a string containing Jsonnet code, return a number of JSON files.
- *
- * The returned character buffer contains several strings. It should be cleaned up with
- * jsonnet_realloc.
- *
- * \param filename Path to a file containing Jsonnet code.
- * \param snippet Jsonnet code to execute.
- * \param error Return by reference whether or not there was an error.
- * \returns Either the error, or a sequence of strings separated by \0, terminated with \0\0.
- */
-char *jsonnet_evaluate_snippet_stream(struct JsonnetVm *vm, const char *filename,
- const char *snippet, int *error);
-
-/** Complement of \see jsonnet_vm_make. */
-void jsonnet_destroy(struct JsonnetVm *vm);
-
-#endif // LIB_JSONNET_H
bindings/libjsonnet_test_file.cdiffbeforeafterboth--- a/bindings/libjsonnet_test_file.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2015 Google Inc. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#include "libjsonnet.h"
-
-int main(int argc, const char **argv)
-{
- int error;
- char *output;
- struct JsonnetVm *vm;
- if (argc != 2) {
- fprintf(stderr, "libjsonnet_test_file <file>\n");
- return EXIT_FAILURE;
- }
- vm = jsonnet_make();
- output = jsonnet_evaluate_file(vm, argv[1], &error);
- if (error) {
- fprintf(stderr, "%s", output);
- jsonnet_realloc(vm, output, 0);
- jsonnet_destroy(vm);
- return EXIT_FAILURE;
- }
- printf("%s", output);
- jsonnet_realloc(vm, output, 0);
- jsonnet_destroy(vm);
- return EXIT_SUCCESS;
-}