git.haldean.org expel / 298f70a
use new include path Haldean Brown 3 years ago
32 changed file(s) with 130 addition(s) and 130 deletion(s). Raw diff Collapse all Expand all
1616 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1717 */
1818
19 #include "expel/assert.h"
19 #include "ubik/assert.h"
2020
2121 int
2222 break_on_assert()
1616 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1717 */
1818
19 #include "expel/assert.h"
20 #include "expel/ast.h"
19 #include "ubik/assert.h"
20 #include "ubik/ast.h"
2121
2222 #include <stdlib.h>
2323 #include <string.h>
1616 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1717 */
1818
19 #include "expel/assert.h"
20 #include "expel/bdagc.h"
19 #include "ubik/assert.h"
20 #include "ubik/bdagc.h"
2121
2222 #include <stdlib.h>
2323 #include <string.h>
1818
1919 #include <string.h>
2020
21 #include "expel/assert.h"
22 #include "expel/ast.h"
23 #include "expel/closure.h"
24 #include "expel/resolve.h"
21 #include "ubik/assert.h"
22 #include "ubik/ast.h"
23 #include "ubik/closure.h"
24 #include "ubik/resolve.h"
2525
2626 /* A brief digression into the algorithm at play here.
2727 *
2121 #include <string.h>
2222 #include <unistd.h>
2323
24 #include "expel/compile.h"
25 #include "expel/gen.h"
26 #include "expel/parse.h"
27 #include "expel/resolve.h"
28 #include "expel/string.h"
29 #include "expel/util.h"
24 #include "ubik/compile.h"
25 #include "ubik/gen.h"
26 #include "ubik/parse.h"
27 #include "ubik/resolve.h"
28 #include "ubik/string.h"
29 #include "ubik/util.h"
3030
3131
3232 no_ignore xl_error
2020 #include <stdlib.h>
2121 #include <string.h>
2222
23 #include "expel/assert.h"
24 #include "expel/dagc.h"
25 #include "expel/expel.h"
26 #include "expel/util.h"
23 #include "ubik/assert.h"
24 #include "ubik/dagc.h"
25 #include "ubik/expel.h"
26 #include "ubik/util.h"
2727
2828 no_ignore xl_error
2929 xl_dagc_new(struct xl_dagc **graph, size_t n_nodes)
1919 #include <math.h>
2020 #include <string.h>
2121
22 #include "expel/assert.h"
23 #include "expel/expel.h"
24 #include "expel/env.h"
25 #include "expel/util.h"
22 #include "ubik/assert.h"
23 #include "ubik/expel.h"
24 #include "ubik/env.h"
25 #include "ubik/util.h"
2626
2727 #define ENV_MAX_LOAD 0.5
2828 #define ENV_INIT_CAP 8
1919 #include <stdio.h>
2020 #include <stdlib.h>
2121
22 #include "expel/expel.h"
23 #include "expel/util.h"
22 #include "ubik/expel.h"
23 #include "ubik/util.h"
2424
2525 xl_error
2626 xl_error_new(
1616 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1717 */
1818
19 #include "expel/assert.h"
20 #include "expel/dagc.h"
21 #include "expel/env.h"
22 #include "expel/expel.h"
23 #include "expel/types.h"
24 #include "expel/util.h"
25 #include "expel/value.h"
19 #include "ubik/assert.h"
20 #include "ubik/dagc.h"
21 #include "ubik/env.h"
22 #include "ubik/expel.h"
23 #include "ubik/types.h"
24 #include "ubik/util.h"
25 #include "ubik/value.h"
2626
2727 no_ignore static xl_error
2828 _eval_apply(struct xl_env *env, struct xl_dagc_apply *node)
2020 #include <stdio.h>
2121 #include <stdlib.h>
2222
23 #include "expel/dagc.h"
24 #include "expel/expel.h"
25 #include "expel/uri.h"
26 #include "expel/util.h"
23 #include "ubik/dagc.h"
24 #include "ubik/expel.h"
25 #include "ubik/uri.h"
26 #include "ubik/util.h"
2727
2828 char *
2929 xl_node_explain(struct xl_dagc_node *node)
2727 #include <stdlib.h>
2828 #include <string.h>
2929
30 #include "expel/assert.h"
31 #include "expel/dagc.h"
32 #include "expel/expel.h"
33 #include "expel/gc.h"
34 #include "expel/pointerset.h"
35 #include "expel/stream.h"
36 #include "expel/uri.h"
37 #include "expel/util.h"
38 #include "expel/vector.h"
39 #include "expel/value.h"
30 #include "ubik/assert.h"
31 #include "ubik/dagc.h"
32 #include "ubik/expel.h"
33 #include "ubik/gc.h"
34 #include "ubik/pointerset.h"
35 #include "ubik/stream.h"
36 #include "ubik/uri.h"
37 #include "ubik/util.h"
38 #include "ubik/vector.h"
39 #include "ubik/value.h"
4040
4141 static struct xl_gc_info *gc_stats;
4242
1616 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1717 */
1818
19 #include "expel/assert.h"
20 #include "expel/bdagc.h"
21 #include "expel/dagc.h"
22 #include "expel/env.h"
23 #include "expel/expel.h"
24 #include "expel/gen.h"
25 #include "expel/types.h"
26 #include "expel/uri.h"
27 #include "expel/util.h"
28 #include "expel/value.h"
19 #include "ubik/assert.h"
20 #include "ubik/bdagc.h"
21 #include "ubik/dagc.h"
22 #include "ubik/env.h"
23 #include "ubik/expel.h"
24 #include "ubik/gen.h"
25 #include "ubik/types.h"
26 #include "ubik/uri.h"
27 #include "ubik/util.h"
28 #include "ubik/value.h"
2929
3030 #include <stdlib.h>
3131 #include <string.h>
1818
1919 %{
2020
21 #include "expel/expel.h"
22 #include "expel/ast.h"
23 #include "expel/parse.h"
24 #include "expel/util.h"
21 #include "ubik/expel.h"
22 #include "ubik/ast.h"
23 #include "ubik/parse.h"
24 #include "ubik/util.h"
2525
2626 #include <stdio.h>
2727 #include <stdlib.h>
1616 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1717 */
1818
19 #include "expel/assert.h"
20 #include "expel/dagc.h"
21 #include "expel/env.h"
22 #include "expel/expel.h"
23 #include "expel/stream.h"
24 #include "expel/util.h"
19 #include "ubik/assert.h"
20 #include "ubik/dagc.h"
21 #include "ubik/env.h"
22 #include "ubik/expel.h"
23 #include "ubik/stream.h"
24 #include "ubik/util.h"
2525
2626 #include <arpa/inet.h>
2727 #include <stdlib.h>
1616 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1717 */
1818
19 #include "expel/assert.h"
20 #include "expel/dagc.h"
21 #include "expel/env.h"
22 #include "expel/expel.h"
23 #include "expel/natives.h"
24 #include "expel/types.h"
25 #include "expel/util.h"
26 #include "expel/value.h"
19 #include "ubik/assert.h"
20 #include "ubik/dagc.h"
21 #include "ubik/env.h"
22 #include "ubik/expel.h"
23 #include "ubik/natives.h"
24 #include "ubik/types.h"
25 #include "ubik/util.h"
26 #include "ubik/value.h"
2727
2828 #include <inttypes.h>
2929 #include <string.h>
135135 #define DEF_OP uadd
136136 #define DEF_OP_EVAL _native_unsigned_add
137137 #define DEF_OP_URI "uadd"
138 #include "expel/def-native.h"
138 #include "ubik/def-native.h"
139139
140140 static xl_error
141141 _native_unsigned_subtract(struct xl_env *env, struct xl_dagc *graph)
173173 #define DEF_ARG_TYPE xl_type_word
174174 #define DEF_OP_EVAL _native_unsigned_subtract
175175 #define DEF_OP_URI "usub"
176 #include "expel/def-native.h"
176 #include "ubik/def-native.h"
177177
178178 static xl_error
179179 _native_concat(struct xl_env *env, struct xl_dagc *graph)
225225 #define DEF_ARG_TYPE xl_type_string
226226 #define DEF_OP_EVAL _native_concat
227227 #define DEF_OP_URI "concat"
228 #include "expel/def-native.h"
228 #include "ubik/def-native.h"
229229
230230 static xl_error
231231 _native_emit(struct xl_env *env, struct xl_dagc *graph)
260260 #define DEF_ARG_TYPE xl_type_string
261261 #define DEF_OP_EVAL _native_emit
262262 #define DEF_OP_URI "emit"
263 #include "expel/def-native.h"
263 #include "ubik/def-native.h"
264264
265265 static xl_error
266266 _native_eq(struct xl_env *env, struct xl_dagc *graph)
334334 #define DEF_ARG_TYPE xl_type_word
335335 #define DEF_OP_EVAL _native_eq
336336 #define DEF_OP_URI "eq"
337 #include "expel/def-native.h"
337 #include "ubik/def-native.h"
338338
339339 no_ignore static xl_error
340340 _native_humanize_float(struct xl_env *env, struct xl_dagc *graph)
1717 */
1818
1919 #include <stdlib.h>
20 #include "expel/parse.h"
21 #include "expel/streamutil.h"
20 #include "ubik/parse.h"
21 #include "ubik/streamutil.h"
2222 #include "grammar.h"
2323
2424 /* autotools doesn't yet support flex headers, so we have to declare these
2121 #include <string.h>
2222 #include <stdlib.h>
2323
24 #include "expel/pointerset.h"
24 #include "ubik/pointerset.h"
2525
2626 no_ignore static xl_error
2727 _pointer_set_grow(struct xl_vector *set)
1616 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1717 */
1818
19 #include "expel/ast.h"
20 #include "expel/resolve.h"
19 #include "ubik/ast.h"
20 #include "ubik/resolve.h"
2121
2222 #include <inttypes.h>
2323 #include <stdio.h>
2020 #include <stdio.h>
2121 #include <string.h>
2222
23 #include "expel/ast.h"
24 #include "expel/closure.h"
25 #include "expel/env.h"
26 #include "expel/natives.h"
27 #include "expel/resolve.h"
28 #include "expel/streamutil.h"
29 #include "expel/util.h"
23 #include "ubik/ast.h"
24 #include "ubik/closure.h"
25 #include "ubik/env.h"
26 #include "ubik/natives.h"
27 #include "ubik/resolve.h"
28 #include "ubik/streamutil.h"
29 #include "ubik/util.h"
3030
3131 no_ignore xl_error
3232 assign_all_initial_scopes(
1616 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1717 */
1818
19 #include "expel/env.h"
20 #include "expel/expel.h"
21 #include "expel/gc.h"
22 #include "expel/natives.h"
19 #include "ubik/env.h"
20 #include "ubik/expel.h"
21 #include "ubik/gc.h"
22 #include "ubik/natives.h"
2323
2424 xl_error
2525 xl_start()
2020 #include <stdio.h>
2121 #include <stdlib.h>
2222
23 #include "expel/assert.h"
24 #include "expel/dagc.h"
25 #include "expel/env.h"
26 #include "expel/schedule.h"
27 #include "expel/util.h"
23 #include "ubik/assert.h"
24 #include "ubik/dagc.h"
25 #include "ubik/env.h"
26 #include "ubik/schedule.h"
27 #include "ubik/util.h"
2828
2929 struct xl_scheduler
3030 {
1616 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1717 */
1818
19 #include "expel/assert.h"
20 #include "expel/dagc.h"
21 #include "expel/expel.h"
22 #include "expel/pointerset.h"
23 #include "expel/stream.h"
24 #include "expel/uri.h"
25 #include "expel/util.h"
19 #include "ubik/assert.h"
20 #include "ubik/dagc.h"
21 #include "ubik/expel.h"
22 #include "ubik/pointerset.h"
23 #include "ubik/stream.h"
24 #include "ubik/uri.h"
25 #include "ubik/util.h"
2626
2727 #include <arpa/inet.h>
2828
2020 #include <stdlib.h>
2121 #include <string.h>
2222
23 #include "expel/stream.h"
24 #include "expel/util.h"
23 #include "ubik/stream.h"
24 #include "ubik/util.h"
2525
2626 /* Opens a stream for reading from the given file. */
2727 no_ignore xl_error
1717 */
1818
1919 #include <strings.h>
20 #include "expel/streamutil.h"
20 #include "ubik/streamutil.h"
2121
2222 #define GET_LINE_BUF_SIZE 1024
2323
1919 #include <stdlib.h>
2020 #include <string.h>
2121
22 #include "expel/string.h"
22 #include "ubik/string.h"
2323
2424
2525 no_ignore xl_error
1616 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1717 */
1818
19 #include "expel/expel.h"
19 #include "ubik/expel.h"
2020
2121 #include <stdlib.h>
2222 #include <time.h>
1818
1919 %{
2020
21 #include "expel/ast.h"
22 #include "expel/token.h"
23 #include "expel/parse.h"
21 #include "ubik/ast.h"
22 #include "ubik/token.h"
23 #include "ubik/parse.h"
2424 #include "grammar.h"
2525
2626 /* these are generated by generated code, and they're innocuous, so we
1616 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1717 */
1818
19 #include "expel/expel.h"
20 #include "expel/types.h"
21 #include "expel/value.h"
19 #include "ubik/expel.h"
20 #include "ubik/types.h"
21 #include "ubik/value.h"
2222
2323 #include <stdio.h>
2424 #include <stdlib.h>
1919 #include <stdio.h>
2020 #include <string.h>
2121
22 #include "expel/assert.h"
23 #include "expel/expel.h"
24 #include "expel/uri.h"
25 #include "expel/value.h"
22 #include "ubik/assert.h"
23 #include "ubik/expel.h"
24 #include "ubik/uri.h"
25 #include "ubik/value.h"
2626
2727 no_ignore static xl_error
2828 _set_hash(struct xl_uri *uri)
1616 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1717 */
1818
19 #include "expel/expel.h"
20 #include "expel/util.h"
19 #include "ubik/expel.h"
20 #include "ubik/util.h"
2121
2222 #include <arpa/inet.h>
2323 #include <execinfo.h>
2222 #include <stdlib.h>
2323 #include <string.h>
2424
25 #include "expel/expel.h"
26 #include "expel/stream.h"
27 #include "expel/util.h"
28 #include "expel/value.h"
25 #include "ubik/expel.h"
26 #include "ubik/stream.h"
27 #include "ubik/util.h"
28 #include "ubik/value.h"
2929
3030 bool
3131 xl_value_eq(struct xl_value *v1, struct xl_value *v2)
1818
1919 #include <stdlib.h>
2020 #include <strings.h>
21 #include "expel/util.h"
22 #include "expel/vector.h"
21 #include "ubik/util.h"
22 #include "ubik/vector.h"
2323
2424 no_ignore xl_error
2525 xl_vector_ensure_size(struct xl_vector *v, size_t size)