Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Sync libucl with upstream
Baptiste Daroussin committed 11 years ago
commit 7aa254b458942a889c573e7051dfd33cda5bf1a0
parent 4450622
13 files changed +210 -54
added external/libucl/ChangeLog.md
@@ -0,0 +1,6 @@
+
# Version history
+

+
## Libucl 0.5
+

+
- Streamline emitter has been added, so it is now possible to output partial `ucl` objects
+
- Emitter now is more flexible due to emitter_context structure
modified external/libucl/configure.ac
@@ -1,7 +1,7 @@
m4_define([maj_ver], [0])
-
m4_define([med_ver], [4])
-
m4_define([min_ver], [1])
-
m4_define([so_version], [1:0:0])
+
m4_define([med_ver], [5])
+
m4_define([min_ver], [0])
+
m4_define([so_version], [2:0:0])
m4_define([ucl_version], [maj_ver.med_ver.min_ver])

AC_INIT([libucl],[ucl_version],[https://github.com/vstakhov/libucl],[libucl])
modified external/libucl/doc/api.md
@@ -52,15 +52,15 @@ Used to parse `ucl` files and provide interface to extract `ucl` object. Current
### Emitting functions
Convert `ucl` objects to some textual or binary representation. Currently, libucl supports the following exports:

-
- `JSON` - valid json format (can possibly loose some original data, such as implicit arrays)
-
- `Config` - human-readable configuration format (losseless)
+
- `JSON` - valid json format (can possibly lose some original data, such as implicit arrays)
+
- `Config` - human-readable configuration format (lossless)
- `YAML` - embedded yaml format (has the same limitations as `json` output)

### Conversion functions
Help to convert `ucl` objects to C types. These functions are used to convert `ucl_object_t` to C primitive types, such as numbers, strings or boolean values.

### Generation functions
-
Allow creating of `ucl` objects from C types and creating of complex `ucl` objects, such as hashes or arrays from primitive `ucl` objects, such as numbers or strings.
+
Allow creation of `ucl` objects from C types and creating of complex `ucl` objects, such as hashes or arrays from primitive `ucl` objects, such as numbers or strings.

### Iteration functions
Iterate over `ucl` complex objects or over a chain of values, for example when a key in an object has multiple values (that can be treated as implicit array or implicit consolidation).
@@ -148,7 +148,7 @@ bool ucl_parser_add_file (struct ucl_parser *parser,
    const char *filename);
~~~

-
Load file `filename` and parse it with the specified `parser`. This function uses `mmap` call to load file, therefore, it should not be `shrinked` during parsing. Otherwise, `libucl` can cause memory corruption and terminate the calling application. This function is also used by the internal handler of `include` macro, hence, this macro has the same limitation.
+
Load file `filename` and parse it with the specified `parser`. This function uses `mmap` call to load file, therefore, it should not be `shrunk` during parsing. Otherwise, `libucl` can cause memory corruption and terminate the calling application. This function is also used by the internal handler of `include` macro, hence, this macro has the same limitation.

### ucl_parser_get_object

@@ -225,7 +225,7 @@ ucl_parser_add_chunk (parser, inbuf, r);
fclose (in);

if (ucl_parser_get_error (parser)) {
-
	printf ("Error occured: %s\n", ucl_parser_get_error (parser));
+
	printf ("Error occurred: %s\n", ucl_parser_get_error (parser));
	ret = 1;
}
else {
@@ -251,7 +251,7 @@ Libucl can transform UCL objects to a number of tectual formats:
- compact yaml: `UCL_EMIT_YAML` - compact YAML output

Moreover, libucl API allows to select a custom set of emitting functions allowing 
-
efficent and zero-copy output of libucl objects. Libucl uses the following structure to support this feature:
+
efficient and zero-copy output of libucl objects. Libucl uses the following structure to support this feature:

~~~C
struct ucl_emitter_functions {
@@ -298,12 +298,12 @@ This function is similar to the previous with the exception that it accepts the

# Conversion functions

-
Conversion functions are used to convert UCL objects to primitive types, such as strings, numbers or boolean values. There are two types of conversion functions:
+
Conversion functions are used to convert UCL objects to primitive types, such as strings, numbers, or boolean values. There are two types of conversion functions:

- safe: try to convert an ucl object to a primitive type and fail if such a conversion is not possible
- unsafe: return primitive type without additional checks, if the object cannot be converted then some reasonable default is returned (NULL for strings and 0 for numbers)

-
Also there is a single `ucl_object_tostring_forced` function that converts any UCL object (including compound types - arrays and objects) to a string representation. For compound and numeric types this function performs emitting to a compact json format actually.
+
Also there is a single `ucl_object_tostring_forced` function that converts any UCL object (including compound types - arrays and objects) to a string representation. For objects, arrays, booleans and numeric types this function performs emitting to a compact json format actually.

Here is a list of all conversion functions:

@@ -311,14 +311,14 @@ Here is a list of all conversion functions:
- `ucl_object_todouble` - returns `double` of UCL object
- `ucl_object_toboolean` - returns `bool` of UCL object
- `ucl_object_tostring` - returns `const char *` of UCL object (this string is NULL terminated)
-
- `ucl_object_tolstring` - returns `const char *` and `size_t` len of UCL object (string can be not NULL terminated)
+
- `ucl_object_tolstring` - returns `const char *` and `size_t` len of UCL object (string does not need to be NULL terminated)
- `ucl_object_tostring_forced` - returns string representation of any UCL object

Strings returned by these pointers are associated with the UCL object and exist over its lifetime. A caller should not free this memory.

# Generation functions

-
It is possible to generate UCL objects from C primitive types. Moreover, libucl permits to create and modify complex UCL objects, such as arrays or associative objects. 
+
It is possible to generate UCL objects from C primitive types. Moreover, libucl allows creation and modifying complex UCL objects, such as arrays or associative objects. 

## ucl_object_new
~~~C
@@ -350,8 +350,8 @@ Libucl provides the functions similar to inverse conversion functions called wit
- `ucl_object_fromint` - converts `int64_t` to UCL object
- `ucl_object_fromdouble` - converts `double` to UCL object
- `ucl_object_fromboolean` - converts `bool` to UCL object
-
- `ucl_object_fromstring` - converts `const char *` to UCL object (this string is NULL terminated)
-
- `ucl_object_fromlstring` - converts `const char *` and `size_t` len to UCL object (string can be not NULL terminated)
+
- `ucl_object_fromstring` - converts `const char *` to UCL object (this string should be NULL terminated)
+
- `ucl_object_fromlstring` - converts `const char *` and `size_t` len to UCL object (string does not need to be NULL terminated)

Also there is a function to generate UCL object from a string performing various parsing or conversion operations called `ucl_object_fromstring_common`.

@@ -361,7 +361,7 @@ ucl_object_t * ucl_object_fromstring_common (const char *str,
	size_t len, enum ucl_string_flags flags)
~~~

-
This function is used to convert a string `str` of size `len` to an UCL objects applying `flags` conversions. If `len` is equal to zero then a `str` is assumed as NULL-terminated. This function supports the following flags (a set of flags can be specified using logical `OR` operation):
+
This function is used to convert a string `str` of size `len` to a UCL object applying `flags` conversions. If `len` is equal to zero then a `str` is assumed as NULL-terminated. This function supports the following flags (a set of flags can be specified using logical `OR` operation):

- `UCL_STRING_ESCAPE` - perform JSON escape
- `UCL_STRING_TRIM` - trim leading and trailing whitespaces
@@ -385,7 +385,7 @@ const ucl_object_t* ucl_iterate_object (const ucl_object_t *obj,
	ucl_object_iter_t *iter, bool expand_values);
~~~

-
This function accept opaque iterator pointer `iter`. In the first call this iterator *must* be initialized to `NULL`. Iterator is changed by this function call. `ucl_iterate_object` returns the next UCL object in the compound object `obj` or `NULL` if all objects have been iterated. The reference count of the object returned is not increased, so a caller should not unref the object or modify its content (e.g. by inserting to another compound object). The object `obj` should not be changed during the iteration process as well. `expand_values` flag speicifies whether `ucl_iterate_object` should expand keys with multiple values. The general rule is that if you need to iterate throught the *object* or *explicit array*, then you always need to set this flag to `true`. However, if you get some key in the object and want to extract all its values then you should set `expand_values` to `false`. Mixing of iteration types are not permitted since the iterator is set according to the iteration type and cannot be reused. Here is an example of iteration over the objects using libucl API (assuming that `top` is `UCL_OBJECT` in this example):
+
This function accepts opaque iterator pointer `iter`. In the first call this iterator *must* be initialized to `NULL`. Iterator is changed by this function call. `ucl_iterate_object` returns the next UCL object in the compound object `obj` or `NULL` if all objects have been iterated. The reference count of the object returned is not increased, so a caller should not unref the object or modify its content (e.g. by inserting to another compound object). The object `obj` should not be changed during the iteration process as well. `expand_values` flag speicifies whether `ucl_iterate_object` should expand keys with multiple values. The general rule is that if you need to iterate through the *object* or *explicit array*, then you always need to set this flag to `true`. However, if you get some key in the object and want to extract all its values then you should set `expand_values` to `false`. Mixing of iteration types is not permitted since the iterator is set according to the iteration type and cannot be reused. Here is an example of iteration over the objects using libucl API (assuming that `top` is `UCL_OBJECT` in this example):

~~~C
ucl_object_iter_t it = NULL, it_obj = NULL;
@@ -412,13 +412,13 @@ bool ucl_object_validate (const ucl_object_t *schema,
	const ucl_object_t *obj, struct ucl_schema_error *err);
~~~

-
This function uses ucl object `schema`, that must be valid in terms of `json-schema` draft v4, to validate input object `obj`. If this function returns `true` then validation procedure has been succeed. Otherwise, `false` is returned and `err` is set to a specific value. If caller set `err` to NULL then this function does not set any error just returning `false`. Error is the structure defined as following:
+
This function uses ucl object `schema`, that must be valid in terms of `json-schema` draft v4, to validate input object `obj`. If this function returns `true` then validation procedure has been succeed. Otherwise, `false` is returned and `err` is set to a specific value. If a caller sets `err` to NULL then this function does not set any error just returning `false`. Error is the structure defined as following:

~~~C
struct ucl_schema_error {
	enum ucl_schema_error_code code;	/* error code */
	char msg[128];				/* error message */
-
	ucl_object_t *obj;			/* object where error occured */
+
	ucl_object_t *obj;			/* object where error occurred */
};
~~~

@@ -436,4 +436,4 @@ enum ucl_schema_error_code {
};
~~~

-
`msg` is a stiring description of an error and `obj` is an object where error has been occurred. Error object is not allocated by libucl, so there is no need to free it after validation (a static object should thus be used).

\ No newline at end of file
+
`msg` is a string description of an error and `obj` is an object where error has occurred. Error object is not allocated by libucl, so there is no need to free it after validation (a static object should thus be used).
modified external/libucl/doc/libucl.3
@@ -1,4 +1,4 @@
-
.TH LIBUCL 5 "March 20, 2014" "Libucl manual"
+
.TH "LIBUCL" "3" "July 26, 2014" "Libucl manual" ""
.SH NAME
.PP
\f[B]ucl_parser_new\f[], \f[B]ucl_parser_register_macro\f[],
@@ -32,10 +32,10 @@ In future, this limitation can be removed.
Convert \f[C]ucl\f[] objects to some textual or binary representation.
Currently, libucl supports the following exports:
.IP \[bu] 2
-
\f[C]JSON\f[] \- valid json format (can possibly loose some original
+
\f[C]JSON\f[] \- valid json format (can possibly lose some original
data, such as implicit arrays)
.IP \[bu] 2
-
\f[C]Config\f[] \- human\-readable configuration format (losseless)
+
\f[C]Config\f[] \- human\-readable configuration format (lossless)
.IP \[bu] 2
\f[C]YAML\f[] \- embedded yaml format (has the same limitations as
\f[C]json\f[] output)
@@ -46,7 +46,7 @@ These functions are used to convert \f[C]ucl_object_t\f[] to C primitive
types, such as numbers, strings or boolean values.
.SS Generation functions
.PP
-
Allow creating of \f[C]ucl\f[] objects from C types and creating of
+
Allow creation of \f[C]ucl\f[] objects from C types and creating of
complex \f[C]ucl\f[] objects, such as hashes or arrays from primitive
\f[C]ucl\f[] objects, such as numbers or strings.
.SS Iteration functions
@@ -175,7 +175,7 @@ bool\ ucl_parser_add_file\ (struct\ ucl_parser\ *parser,\
Load file \f[C]filename\f[] and parse it with the specified
\f[C]parser\f[].
This function uses \f[C]mmap\f[] call to load file, therefore, it should
-
not be \f[C]shrinked\f[] during parsing.
+
not be \f[C]shrunk\f[] during parsing.
Otherwise, \f[C]libucl\f[] can cause memory corruption and terminate the
calling application.
This function is also used by the internal handler of \f[C]include\f[]
@@ -290,7 +290,7 @@ ucl_parser_add_chunk\ (parser,\ inbuf,\ r);
fclose\ (in);

if\ (ucl_parser_get_error\ (parser))\ {
-
\ \ \ \ printf\ ("Error\ occured:\ %s\\n",\ ucl_parser_get_error\ (parser));
+
\ \ \ \ printf\ ("Error\ occurred:\ %s\\n",\ ucl_parser_get_error\ (parser));
\ \ \ \ ret\ =\ 1;
}
else\ {
@@ -323,7 +323,7 @@ newlines and spaces
compact yaml: \f[C]UCL_EMIT_YAML\f[] \- compact YAML output
.PP
Moreover, libucl API allows to select a custom set of emitting functions
-
allowing efficent and zero\-copy output of libucl objects.
+
allowing efficient and zero\-copy output of libucl objects.
Libucl uses the following structure to support this feature:
.IP
.nf
@@ -390,7 +390,7 @@ emitters (including C++ ones, for example).
.SH CONVERSION FUNCTIONS
.PP
Conversion functions are used to convert UCL objects to primitive types,
-
such as strings, numbers or boolean values.
+
such as strings, numbers, or boolean values.
There are two types of conversion functions:
.IP \[bu] 2
safe: try to convert an ucl object to a primitive type and fail if such
@@ -403,8 +403,8 @@ strings and 0 for numbers)
Also there is a single \f[C]ucl_object_tostring_forced\f[] function that
converts any UCL object (including compound types \- arrays and objects)
to a string representation.
-
For compound and numeric types this function performs emitting to a
-
compact json format actually.
+
For objects, arrays, booleans and numeric types this function performs
+
emitting to a compact json format actually.
.PP
Here is a list of all conversion functions:
.IP \[bu] 2
@@ -418,7 +418,8 @@ Here is a list of all conversion functions:
object (this string is NULL terminated)
.IP \[bu] 2
\f[C]ucl_object_tolstring\f[] \- returns \f[C]const\ char\ *\f[] and
-
\f[C]size_t\f[] len of UCL object (string can be not NULL terminated)
+
\f[C]size_t\f[] len of UCL object (string does not need to be NULL
+
terminated)
.IP \[bu] 2
\f[C]ucl_object_tostring_forced\f[] \- returns string representation of
any UCL object
@@ -429,7 +430,7 @@ A caller should not free this memory.
.SH GENERATION FUNCTIONS
.PP
It is possible to generate UCL objects from C primitive types.
-
Moreover, libucl permits to create and modify complex UCL objects, such
+
Moreover, libucl allows creation and modifying complex UCL objects, such
as arrays or associative objects.
.SS ucl_object_new
.IP
@@ -467,10 +468,10 @@ converts \f[C]int64_t\f[] to UCL object \-
\f[C]ucl_object_fromdouble\f[] \- converts \f[C]double\f[] to UCL object
\- \f[C]ucl_object_fromboolean\f[] \- converts \f[C]bool\f[] to UCL
object \- \f[C]ucl_object_fromstring\f[] \- converts
-
\f[C]const\ char\ *\f[] to UCL object (this string is NULL terminated)
-
\- \f[C]ucl_object_fromlstring\f[] \- converts \f[C]const\ char\ *\f[]
-
and \f[C]size_t\f[] len to UCL object (string can be not NULL
-
terminated)
+
\f[C]const\ char\ *\f[] to UCL object (this string should be NULL
+
terminated) \- \f[C]ucl_object_fromlstring\f[] \- converts
+
\f[C]const\ char\ *\f[] and \f[C]size_t\f[] len to UCL object (string
+
does not need to be NULL terminated)
.PP
Also there is a function to generate UCL object from a string performing
various parsing or conversion operations called
@@ -485,7 +486,7 @@ ucl_object_t\ *\ ucl_object_fromstring_common\ (const\ char\ *str,\
.fi
.PP
This function is used to convert a string \f[C]str\f[] of size
-
\f[C]len\f[] to an UCL objects applying \f[C]flags\f[] conversions.
+
\f[C]len\f[] to a UCL object applying \f[C]flags\f[] conversions.
If \f[C]len\f[] is equal to zero then a \f[C]str\f[] is assumed as
NULL\-terminated.
This function supports the following flags (a set of flags can be
@@ -538,7 +539,7 @@ const\ ucl_object_t*\ ucl_iterate_object\ (const\ ucl_object_t\ *obj,\
\f[]
.fi
.PP
-
This function accept opaque iterator pointer \f[C]iter\f[].
+
This function accepts opaque iterator pointer \f[C]iter\f[].
In the first call this iterator \f[I]must\f[] be initialized to
\f[C]NULL\f[].
Iterator is changed by this function call.
@@ -551,12 +552,12 @@ The object \f[C]obj\f[] should not be changed during the iteration
process as well.
\f[C]expand_values\f[] flag speicifies whether
\f[C]ucl_iterate_object\f[] should expand keys with multiple values.
-
The general rule is that if you need to iterate throught the
+
The general rule is that if you need to iterate through the
\f[I]object\f[] or \f[I]explicit array\f[], then you always need to set
this flag to \f[C]true\f[].
However, if you get some key in the object and want to extract all its
values then you should set \f[C]expand_values\f[] to \f[C]false\f[].
-
Mixing of iteration types are not permitted since the iterator is set
+
Mixing of iteration types is not permitted since the iterator is set
according to the iteration type and cannot be reused.
Here is an example of iteration over the objects using libucl API
(assuming that \f[C]top\f[] is \f[C]UCL_OBJECT\f[] in this example):
@@ -599,8 +600,8 @@ If this function returns \f[C]true\f[] then validation procedure has
been succeed.
Otherwise, \f[C]false\f[] is returned and \f[C]err\f[] is set to a
specific value.
-
If caller set \f[C]err\f[] to NULL then this function does not set any
-
error just returning \f[C]false\f[].
+
If a caller sets \f[C]err\f[] to NULL then this function does not set
+
any error just returning \f[C]false\f[].
Error is the structure defined as following:
.IP
.nf
@@ -608,7 +609,7 @@ Error is the structure defined as following:
struct\ ucl_schema_error\ {
\ \ \ \ enum\ ucl_schema_error_code\ code;\ \ \ \ /*\ error\ code\ */
\ \ \ \ char\ msg[128];\ \ \ \ \ \ \ \ \ \ \ \ \ \ /*\ error\ message\ */
-
\ \ \ \ ucl_object_t\ *obj;\ \ \ \ \ \ \ \ \ \ /*\ object\ where\ error\ occured\ */
+
\ \ \ \ ucl_object_t\ *obj;\ \ \ \ \ \ \ \ \ \ /*\ object\ where\ error\ occurred\ */
};
\f[]
.fi
@@ -629,8 +630,8 @@ enum\ ucl_schema_error_code\ {
\f[]
.fi
.PP
-
\f[C]msg\f[] is a stiring description of an error and \f[C]obj\f[] is an
-
object where error has been occurred.
+
\f[C]msg\f[] is a string description of an error and \f[C]obj\f[] is an
+
object where error has occurred.
Error object is not allocated by libucl, so there is no need to free it
after validation (a static object should thus be used).
.SH AUTHORS
modified external/libucl/doc/pandoc.template
@@ -1,6 +1,6 @@
-
% LIBUCL(5) Libucl manual
+
% LIBUCL(3) Libucl manual
% Vsevolod Stakhov <vsevolod@highsecure.ru>
-
% March 20, 2014
+
% July 26, 2014

# Name

modified external/libucl/src/ucl_parser.c
@@ -1661,6 +1661,11 @@ ucl_state_machine (struct ucl_parser *parser)
				return false;
			}
			else {
+
				/* Skip any spaces */
+
				while (p < chunk->end && ucl_test_character (*p,
+
						UCL_CHARACTER_WHITESPACE_UNSAFE)) {
+
					ucl_chunk_skipc (chunk, p);
+
				}
				p = chunk->pos;
				if (*p == '[') {
					parser->state = UCL_STATE_VALUE;
modified external/libucl/tests/Makefile.am
@@ -3,7 +3,8 @@ EXTRA_DIST = $(TESTS) basic schema generate.res rcl_test.json.xz
TESTS = basic.test \
		generate.test \
		schema.test \
-
		speed.test
+
		speed.test \
+
		streamline.test
TESTS_ENVIRONMENT = $(SH) \
			TEST_DIR=$(top_srcdir)/tests \
			TEST_OUT_DIR=$(top_builddir)/tests \
@@ -30,4 +31,8 @@ test_schema_SOURCES = test_schema.c
test_schema_LDADD = $(common_test_ldadd)
test_schema_CFLAGS = $(common_test_cflags)

-
check_PROGRAMS = test_basic test_speed test_generate test_schema

\ No newline at end of file
+
test_streamline_SOURCES = test_streamline.c
+
test_streamline_LDADD = $(common_test_ldadd)
+
test_streamline_CFLAGS = $(common_test_cflags)
+

+
check_PROGRAMS = test_basic test_speed test_generate test_schema test_streamline

\ No newline at end of file
added external/libucl/tests/basic/11.in
@@ -0,0 +1,3 @@
+

+

+
   {"key": "value"}
added external/libucl/tests/basic/11.res
@@ -0,0 +1,2 @@
+
key = "value";
+

added external/libucl/tests/streamline.res
@@ -0,0 +1,8 @@
+
key1 = "test string";
+
key2 = "test \\nstring";
+
key3 = "  test string    \n";
+
key4 [
+
    10,
+
    10.100000,
+
    9.999000,
+
]
added external/libucl/tests/streamline.test
@@ -0,0 +1,12 @@
+
#!/bin/sh
+

+
PROG=${TEST_BINARY_DIR}/test_streamline
+

+
$PROG ${TEST_OUT_DIR}/streamline.out
+
diff -s ${TEST_OUT_DIR}/streamline.out ${TEST_DIR}/streamline.res -u 2>/dev/null
+
if [ $? -ne 0 ] ; then
+
	rm ${TEST_OUT_DIR}/streamline.out
+
	echo "Test: streamline.res output missmatch"
+
	exit 1
+
fi
+
rm ${TEST_OUT_DIR}/streamline.out

\ No newline at end of file
modified external/libucl/tests/test_basic.c
@@ -33,15 +33,21 @@ main (int argc, char **argv)
	FILE *in, *out;
	unsigned char *emitted = NULL;
	const char *fname_in = NULL, *fname_out = NULL;
-
	int ret = 0, inlen, opt, json = 0;
+
	int ret = 0, inlen, opt, json = 0, compact = 0, yaml = 0;

-
	while ((opt = getopt(argc, argv, "j")) != -1) {
+
	while ((opt = getopt(argc, argv, "jcy")) != -1) {
		switch (opt) {
		case 'j':
			json = 1;
			break;
+
		case 'c':
+
			compact = 1;
+
			break;
+
		case 'y':
+
			yaml = 1;
+
			break;
		default: /* '?' */
-
			fprintf (stderr, "Usage: %s [-j] [in] [out]\n",
+
			fprintf (stderr, "Usage: %s [-jcy] [in] [out]\n",
					argv[0]);
			exit (EXIT_FAILURE);
		}
@@ -104,7 +110,15 @@ main (int argc, char **argv)
	}
	obj = ucl_parser_get_object (parser);
	if (json) {
-
		emitted = ucl_object_emit (obj, UCL_EMIT_JSON);
+
		if (compact) {
+
			emitted = ucl_object_emit (obj, UCL_EMIT_JSON_COMPACT);
+
		}
+
		else {
+
			emitted = ucl_object_emit (obj, UCL_EMIT_JSON);
+
		}
+
	}
+
	else if (yaml) {
+
		emitted = ucl_object_emit (obj, UCL_EMIT_YAML);
	}
	else {
		emitted = ucl_object_emit (obj, UCL_EMIT_CONFIG);
@@ -125,7 +139,15 @@ main (int argc, char **argv)
	}
	obj = ucl_parser_get_object (parser2);
	if (json) {
-
		emitted = ucl_object_emit (obj, UCL_EMIT_JSON);
+
		if (compact) {
+
			emitted = ucl_object_emit (obj, UCL_EMIT_JSON_COMPACT);
+
		}
+
		else {
+
			emitted = ucl_object_emit (obj, UCL_EMIT_JSON);
+
		}
+
	}
+
	else if (yaml) {
+
		emitted = ucl_object_emit (obj, UCL_EMIT_YAML);
	}
	else {
		emitted = ucl_object_emit (obj, UCL_EMIT_CONFIG);
added external/libucl/tests/test_streamline.c
@@ -0,0 +1,92 @@
+
/* Copyright (c) 2013, Vsevolod Stakhov
+
 * All rights reserved.
+
 *
+
 * Redistribution and use in source and binary forms, with or without
+
 * modification, are permitted provided that the following conditions are met:
+
 *       * Redistributions of source code must retain the above copyright
+
 *         notice, this list of conditions and the following disclaimer.
+
 *       * Redistributions in binary form must reproduce the above copyright
+
 *         notice, this list of conditions and the following disclaimer in the
+
 *         documentation and/or other materials provided with the distribution.
+
 *
+
 * THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY
+
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+
 * DISCLAIMED. IN NO EVENT SHALL AUTHOR BE LIABLE FOR ANY
+
 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 */
+

+
#include <stdio.h>
+
#include <errno.h>
+
#include <assert.h>
+
#include "ucl.h"
+

+
int
+
main (int argc, char **argv)
+
{
+
	ucl_object_t *obj, *cur, *ar;
+
	FILE *out;
+
	const char *fname_out = NULL;
+
	struct ucl_emitter_context *ctx;
+
	struct ucl_emitter_functions *f;
+
	int ret = 0;
+

+
	switch (argc) {
+
	case 2:
+
		fname_out = argv[1];
+
		break;
+
	}
+

+
	if (fname_out != NULL) {
+
		out = fopen (fname_out, "w");
+
		if (out == NULL) {
+
			exit (-errno);
+
		}
+
	}
+
	else {
+
		out = stdout;
+
	}
+

+
	obj = ucl_object_typed_new (UCL_OBJECT);
+

+
	/* Create some strings */
+
	cur = ucl_object_fromstring_common ("  test string    ", 0, UCL_STRING_TRIM);
+
	ucl_object_insert_key (obj, cur, "key1", 0, false);
+
	cur = ucl_object_fromstring_common ("  test \nstring\n    ", 0, UCL_STRING_TRIM | UCL_STRING_ESCAPE);
+
	ucl_object_insert_key (obj, cur, "key2", 0, false);
+
	cur = ucl_object_fromstring_common ("  test string    \n", 0, 0);
+
	ucl_object_insert_key (obj, cur, "key3", 0, false);
+

+
	f = ucl_object_emit_file_funcs (out);
+
	ctx = ucl_object_emit_streamline_new (obj, UCL_EMIT_CONFIG, f);
+

+
	assert (ctx != NULL);
+

+
	/* Array of numbers */
+
	ar = ucl_object_typed_new (UCL_ARRAY);
+
	ar->key = "key4";
+
	ar->keylen = sizeof ("key4") - 1;
+

+
	ucl_object_emit_streamline_start_container (ctx, ar);
+
	cur = ucl_object_fromint (10);
+
	ucl_object_emit_streamline_add_object (ctx, cur);
+
	cur = ucl_object_fromdouble (10.1);
+
	ucl_object_emit_streamline_add_object (ctx, cur);
+
	cur = ucl_object_fromdouble (9.999);
+
	ucl_object_emit_streamline_add_object (ctx, cur);
+

+

+
	ucl_object_emit_streamline_end_container (ctx);
+
	ucl_object_emit_streamline_finish (ctx);
+
	ucl_object_emit_funcs_free (f);
+
	ucl_object_unref (obj);
+

+
	fclose (out);
+

+
	return ret;
+
}