bshell: re-organise build into three separate components

bshell: the front-end binary
bshell.runtime: contains the parser, compiler, and classes needed to run bshell scripts
bshell.core: contains the builtin commandlets and aliases

CMakeLists.txt

@@ -17,34 +17,8 @@ execute_process(
 	COMMAND ${Python_EXECUTABLE}
 		${CMAKE_CURRENT_SOURCE_DIR}/tools/build-id.py
 	OUTPUT_VARIABLE bshell_version)
-
-set(source_dirs
-	ast compile parse parse/lex parse/syntax
-	runtime format command cmdlets aliases)
-
-if (bshell_interactive EQUAL 1)
-	message(STATUS "Interactive support: Enabled")
-	set(source_dirs ${source_dirs} line-ed)
-else ()
-	message(STATUS "Interactive support: Disabled")
-endif ()
-
-file(GLOB bshell_sources
-	bshell/*.c
-	bshell/*.h)
-
-foreach (d ${source_dirs})
-	file(GLOB sources
-		bshell/${d}/*.c
-		bshell/${d}/*.h)
-	set(bshell_sources ${bshell_sources} ${sources})
-endforeach (d)
-
 message(STATUS "B Shell version: ${bshell_version}")
 
-add_executable(bshell ${bshell_sources})
+add_subdirectory(bshell)
-
+add_subdirectory(bshell.runtime)
-target_link_libraries(bshell FX::Runtime FX::Collections FX::Term)
+add_subdirectory(bshell.core)
-target_compile_definitions(bshell PUBLIC
-	BSHELL_VERSION="${bshell_version}"
-	BSHELL_INTERACTIVE=${bshell_interactive})

bshell.core/CMakeLists.txt

@@ -0,0 +1,20 @@
+set(source_dirs aliases cmdlets)
+
+file(GLOB sources
+	*.c
+	*.h)
+
+foreach (d ${source_dirs})
+	file(GLOB d_sources
+		${d}/*.c
+		${d}/*.h)
+	set(sources ${sources} ${d_sources})
+endforeach (d)
+
+message(STATUS ${sources})
+add_library(bshell.core SHARED ${sources})
+
+target_link_libraries(bshell.core bshell.runtime FX::Runtime FX::Collections FX::Term)
+target_include_directories(bshell.core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
+target_compile_definitions(bshell.core PUBLIC
+	BSHELL_VERSION="${bshell_version}")

bshell.core/aliases/echo.c

@@ -1,6 +1,5 @@
-#include "../command/alias.h"
+#include <bshell/command/alias.h>
-#include "../command/command.h"
+#include <bshell/command/command.h>
-
 #include <fx/reflection/function.h>
 #include <fx/string.h>
 #include <fx/vector.h>

bshell.core/aliases/percent.c

@@ -1,6 +1,5 @@
-#include "../command/alias.h"
+#include <bshell/command/alias.h>
-#include "../command/command.h"
+#include <bshell/command/command.h>
-
 #include <fx/reflection/function.h>
 #include <fx/string.h>
 #include <fx/vector.h>

bshell.core/assembly.c

@@ -0,0 +1,22 @@
+#include <fx/macros.h>
+#include <fx/reflection/assembly.h>
+
+FX_ASSEMBLY_BEGIN(bshell_core)
+	FX_ASSEMBLY_NAME("bshell.core");
+	FX_ASSEMBLY_VERSION(0, 1, 0, 0);
+	FX_ASSEMBLY_EXPORT_TYPE("bshell.core", "get_verb", bshell_get_verb);
+	FX_ASSEMBLY_EXPORT_TYPE(
+		"bshell.core",
+		"write_output",
+		bshell_write_output);
+	FX_ASSEMBLY_EXPORT_TYPE(
+		"bshell.core",
+		"foreach_object",
+		bshell_foreach_object);
+	FX_ASSEMBLY_EXPORT_TYPE(
+		"bshell.core",
+		"get_command",
+		bshell_get_command);
+	FX_ASSEMBLY_EXPORT_TYPE("bshell.core", "percent", bshell_percent);
+	FX_ASSEMBLY_EXPORT_TYPE("bshell.core", "echo", bshell_echo);
+FX_ASSEMBLY_END(bshell_core)

bshell.core/cmdlets/foreach-object.c

@@ -1,10 +1,9 @@
-#include "../command/cmdlet.h"
+#include <bshell/command/cmdlet.h>
-#include "../command/command.h"
+#include <bshell/command/command.h>
-#include "../runtime/pipeline.h"
+#include <bshell/runtime/pipeline.h>
-#include "../runtime/runtime.h"
+#include <bshell/runtime/runtime.h>
-#include "../script-block.h"
+#include <bshell/runtime/script-block.h>
-#include "../status.h"
+#include <bshell/status.h>
-
 #include <fx/reflection/function.h>
 #include <fx/string.h>
 #include <fx/vector.h>
@@ -24,9 +23,8 @@ struct bshell_foreach_object_p {
 
 static enum bshell_status begin_processing(bshell_cmdlet *cmdlet)
 {
-	struct bshell_foreach_object_p *p = fx_object_get_private(
+	struct bshell_foreach_object_p *p
-		cmdlet,
+		= fx_object_get_private(cmdlet, BSHELL_TYPE_FOREACH_OBJECT);
-		BSHELL_TYPE_FOREACH_OBJECT);
 
 	const fx_value *block_v = bshell_command_get_arg(cmdlet, 1);
 	if (!block_v) {
@@ -42,9 +40,8 @@ static enum bshell_status process_record(
 	bshell_pipeline *pipeline,
 	struct bshell_runtime *rt)
 {
-	struct bshell_foreach_object_p *p = fx_object_get_private(
+	struct bshell_foreach_object_p *p
-		cmdlet,
+		= fx_object_get_private(cmdlet, BSHELL_TYPE_FOREACH_OBJECT);
-		BSHELL_TYPE_FOREACH_OBJECT);
 
 	fx_value in = bshell_pipeline_read_value(pipeline);
 	if (!fx_value_is_set(&in)) {
@@ -65,9 +62,8 @@ static enum bshell_status process_record(
 
 static enum bshell_status end_processing(bshell_cmdlet *cmdlet)
 {
-	struct bshell_foreach_object_p *p = fx_object_get_private(
+	struct bshell_foreach_object_p *p
-		cmdlet,
+		= fx_object_get_private(cmdlet, BSHELL_TYPE_FOREACH_OBJECT);
-		BSHELL_TYPE_FOREACH_OBJECT);
 	return BSHELL_SUCCESS;
 }
 

bshell.core/cmdlets/format-table.c

@@ -1,5 +1,4 @@
-#include "../status.h"
+#include <bshell/status.h>
-
 #include <fx/object.h>
 #include <fx/stream.h>
 

bshell.core/cmdlets/get-command.c

@@ -1,10 +1,9 @@
-#include "../command/cmdlet.h"
+#include <bshell/command/cmdlet.h>
-#include "../command/command.h"
+#include <bshell/command/command.h>
-#include "../runtime/pipeline.h"
+#include <bshell/runtime/pipeline.h>
-#include "../runtime/runtime.h"
+#include <bshell/runtime/runtime.h>
-#include "../runtime/scope.h"
+#include <bshell/runtime/scope.h>
-#include "../status.h"
+#include <bshell/status.h>
-
 #include <fx/reflection/assembly.h>
 #include <fx/reflection/function.h>
 #include <fx/string.h>
@@ -23,13 +22,10 @@ struct bshell_get_command_p {
 	bool c_eof;
 };
 
-extern const fx_assembly *bshell_assembly_get(void);
-
 static enum bshell_status begin_processing(bshell_cmdlet *cmdlet)
 {
-	struct bshell_get_command_p *p = fx_object_get_private(
+	struct bshell_get_command_p *p
-		cmdlet,
+		= fx_object_get_private(cmdlet, BSHELL_TYPE_GET_COMMAND);
-		BSHELL_TYPE_GET_COMMAND);
 	return BSHELL_SUCCESS;
 }
 
@@ -38,66 +34,73 @@ static enum bshell_status process_record(
 	bshell_pipeline *pipeline,
 	struct bshell_runtime *rt)
 {
-	struct bshell_get_command_p *p = fx_object_get_private(
+	struct bshell_get_command_p *p
-		cmdlet,
+		= fx_object_get_private(cmdlet, BSHELL_TYPE_GET_COMMAND);
-		BSHELL_TYPE_GET_COMMAND);
 	if (p->c_eof) {
 		return BSHELL_SUCCESS;
 	}
 
-	fx_iterator *it = fx_iterator_begin(rt->rt_aliases);
+	fx_iterator *aliases = fx_iterator_begin(rt->rt_aliases);
-	fx_foreach(item_v, it)
+	fx_foreach(item_v, aliases)
 	{
 		fx_hashtable_item *item;
 		fx_value_get_object(&item_v, &item);
 		fx_value alias_v = fx_hashtable_item_get_value(item);
 		bshell_pipeline_write_value(pipeline, alias_v, false);
 	}
-	fx_iterator_unref(it);
+	fx_iterator_unref(aliases);
 
-	fx_queue_entry *cur = fx_queue_last(&rt->rt_scope);
+	struct bshell_runtime_scope *scope
-	while (cur) {
+		= bshell_runtime_get_current_scope(rt);
-		struct runtime_scope *scope = fx_unbox(
+	while (scope) {
-			struct runtime_scope,
+		fx_hashtable *function_map
-			cur,
+			= bshell_runtime_scope_get_functions(scope);
-			s_entry);
+		fx_iterator *functions = fx_iterator_begin(function_map);
-
+		fx_foreach(item_v, functions)
-		it = fx_iterator_begin(scope->s_functions);
-		fx_foreach(item_v, it)
 		{
 			fx_hashtable_item *item;
 			fx_value_get_object(&item_v, &item);
 			fx_value func_v = fx_hashtable_item_get_value(item);
 			bshell_pipeline_write_value(pipeline, func_v, false);
 		}
-		fx_iterator_unref(it);
+		fx_iterator_unref(functions);
 
-		cur = fx_queue_prev(cur);
+		scope = bshell_runtime_get_parent_scope(rt, scope);
 	}
 
-	const fx_assembly *self = bshell_assembly_get();
+	fx_iterator *assemblies = fx_assembly_get_all();
-	it = fx_assembly_get_types(self);
+	fx_foreach(asm_v, assemblies)
-	fx_foreach(v, it)
 	{
-		fx_type *ty = NULL;
+		fx_assembly *assembly = NULL;
-		fx_value_get_object(&v, &ty);
+		fx_value_get_object(&asm_v, &assembly);
-		if (fx_type_id_compare(fx_type_get_id(ty), BSHELL_TYPE_CMDLET)
+		fx_iterator *types = fx_assembly_get_types(assembly);
-		    == 0) {
+		fx_foreach(v, types)
-			continue;
+		{
-		}
+			fx_type *ty = NULL;
-		bshell_command_class *cmd = fx_type_get_interface(
+			fx_value_get_object(&v, &ty);
-			ty,
+			fx_type_flags ty_flags = fx_type_get_flags(ty);
-			BSHELL_TYPE_COMMAND);
+			bool is_abstract = (ty_flags & FX_TYPE_F_ABSTRACT) != 0;
-		if (!cmd) {
+			if (is_abstract) {
-			continue;
+				continue;
+			}
+
+			bshell_command_class *cmd = fx_type_get_interface(
+				ty,
+				BSHELL_TYPE_COMMAND);
+			if (!cmd) {
+				continue;
+			}
+
+			fx_value callable = FX_VALUE_OBJECT(
+				fx_object_create(fx_type_get_id(ty)));
+			bshell_pipeline_write_value(pipeline, callable, false);
+			fx_value_unset(&callable);
 		}
 
-		fx_value callable = FX_VALUE_OBJECT(
+		fx_iterator_unref(types);
-			fx_object_create(fx_type_get_id(ty)));
-		bshell_pipeline_write_value(pipeline, callable, false);
-		fx_value_unset(&callable);
 	}
-	fx_iterator_unref(it);
+
+	fx_iterator_unref(assemblies);
 	p->c_eof = true;
 
 	return BSHELL_SUCCESS;
@@ -105,9 +108,8 @@ static enum bshell_status process_record(
 
 static enum bshell_status end_processing(bshell_cmdlet *cmdlet)
 {
-	struct bshell_get_command_p *p = fx_object_get_private(
+	struct bshell_get_command_p *p
-		cmdlet,
+		= fx_object_get_private(cmdlet, BSHELL_TYPE_GET_COMMAND);
-		BSHELL_TYPE_GET_COMMAND);
 
 	return BSHELL_SUCCESS;
 }

bshell.core/cmdlets/get-verb.c

@@ -1,8 +1,7 @@
-#include "../command/cmdlet.h"
+#include <bshell/command/cmdlet.h>
-#include "../command/command.h"
+#include <bshell/command/command.h>
-#include "../runtime/pipeline.h"
+#include <bshell/runtime/pipeline.h>
-#include "../status.h"
+#include <bshell/status.h>
-
 #include <fx/reflection/function.h>
 #include <fx/string.h>
 #include <fx/vector.h>
@@ -23,9 +22,8 @@ struct bshell_get_verb_p {
 
 static enum bshell_status begin_processing(bshell_cmdlet *cmdlet)
 {
-	struct bshell_get_verb_p *p = fx_object_get_private(
+	struct bshell_get_verb_p *p
-		cmdlet,
+		= fx_object_get_private(cmdlet, BSHELL_TYPE_GET_VERB);
-		BSHELL_TYPE_GET_VERB);
 	p->c_verbs = bshell_get_all_verbs();
 	p->c_it = fx_iterator_begin(p->c_verbs);
 	return BSHELL_SUCCESS;
@@ -36,9 +34,8 @@ static enum bshell_status process_record(
 	bshell_pipeline *pipeline,
 	struct bshell_runtime *rt)
 {
-	struct bshell_get_verb_p *p = fx_object_get_private(
+	struct bshell_get_verb_p *p
-		cmdlet,
+		= fx_object_get_private(cmdlet, BSHELL_TYPE_GET_VERB);
-		BSHELL_TYPE_GET_VERB);
 
 	do {
 		fx_value v = fx_iterator_get_value(p->c_it);
@@ -72,9 +69,8 @@ static enum bshell_status process_record(
 
 static enum bshell_status end_processing(bshell_cmdlet *cmdlet)
 {
-	struct bshell_get_verb_p *p = fx_object_get_private(
+	struct bshell_get_verb_p *p
-		cmdlet,
+		= fx_object_get_private(cmdlet, BSHELL_TYPE_GET_VERB);
-		BSHELL_TYPE_GET_VERB);
 	if (p->c_it) {
 		fx_iterator_unref(p->c_it);
 		p->c_it = NULL;

bshell.core/cmdlets/write-output.c

@@ -1,9 +1,8 @@
-#include "../command/cmdlet.h"
+#include <bshell/command/cmdlet.h>
-#include "../command/command.h"
+#include <bshell/command/command.h>
-#include "../format/format.h"
+#include <bshell/format.h>
-#include "../runtime/pipeline.h"
+#include <bshell/runtime/pipeline.h>
-#include "../status.h"
+#include <bshell/status.h>
-
 #include <fx/collections/array.h>
 #include <fx/reflection/function.h>
 #include <fx/string.h>
@@ -20,7 +19,7 @@ FX_TYPE_CLASS_DECLARATION_BEGIN(bshell_write_output)
 FX_TYPE_CLASS_DECLARATION_END(bshell_write_output)
 
 struct bshell_write_output_p {
-	struct table_format_ctx w_table_ctx;
+	struct bshell_table_ctx w_table_ctx;
 	bool w_table_initialised;
 };
 
@@ -28,13 +27,13 @@ static void initialise_table(
 	struct bshell_write_output_p *cmd,
 	const fx_value *first_record)
 {
-	table_format_ctx_init(&cmd->w_table_ctx, fx_stdout);
+	bshell_table_ctx_init(&cmd->w_table_ctx, fx_stdout);
 	const fx_type *ty = fx_type_get_by_id(first_record->v_type);
-	table_format_ctx_prepare_columns_from_format(
+	bshell_table_ctx_prepare_columns_from_format(
 		&cmd->w_table_ctx,
 		ty,
 		NULL);
-	table_format_ctx_print_headers(&cmd->w_table_ctx);
+	bshell_table_ctx_print_headers(&cmd->w_table_ctx);
 	cmd->w_table_initialised = true;
 }
 
@@ -66,14 +65,13 @@ static void write_value(
 		initialise_table(cmd, value);
 	}
 
-	table_format_ctx_print_record(&cmd->w_table_ctx, value);
+	bshell_table_ctx_print_record(&cmd->w_table_ctx, value);
 }
 
 static enum bshell_status begin_processing(bshell_cmdlet *cmdlet)
 {
-	struct bshell_write_output_p *p = fx_object_get_private(
+	struct bshell_write_output_p *p
-		cmdlet,
+		= fx_object_get_private(cmdlet, BSHELL_TYPE_WRITE_OUTPUT);
-		BSHELL_TYPE_WRITE_OUTPUT);
 	for (size_t i = 1;; i++) {
 		const fx_value *v = bshell_command_get_arg(cmdlet, i);
 		if (!v) {
@@ -91,9 +89,8 @@ static enum bshell_status process_record(
 	bshell_pipeline *pipeline,
 	struct bshell_runtime *rt)
 {
-	struct bshell_write_output_p *p = fx_object_get_private(
+	struct bshell_write_output_p *p
-		cmdlet,
+		= fx_object_get_private(cmdlet, BSHELL_TYPE_WRITE_OUTPUT);
-		BSHELL_TYPE_WRITE_OUTPUT);
 
 	fx_value in = bshell_pipeline_read_value(pipeline);
 	if (fx_value_is_set(&in)) {
@@ -106,9 +103,8 @@ static enum bshell_status process_record(
 
 static enum bshell_status end_processing(bshell_cmdlet *cmdlet)
 {
-	struct bshell_write_output_p *p = fx_object_get_private(
+	struct bshell_write_output_p *p
-		cmdlet,
+		= fx_object_get_private(cmdlet, BSHELL_TYPE_WRITE_OUTPUT);
-		BSHELL_TYPE_WRITE_OUTPUT);
 
 	return BSHELL_SUCCESS;
 }

bshell.runtime/CMakeLists.txt

@@ -0,0 +1,22 @@
+set(source_dirs
+	ast compile parse parse/lex parse/syntax
+	format runtime command)
+
+file(GLOB sources
+	*.c
+	*.h)
+
+foreach (d ${source_dirs})
+	file(GLOB d_sources
+		${d}/*.c
+		${d}/*.h)
+	set(sources ${sources} ${d_sources})
+endforeach (d)
+
+message(STATUS ${sources})
+add_library(bshell.runtime SHARED ${sources})
+
+target_link_libraries(bshell.runtime FX::Runtime FX::Collections FX::Term)
+target_include_directories(bshell.runtime PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
+target_compile_definitions(bshell.runtime PUBLIC
+	BSHELL_VERSION="${bshell_version}")

bshell.runtime/assembly.c

@@ -0,0 +1,16 @@
+#include <fx/macros.h>
+#include <fx/reflection/assembly.h>
+
+FX_ASSEMBLY_BEGIN(bshell_runtime)
+	FX_ASSEMBLY_NAME("bshell.runtime");
+	FX_ASSEMBLY_VERSION(0, 1, 0, 0);
+	FX_ASSEMBLY_EXPORT_TYPE("bshell.runtime", "command", bshell_command);
+	FX_ASSEMBLY_EXPORT_TYPE("bshell.runtime", "alias", bshell_alias);
+	// FX_ASSEMBLY_EXPORT_TYPE("bshell.runtime", "function",
+	// bshell_function);
+	FX_ASSEMBLY_EXPORT_TYPE("bshell.runtime", "cmdlet", bshell_cmdlet);
+	FX_ASSEMBLY_EXPORT_TYPE(
+		"bshell.runtime",
+		"scriptblock",
+		bshell_scriptblock);
+FX_ASSEMBLY_END(bshell_runtime)

bshell.runtime/ast/array.c

@@ -0,0 +1,28 @@
+#include <bshell/ast.h>
+#include <bshell/parse/token.h>
+
+static enum bshell_status collect_children(
+	struct bshell_ast_node *node,
+	struct bshell_ast_iterator *it)
+{
+	struct bshell_array_ast_node *array = (struct bshell_array_ast_node *)
+		node;
+
+	fx_queue_entry *cur = fx_queue_first(&array->n_items);
+	while (cur) {
+		struct bshell_ast_node *child = fx_unbox(
+			struct bshell_ast_node,
+			cur,
+			n_entry);
+		bshell_ast_iterator_enqueue(it, child);
+		cur = fx_queue_next(cur);
+	}
+
+	return BSHELL_SUCCESS;
+}
+
+struct bshell_ast_node_definition array_bshell_ast_node = {
+	.def_id = BSHELL_AST_ARRAY,
+	.def_node_size = sizeof(struct bshell_array_ast_node),
+	.def_collect_children = collect_children,
+};

bshell.runtime/ast/ast.c

@@ -0,0 +1,277 @@
+#include <assert.h>
+#include <bshell/ast.h>
+#include <bshell/status.h>
+#include <stdlib.h>
+#include <string.h>
+
+extern struct bshell_ast_node_definition null_bshell_ast_node;
+extern struct bshell_ast_node_definition int_bshell_ast_node;
+extern struct bshell_ast_node_definition double_bshell_ast_node;
+extern struct bshell_ast_node_definition word_bshell_ast_node;
+extern struct bshell_ast_node_definition var_bshell_ast_node;
+extern struct bshell_ast_node_definition string_bshell_ast_node;
+extern struct bshell_ast_node_definition fstring_bshell_ast_node;
+extern struct bshell_ast_node_definition cmdcall_bshell_ast_node;
+extern struct bshell_ast_node_definition pipeline_bshell_ast_node;
+extern struct bshell_ast_node_definition redirection_bshell_ast_node;
+extern struct bshell_ast_node_definition block_bshell_ast_node;
+extern struct bshell_ast_node_definition stmt_list_bshell_ast_node;
+extern struct bshell_ast_node_definition func_bshell_ast_node;
+extern struct bshell_ast_node_definition array_bshell_ast_node;
+extern struct bshell_ast_node_definition hashtable_bshell_ast_node;
+extern struct bshell_ast_node_definition hashtable_item_bshell_ast_node;
+extern struct bshell_ast_node_definition if_bshell_ast_node;
+extern struct bshell_ast_node_definition if_branch_bshell_ast_node;
+extern struct bshell_ast_node_definition op_bshell_ast_node;
+
+static const struct bshell_ast_node_definition *bshell_ast_node_definitions[]
+	= {
+		[BSHELL_AST_NULL] = &null_bshell_ast_node,
+		[BSHELL_AST_INT] = &int_bshell_ast_node,
+		[BSHELL_AST_DOUBLE] = &double_bshell_ast_node,
+		[BSHELL_AST_WORD] = &word_bshell_ast_node,
+		[BSHELL_AST_VAR] = &var_bshell_ast_node,
+		[BSHELL_AST_STRING] = &string_bshell_ast_node,
+		[BSHELL_AST_FSTRING] = &fstring_bshell_ast_node,
+		[BSHELL_AST_CMDCALL] = &cmdcall_bshell_ast_node,
+		[BSHELL_AST_PIPELINE] = &pipeline_bshell_ast_node,
+		[BSHELL_AST_REDIRECTION] = &redirection_bshell_ast_node,
+		[BSHELL_AST_BLOCK] = &block_bshell_ast_node,
+		[BSHELL_AST_STMT_LIST] = &stmt_list_bshell_ast_node,
+		[BSHELL_AST_FUNC] = &func_bshell_ast_node,
+		[BSHELL_AST_ARRAY] = &array_bshell_ast_node,
+		[BSHELL_AST_IF] = &if_bshell_ast_node,
+		[BSHELL_AST_IF_BRANCH] = &if_branch_bshell_ast_node,
+		[BSHELL_AST_HASHTABLE] = &hashtable_bshell_ast_node,
+		[BSHELL_AST_HASHTABLE_ITEM] = &hashtable_item_bshell_ast_node,
+		[BSHELL_AST_OP] = &op_bshell_ast_node,
+};
+static const size_t nr_bshell_ast_node_definitions
+	= sizeof bshell_ast_node_definitions
+        / sizeof bshell_ast_node_definitions[0];
+
+struct bshell_ast_node *bshell_ast_node_create(enum bshell_ast_node_type type)
+{
+	assert(type < nr_bshell_ast_node_definitions);
+
+	const struct bshell_ast_node_definition *def
+		= bshell_ast_node_definitions[type];
+	struct bshell_ast_node *out = malloc(def->def_node_size);
+	if (!out) {
+		return NULL;
+	}
+
+	memset(out, 0x0, def->def_node_size);
+
+	out->n_type = type;
+
+	return out;
+}
+
+void bshell_ast_node_destroy(struct bshell_ast_node *node)
+{
+	assert(node->n_type < nr_bshell_ast_node_definitions);
+
+	struct bshell_ast_iterator it = {0};
+	bshell_ast_iterator_enqueue(&it, node);
+
+	while (1) {
+		node = bshell_ast_iterator_peek(&it);
+		if (!node) {
+			break;
+		}
+
+		const struct bshell_ast_node_definition *def
+			= bshell_ast_node_definitions[node->n_type];
+
+		if (def->def_cleanup) {
+			def->def_cleanup(node);
+		}
+
+		bshell_ast_iterator_dequeue(&it);
+		free(node);
+	}
+}
+
+void bshell_ast_node_to_string(const struct bshell_ast_node *node, fx_bstr *out)
+{
+	const struct bshell_ast_node_definition *def
+		= bshell_ast_node_definitions[node->n_type];
+	if (def->def_to_string) {
+		def->def_to_string(node, out);
+	}
+}
+
+#define ENUM_STR(x)                                                            \
+	case x:                                                                \
+		return #x
+
+const char *bshell_ast_node_type_to_string(enum bshell_ast_node_type type)
+{
+	switch (type) {
+		ENUM_STR(BSHELL_AST_NONE);
+		ENUM_STR(BSHELL_AST_NULL);
+		ENUM_STR(BSHELL_AST_STMT_LIST);
+		ENUM_STR(BSHELL_AST_INT);
+		ENUM_STR(BSHELL_AST_DOUBLE);
+		ENUM_STR(BSHELL_AST_WORD);
+		ENUM_STR(BSHELL_AST_STRING);
+		ENUM_STR(BSHELL_AST_FSTRING);
+		ENUM_STR(BSHELL_AST_VAR);
+		ENUM_STR(BSHELL_AST_VAR_SPLAT);
+		ENUM_STR(BSHELL_AST_FLAG);
+		ENUM_STR(BSHELL_AST_CMDCALL);
+		ENUM_STR(BSHELL_AST_PIPELINE);
+		ENUM_STR(BSHELL_AST_REDIRECTION);
+		ENUM_STR(BSHELL_AST_BLOCK);
+		ENUM_STR(BSHELL_AST_FUNC);
+		ENUM_STR(BSHELL_AST_IF);
+		ENUM_STR(BSHELL_AST_IF_BRANCH);
+		ENUM_STR(BSHELL_AST_OP);
+		ENUM_STR(BSHELL_AST_ARRAY);
+		ENUM_STR(BSHELL_AST_HASHTABLE);
+		ENUM_STR(BSHELL_AST_HASHTABLE_ITEM);
+	default:
+		return "<unknown>";
+	}
+}
+
+struct bshell_ast_node *bshell_ast_iterator_peek(struct bshell_ast_iterator *it)
+{
+	fx_queue_entry *cur = fx_queue_first(&it->it_queue);
+	if (!cur) {
+		return NULL;
+	}
+
+	return fx_unbox(struct bshell_ast_node, cur, n_it.e_entry);
+}
+
+struct bshell_ast_node *bshell_ast_iterator_dequeue(
+	struct bshell_ast_iterator *it)
+{
+	fx_queue_entry *cur = fx_queue_first(&it->it_queue);
+	if (!cur) {
+		return NULL;
+	}
+
+	struct bshell_ast_node *node = fx_unbox(
+		struct bshell_ast_node,
+		cur,
+		n_it.e_entry);
+	const struct bshell_ast_node_definition *def
+		= bshell_ast_node_definitions[node->n_type];
+
+	it->it_insert_after = cur;
+	if (def->def_collect_children) {
+		def->def_collect_children(node, it);
+	}
+
+	fx_queue_pop_front(&it->it_queue);
+	return fx_unbox(struct bshell_ast_node, cur, n_it.e_entry);
+}
+
+void bshell_ast_iterator_enqueue(
+	struct bshell_ast_iterator *it,
+	struct bshell_ast_node *node)
+{
+	unsigned long new_depth = 0;
+
+	fx_queue_entry *cur = fx_queue_first(&it->it_queue);
+	if (cur) {
+		struct bshell_ast_node *cur_node = fx_unbox(
+			struct bshell_ast_node,
+			cur,
+			n_it.e_entry);
+		new_depth = cur_node->n_it.e_depth + 1;
+	}
+
+	node->n_it.e_depth = new_depth;
+
+	if (!it->it_insert_after) {
+		fx_queue_push_back(&it->it_queue, &node->n_it.e_entry);
+		return;
+	}
+
+	fx_queue_insert_after(
+		&it->it_queue,
+		&node->n_it.e_entry,
+		it->it_insert_after);
+	it->it_insert_after = &node->n_it.e_entry;
+}
+
+enum bshell_status bshell_ast_node_iterate(
+	struct bshell_ast_node *node,
+	struct bshell_ast_iterator *it,
+	bshell_ast_iterator_callback callback,
+	void *arg)
+{
+	fx_queue_push_back(&it->it_queue, &node->n_it.e_entry);
+	node->n_it.e_depth = 0;
+
+	fx_queue_entry *entry = fx_queue_first(&it->it_queue);
+
+	while (entry) {
+		struct bshell_ast_iterator_entry *it_entry = fx_unbox(
+			struct bshell_ast_iterator_entry,
+			entry,
+			e_entry);
+		node = fx_unbox(struct bshell_ast_node, it_entry, n_it);
+
+		if (!node) {
+			/* this should never happen. */
+			return BSHELL_ERR_INTERNAL_FAILURE;
+		}
+
+		struct bshell_ast_iterate_result result = callback(
+			node,
+			BSHELL_AST_ITERATION_PRE,
+			it,
+			arg);
+		if (result.r_status != BSHELL_SUCCESS
+		    || result.r_flags & BSHELL_AST_ITERATE_STOP) {
+			return result.r_status;
+		}
+
+		const struct bshell_ast_node_definition *type
+			= bshell_ast_node_definitions[node->n_type];
+		if (type->def_collect_children
+		    && result.r_flags & BSHELL_AST_ITERATE_ADD_CHILDREN) {
+			it->it_insert_after = entry;
+			type->def_collect_children(node, it);
+		}
+
+		if (!(result.r_flags & BSHELL_AST_ITERATE_REPEAT)) {
+			entry = fx_queue_next(entry);
+		}
+	}
+
+	while (!fx_queue_empty(&it->it_queue)) {
+		fx_queue_entry *entry = fx_queue_last(&it->it_queue);
+		if (!entry) {
+			break;
+		}
+
+		node = fx_unbox(struct bshell_ast_node, entry, n_it);
+
+		if (!node) {
+			/* this should never happen. */
+			return BSHELL_ERR_INTERNAL_FAILURE;
+		}
+
+		struct bshell_ast_iterate_result result = callback(
+			node,
+			BSHELL_AST_ITERATION_POST,
+			it,
+			arg);
+		if (result.r_status != BSHELL_SUCCESS
+		    || result.r_flags & BSHELL_AST_ITERATE_STOP) {
+			return result.r_status;
+		}
+
+		if (!(result.r_flags & BSHELL_AST_ITERATE_REPEAT)) {
+			fx_queue_pop_back(&it->it_queue);
+		}
+	}
+
+	return BSHELL_SUCCESS;
+}

bshell.runtime/ast/block.c

@@ -0,0 +1,26 @@
+#include <bshell/ast.h>
+
+static enum bshell_status collect_children(
+	struct bshell_ast_node *node,
+	struct bshell_ast_iterator *it)
+{
+	struct bshell_block_ast_node *block = (struct bshell_block_ast_node *)
+		node;
+	fx_queue_entry *cur = fx_queue_first(&block->n_statements);
+	while (cur) {
+		struct bshell_ast_node *child = fx_unbox(
+			struct bshell_ast_node,
+			cur,
+			n_entry);
+		bshell_ast_iterator_enqueue(it, child);
+		cur = fx_queue_next(cur);
+	}
+
+	return BSHELL_SUCCESS;
+}
+
+struct bshell_ast_node_definition block_bshell_ast_node = {
+	.def_id = BSHELL_AST_BLOCK,
+	.def_node_size = sizeof(struct bshell_block_ast_node),
+	.def_collect_children = collect_children,
+};

bshell.runtime/ast/cmdcall.c

@@ -0,0 +1,37 @@
+#include <bshell/ast.h>
+
+static enum bshell_status collect_children(
+	struct bshell_ast_node *node,
+	struct bshell_ast_iterator *it)
+{
+	struct bshell_cmdcall_ast_node *cmdcall = (struct
+	                                           bshell_cmdcall_ast_node *)
+		node;
+	fx_queue_entry *cur = fx_queue_first(&cmdcall->n_args);
+	while (cur) {
+		struct bshell_ast_node *child = fx_unbox(
+			struct bshell_ast_node,
+			cur,
+			n_entry);
+		bshell_ast_iterator_enqueue(it, child);
+		cur = fx_queue_next(cur);
+	}
+
+	cur = fx_queue_first(&cmdcall->n_redirect);
+	while (cur) {
+		struct bshell_ast_node *child = fx_unbox(
+			struct bshell_ast_node,
+			cur,
+			n_entry);
+		bshell_ast_iterator_enqueue(it, child);
+		cur = fx_queue_next(cur);
+	}
+
+	return BSHELL_SUCCESS;
+}
+
+struct bshell_ast_node_definition cmdcall_bshell_ast_node = {
+	.def_id = BSHELL_AST_CMDCALL,
+	.def_node_size = sizeof(struct bshell_cmdcall_ast_node),
+	.def_collect_children = collect_children,
+};

bshell.runtime/ast/double.c

@@ -0,0 +1,16 @@
+#include <bshell/ast.h>
+#include <bshell/parse/token.h>
+#include <fx/stream.h>
+
+static void to_string(const struct bshell_ast_node *node, fx_bstr *out)
+{
+	struct bshell_double_ast_node *i = (struct bshell_double_ast_node *)
+		node;
+	fx_value_to_string(&i->n_value->tok_number, (fx_stream *)out, NULL);
+}
+
+struct bshell_ast_node_definition double_bshell_ast_node = {
+	.def_id = BSHELL_AST_DOUBLE,
+	.def_node_size = sizeof(struct bshell_double_ast_node),
+	.def_to_string = to_string,
+};

bshell.runtime/ast/fstring.c

@@ -0,0 +1,26 @@
+#include <bshell/ast.h>
+
+static enum bshell_status collect_children(
+	struct bshell_ast_node *node,
+	struct bshell_ast_iterator *it)
+{
+	struct bshell_fstring_ast_node *fstring;
+	fstring = (struct bshell_fstring_ast_node *)node;
+	fx_queue_entry *cur = fx_queue_first(&fstring->n_elements);
+	while (cur) {
+		struct bshell_ast_node *child = fx_unbox(
+			struct bshell_ast_node,
+			cur,
+			n_entry);
+		bshell_ast_iterator_enqueue(it, child);
+		cur = fx_queue_next(cur);
+	}
+
+	return BSHELL_SUCCESS;
+}
+
+struct bshell_ast_node_definition fstring_bshell_ast_node = {
+	.def_id = BSHELL_AST_FSTRING,
+	.def_node_size = sizeof(struct bshell_fstring_ast_node),
+	.def_collect_children = collect_children,
+};

bshell.runtime/ast/func.c

@@ -0,0 +1,39 @@
+#include <bshell/ast.h>
+#include <bshell/parse/token.h>
+
+static enum bshell_status collect_children(
+	struct bshell_ast_node *node,
+	struct bshell_ast_iterator *it)
+{
+	struct bshell_func_ast_node *func = (struct bshell_func_ast_node *)node;
+
+	fx_queue_entry *cur = fx_queue_first(&func->n_params);
+	while (cur) {
+		struct bshell_ast_node *child = fx_unbox(
+			struct bshell_ast_node,
+			cur,
+			n_entry);
+		bshell_ast_iterator_enqueue(it, child);
+		cur = fx_queue_next(cur);
+	}
+
+	if (func->n_body) {
+		bshell_ast_iterator_enqueue(it, func->n_body);
+	}
+
+	return BSHELL_SUCCESS;
+}
+
+static void to_string(const struct bshell_ast_node *node, fx_bstr *out)
+{
+	const struct bshell_func_ast_node *func = (const struct
+	                                           bshell_func_ast_node *)node;
+	fx_bstr_write_fmt(out, NULL, "%s", func->n_name->tok_str);
+}
+
+struct bshell_ast_node_definition func_bshell_ast_node = {
+	.def_id = BSHELL_AST_FUNC,
+	.def_node_size = sizeof(struct bshell_func_ast_node),
+	.def_collect_children = collect_children,
+	.def_to_string = to_string,
+};

bshell.runtime/ast/hashtable-item.c

@@ -0,0 +1,26 @@
+#include <bshell/ast.h>
+#include <bshell/parse/token.h>
+
+static enum bshell_status collect_children(
+	struct bshell_ast_node *node,
+	struct bshell_ast_iterator *it)
+{
+	struct bshell_hashtable_item_ast_node *item
+		= (struct bshell_hashtable_item_ast_node *)node;
+
+	if (item->n_key) {
+		bshell_ast_iterator_enqueue(it, item->n_key);
+	}
+
+	if (item->n_value) {
+		bshell_ast_iterator_enqueue(it, item->n_value);
+	}
+
+	return BSHELL_SUCCESS;
+}
+
+struct bshell_ast_node_definition hashtable_item_bshell_ast_node = {
+	.def_id = BSHELL_AST_HASHTABLE_ITEM,
+	.def_node_size = sizeof(struct bshell_hashtable_item_ast_node),
+	.def_collect_children = collect_children,
+};

bshell.runtime/ast/hashtable.c

@@ -0,0 +1,24 @@
+#include <bshell/ast.h>
+
+static enum bshell_status collect_children(
+	struct bshell_ast_node *node,
+	struct bshell_ast_iterator *it)
+{
+	struct bshell_hashtable_ast_node *hashtable
+		= (struct bshell_hashtable_ast_node *)node;
+	fx_queue_entry *cur = fx_queue_first(&hashtable->n_items);
+	while (cur) {
+		struct bshell_ast_node *child
+			= fx_unbox(struct bshell_ast_node, cur, n_entry);
+		bshell_ast_iterator_enqueue(it, child);
+		cur = fx_queue_next(cur);
+	}
+
+	return BSHELL_SUCCESS;
+}
+
+struct bshell_ast_node_definition hashtable_bshell_ast_node = {
+	.def_id = BSHELL_AST_HASHTABLE,
+	.def_node_size = sizeof(struct bshell_hashtable_ast_node),
+	.def_collect_children = collect_children,
+};

bshell.runtime/ast/if-branch.c

@@ -0,0 +1,24 @@
+#include <bshell/ast.h>
+
+static enum bshell_status collect_children(
+	struct bshell_ast_node *node,
+	struct bshell_ast_iterator *it)
+{
+	struct bshell_if_branch_ast_node *if_branch
+		= (struct bshell_if_branch_ast_node *)node;
+	if (if_branch->n_cond) {
+		bshell_ast_iterator_enqueue(it, if_branch->n_cond);
+	}
+
+	if (if_branch->n_body) {
+		bshell_ast_iterator_enqueue(it, if_branch->n_body);
+	}
+
+	return BSHELL_SUCCESS;
+}
+
+struct bshell_ast_node_definition if_branch_bshell_ast_node = {
+	.def_id = BSHELL_AST_IF_BRANCH,
+	.def_node_size = sizeof(struct bshell_if_branch_ast_node),
+	.def_collect_children = collect_children,
+};

bshell.runtime/ast/if.c

@@ -0,0 +1,23 @@
+#include <bshell/ast.h>
+
+static enum bshell_status collect_children(
+	struct bshell_ast_node *node,
+	struct bshell_ast_iterator *it)
+{
+	struct bshell_if_ast_node *if_group = (struct bshell_if_ast_node *)node;
+	fx_queue_entry *cur = fx_queue_first(&if_group->n_branches);
+	while (cur) {
+		struct bshell_ast_node *child
+			= fx_unbox(struct bshell_ast_node, cur, n_entry);
+		bshell_ast_iterator_enqueue(it, child);
+		cur = fx_queue_next(cur);
+	}
+
+	return BSHELL_SUCCESS;
+}
+
+struct bshell_ast_node_definition if_bshell_ast_node = {
+	.def_id = BSHELL_AST_IF,
+	.def_node_size = sizeof(struct bshell_if_ast_node),
+	.def_collect_children = collect_children,
+};

bshell.runtime/ast/int.c

@@ -0,0 +1,15 @@
+#include <bshell/ast.h>
+#include <bshell/parse/token.h>
+#include <fx/stream.h>
+
+static void to_string(const struct bshell_ast_node *node, fx_bstr *out)
+{
+	struct bshell_int_ast_node *i = (struct bshell_int_ast_node *)node;
+	fx_value_to_string(&i->n_value->tok_number, (fx_stream *)out, NULL);
+}
+
+struct bshell_ast_node_definition int_bshell_ast_node = {
+	.def_id = BSHELL_AST_INT,
+	.def_node_size = sizeof(struct bshell_int_ast_node),
+	.def_to_string = to_string,
+};

bshell.runtime/ast/null.c

@@ -0,0 +1,7 @@
+#include <bshell/ast.h>
+#include <bshell/parse/token.h>
+
+struct bshell_ast_node_definition null_bshell_ast_node = {
+	.def_id = BSHELL_AST_NULL,
+	.def_node_size = sizeof(struct bshell_null_ast_node),
+};

bshell.runtime/ast/op.c

@@ -0,0 +1,38 @@
+#include <bshell/ast.h>
+#include <bshell/parse/token.h>
+#include <bshell/runtime/operator.h>
+
+static enum bshell_status collect_children(
+	struct bshell_ast_node *node,
+	struct bshell_ast_iterator *it)
+{
+	struct bshell_op_ast_node *op = (struct bshell_op_ast_node *)node;
+
+	if (op->n_left) {
+		bshell_ast_iterator_enqueue(it, op->n_left);
+	}
+
+	if (op->n_right) {
+		bshell_ast_iterator_enqueue(it, op->n_right);
+	}
+
+	return BSHELL_SUCCESS;
+}
+
+static void to_string(const struct bshell_ast_node *node, fx_bstr *out)
+{
+	const struct bshell_op_ast_node *op = (const struct bshell_op_ast_node
+	                                               *)node;
+	fx_bstr_write_fmt(
+		out,
+		NULL,
+		"%s",
+		bshell_operator_id_to_string(op->n_op->op_id));
+}
+
+struct bshell_ast_node_definition op_bshell_ast_node = {
+	.def_id = BSHELL_AST_OP,
+	.def_node_size = sizeof(struct bshell_op_ast_node),
+	.def_collect_children = collect_children,
+	.def_to_string = to_string,
+};

bshell.runtime/ast/pipeline.c

@@ -0,0 +1,26 @@
+#include <bshell/ast.h>
+
+static enum bshell_status collect_children(
+	struct bshell_ast_node *node,
+	struct bshell_ast_iterator *it)
+{
+	struct bshell_pipeline_ast_node *pipeline;
+	pipeline = (struct bshell_pipeline_ast_node *)node;
+	fx_queue_entry *cur = fx_queue_first(&pipeline->n_stages);
+	while (cur) {
+		struct bshell_ast_node *child = fx_unbox(
+			struct bshell_ast_node,
+			cur,
+			n_entry);
+		bshell_ast_iterator_enqueue(it, child);
+		cur = fx_queue_next(cur);
+	}
+
+	return BSHELL_SUCCESS;
+}
+
+struct bshell_ast_node_definition pipeline_bshell_ast_node = {
+	.def_id = BSHELL_AST_PIPELINE,
+	.def_node_size = sizeof(struct bshell_pipeline_ast_node),
+	.def_collect_children = collect_children,
+};

bshell.runtime/ast/redirection.c

@@ -1,23 +1,23 @@
-#include "ast.h"
+#include <bshell/ast.h>
 
 static enum bshell_status collect_children(
-	struct ast_node *node,
+	struct bshell_ast_node *node,
-	struct ast_iterator *it)
+	struct bshell_ast_iterator *it)
 {
-	struct redirection_ast_node *redirection
+	struct bshell_redirection_ast_node *redirection
-		= (struct redirection_ast_node *)node;
+		= (struct bshell_redirection_ast_node *)node;
 
 	if (redirection->n_out_path_expr) {
-		ast_iterator_enqueue(it, redirection->n_out_path_expr);
+		bshell_ast_iterator_enqueue(it, redirection->n_out_path_expr);
 	}
 
 	return BSHELL_SUCCESS;
 }
 
-static void to_string(const struct ast_node *node, fx_bstr *out)
+static void to_string(const struct bshell_ast_node *node, fx_bstr *out)
 {
-	struct redirection_ast_node *redirection
+	struct bshell_redirection_ast_node *redirection
-		= (struct redirection_ast_node *)node;
+		= (struct bshell_redirection_ast_node *)node;
 	fx_bstr_write_fmt(out, NULL, "&%u", redirection->n_in);
 
 	if (redirection->n_append) {
@@ -41,9 +41,9 @@ static void to_string(const struct ast_node *node, fx_bstr *out)
 	}
 }
 
-struct ast_node_definition redirection_ast_node = {
+struct bshell_ast_node_definition redirection_bshell_ast_node = {
-	.def_id = AST_REDIRECTION,
+	.def_id = BSHELL_AST_REDIRECTION,
-	.def_node_size = sizeof(struct redirection_ast_node),
+	.def_node_size = sizeof(struct bshell_redirection_ast_node),
 	.def_collect_children = collect_children,
 	.def_to_string = to_string,
 };

bshell.runtime/ast/stmt-list.c

@@ -0,0 +1,24 @@
+#include <bshell/ast.h>
+
+static enum bshell_status collect_children(
+	struct bshell_ast_node *node,
+	struct bshell_ast_iterator *it)
+{
+	struct bshell_stmt_list_ast_node *stmt_list
+		= (struct bshell_stmt_list_ast_node *)node;
+	fx_queue_entry *cur = fx_queue_first(&stmt_list->n_statements);
+	while (cur) {
+		struct bshell_ast_node *child
+			= fx_unbox(struct bshell_ast_node, cur, n_entry);
+		bshell_ast_iterator_enqueue(it, child);
+		cur = fx_queue_next(cur);
+	}
+
+	return BSHELL_SUCCESS;
+}
+
+struct bshell_ast_node_definition stmt_list_bshell_ast_node = {
+	.def_id = BSHELL_AST_STMT_LIST,
+	.def_node_size = sizeof(struct bshell_stmt_list_ast_node),
+	.def_collect_children = collect_children,
+};

bshell.runtime/ast/string.c

@@ -0,0 +1,16 @@
+#include <bshell/ast.h>
+#include <bshell/parse/token.h>
+
+static void to_string(const struct bshell_ast_node *node, fx_bstr *out)
+{
+	const struct bshell_string_ast_node *string = (const struct
+	                                               bshell_string_ast_node *)
+		node;
+	fx_bstr_write_fmt(out, NULL, "%s", string->n_value->tok_str);
+}
+
+struct bshell_ast_node_definition string_bshell_ast_node = {
+	.def_id = BSHELL_AST_STRING,
+	.def_node_size = sizeof(struct bshell_string_ast_node),
+	.def_to_string = to_string,
+};

bshell.runtime/ast/var.c

@@ -0,0 +1,15 @@
+#include <bshell/ast.h>
+#include <bshell/parse/token.h>
+
+static void to_string(const struct bshell_ast_node *node, fx_bstr *out)
+{
+	const struct bshell_var_ast_node *var = (const struct
+	                                         bshell_var_ast_node *)node;
+	fx_bstr_write_fmt(out, NULL, "%s", var->n_ident->tok_str);
+}
+
+struct bshell_ast_node_definition var_bshell_ast_node = {
+	.def_id = BSHELL_AST_VAR,
+	.def_node_size = sizeof(struct bshell_var_ast_node),
+	.def_to_string = to_string,
+};

bshell.runtime/ast/word.c

@@ -0,0 +1,15 @@
+#include <bshell/ast.h>
+#include <bshell/parse/token.h>
+
+static void to_string(const struct bshell_ast_node *node, fx_bstr *out)
+{
+	const struct bshell_word_ast_node *word = (const struct
+	                                           bshell_word_ast_node *)node;
+	fx_bstr_write_fmt(out, NULL, "%s", word->n_value->tok_str);
+}
+
+struct bshell_ast_node_definition word_bshell_ast_node = {
+	.def_id = BSHELL_AST_WORD,
+	.def_node_size = sizeof(struct bshell_word_ast_node),
+	.def_to_string = to_string,
+};

bshell.runtime/command/alias.c

@@ -1,8 +1,6 @@
-#include "alias.h"
+#include <bshell/command/alias.h>
-
+#include <bshell/command/command.h>
-#include "../status.h"
+#include <bshell/status.h>
-#include "command.h"
-
 #include <fx/reflection/function.h>
 #include <fx/string.h>
 #include <fx/vector.h>
@@ -18,9 +16,8 @@ enum bshell_status bshell_alias_get_callable_name(
 	const bshell_alias *alias,
 	fx_string *out)
 {
-	bshell_alias_class *c = fx_object_get_interface(
+	bshell_alias_class *c
-		alias,
+		= fx_object_get_interface(alias, BSHELL_TYPE_ALIAS);
-		BSHELL_TYPE_ALIAS);
 	if (!c) {
 		return BSHELL_ERR_NOT_SUPPORTED;
 	}
@@ -41,9 +38,8 @@ enum bshell_status bshell_alias_get_target_name(
 	const bshell_alias *alias,
 	fx_string *out)
 {
-	bshell_alias_class *c = fx_object_get_interface(
+	bshell_alias_class *c
-		alias,
+		= fx_object_get_interface(alias, BSHELL_TYPE_ALIAS);
-		BSHELL_TYPE_ALIAS);
 	if (!c) {
 		return BSHELL_ERR_NOT_SUPPORTED;
 	}
@@ -95,6 +91,10 @@ static enum bshell_status get_description(
 		target_name = c->a_get_target_name(cmd);
 	}
 
+	if (!callable_name || !target_name) {
+		return BSHELL_ERR_NOT_SUPPORTED;
+	}
+
 	fx_string_append_cstr(out, callable_name);
 	fx_string_append_cstr(out, " -> ");
 	fx_string_append_cstr(out, target_name);
@@ -125,7 +125,8 @@ FX_TYPE_CLASS_END(bshell_alias)
 
 FX_TYPE_DEFINITION_BEGIN(bshell_alias)
 	FX_TYPE_ID(0x1736c10e, 0xebe6, 0x4ba5, 0x83d9, 0x5da3b7dc706c);
-	FX_TYPE_NAME("bshell.alias");
+	FX_TYPE_FLAGS(FX_TYPE_F_ABSTRACT);
+	FX_TYPE_NAME("bshell.runtime.alias");
 	FX_TYPE_EXTENDS(BSHELL_TYPE_COMMAND);
 	FX_TYPE_CLASS(bshell_alias_class);
 	FX_TYPE_INSTANCE_INIT(init);

bshell.runtime/command/cmdlet.c

@@ -1,8 +1,6 @@
-#include "cmdlet.h"
+#include <bshell/command/cmdlet.h>
-
+#include <bshell/command/command.h>
-#include "../status.h"
+#include <bshell/status.h>
-#include "command.h"
-
 #include <fx/reflection/function.h>
 #include <fx/string.h>
 #include <fx/vector.h>
@@ -52,7 +50,8 @@ FX_TYPE_CLASS_END(bshell_cmdlet)
 
 FX_TYPE_DEFINITION_BEGIN(bshell_cmdlet)
 	FX_TYPE_ID(0xc71f4d59, 0x8066, 0x4294, 0xa6b0, 0xe1f3eb04f454);
-	FX_TYPE_NAME("bshell.cmdlet");
+	FX_TYPE_FLAGS(FX_TYPE_F_ABSTRACT);
+	FX_TYPE_NAME("bshell.runtime.cmdlet");
 	FX_TYPE_EXTENDS(BSHELL_TYPE_COMMAND);
 	FX_TYPE_CLASS(bshell_cmdlet_class);
 	FX_TYPE_INSTANCE_INIT(init);

bshell.runtime/command/command.c

@@ -1,8 +1,6 @@
-#include "command.h"
+#include <bshell/command/command.h>
-
+#include <bshell/runtime/pipeline.h>
-#include "../runtime/pipeline.h"
+#include <bshell/status.h>
-#include "../status.h"
-
 #include <fx/reflection/assembly.h>
 #include <fx/reflection/function.h>
 #include <fx/reflection/type.h>
@@ -61,9 +59,8 @@ static fx_status get_command_type(
 {
 	bshell_command *cmd = NULL;
 	fx_value_get_object(cmd_v, &cmd);
-	bshell_command_class *cmd_class = fx_object_get_interface(
+	bshell_command_class *cmd_class
-		cmd,
+		= fx_object_get_interface(cmd, BSHELL_TYPE_COMMAND);
-		BSHELL_TYPE_COMMAND);
 
 	*out = FX_CSTR(cmd_class->c_command_type);
 	return FX_SUCCESS;
@@ -76,9 +73,8 @@ static fx_status get_name(
 {
 	bshell_command *cmd = NULL;
 	fx_value_get_object(cmd_v, &cmd);
-	bshell_command_class *cmd_class = fx_object_get_interface(
+	bshell_command_class *cmd_class
-		cmd,
+		= fx_object_get_interface(cmd, BSHELL_TYPE_COMMAND);
-		BSHELL_TYPE_COMMAND);
 
 	fx_string *result = fx_string_create();
 	const fx_type *ty = fx_type_get_by_id(fx_object_query_type(cmd));
@@ -146,7 +142,7 @@ static fx_status get_source(
 	return FX_SUCCESS;
 }
 
-extern const fx_assembly *bshell_assembly_get(void);
+extern const fx_assembly *bshell_runtime_assembly_get(void);
 
 bshell_command *bshell_command_find_static(const char *name)
 {
@@ -154,32 +150,50 @@ bshell_command *bshell_command_find_static(const char *name)
 	fx_string *call_name = fx_string_create_from_cstr(name);
 	fx_string_transform_lowercase(call_name);
 
-	const fx_assembly *self = bshell_assembly_get();
+	bshell_command *result = NULL;
-	fx_iterator *it = fx_assembly_get_types(self);
+
-	fx_foreach(v, it)
+	fx_iterator *assemblies = fx_assembly_get_all();
+	fx_foreach(asm_v, assemblies)
 	{
-		fx_type *ty = NULL;
+		fx_assembly *assembly = NULL;
-		fx_value_get_object(&v, &ty);
+		fx_value_get_object(&asm_v, &assembly);
-		const char *ty_name = fx_type_get_name(ty);
+		fx_iterator *types = fx_assembly_get_types(assembly);
-		bshell_command_class *cmd = fx_type_get_interface(
+		fx_foreach(v, types)
-			ty,
+		{
-			BSHELL_TYPE_COMMAND);
+			fx_type *ty = NULL;
-		if (!cmd || !cmd->c_get_callable_name_static) {
+			fx_value_get_object(&v, &ty);
-			continue;
+			if (fx_type_id_compare(
+				    fx_type_get_id(ty),
+				    BSHELL_TYPE_COMMAND)
+			    == 0) {
+				continue;
+			}
+			bshell_command_class *cmd = fx_type_get_interface(
+				ty,
+				BSHELL_TYPE_COMMAND);
+			if (!cmd || !cmd->c_get_callable_name_static) {
+				continue;
+			}
+
+			fx_string_clear(target_name);
+			cmd->c_get_callable_name_static(ty, target_name);
+
+			if (!fx_strcmp_nocase(
+				    fx_string_get_cstr(call_name),
+				    fx_string_get_cstr(target_name))) {
+				result = fx_object_create(fx_type_get_id(ty));
+				break;
+			}
 		}
 
-		fx_string_clear(target_name);
+		fx_iterator_unref(types);
-		cmd->c_get_callable_name_static(ty, target_name);
-
-		if (!fx_strcmp_nocase(
-			    fx_string_get_cstr(call_name),
-			    fx_string_get_cstr(target_name))) {
-			return fx_object_create(fx_type_get_id(ty));
-		}
 	}
-	fx_iterator_unref(it);
 
-	return NULL;
+	fx_iterator_unref(assemblies);
+	fx_string_unref(call_name);
+	fx_string_unref(target_name);
+
+	return result;
 }
 
 void bshell_command_set_args(
@@ -265,7 +279,8 @@ FX_TYPE_CLASS_END(bshell_command)
 
 FX_TYPE_DEFINITION_BEGIN(bshell_command)
 	FX_TYPE_ID(0x5c50630d, 0x7535, 0x40ed, 0xbae5, 0x88aabc274d79);
-	FX_TYPE_NAME("bshell.command");
+	FX_TYPE_FLAGS(FX_TYPE_F_ABSTRACT);
+	FX_TYPE_NAME("bshell.runtime.command");
 	FX_TYPE_CLASS(bshell_command_class);
 	FX_TYPE_INSTANCE_INIT(init);
 	FX_TYPE_INSTANCE_PRIVATE(struct bshell_command_p);

bshell.runtime/compile/array.c

@@ -5,9 +5,10 @@ static const struct compile_value_type array_item_type = {};
 
 struct compile_result compile_array(
 	struct compile_ctx *ctx,
-	struct ast_node *src)
+	struct bshell_ast_node *src)
 {
-	struct array_ast_node *array = (struct array_ast_node *)src;
+	struct bshell_array_ast_node *array;
+	array = (struct bshell_array_ast_node *)src;
 	size_t nr_items = fx_queue_length(&array->n_items);
 	for (size_t i = 0; i < nr_items; i++) {
 		struct compile_value *item = compile_pop_value(ctx);
@@ -17,7 +18,7 @@ struct compile_result compile_array(
 
 	bshell_scriptblock_push_instruction(
 		ctx->c_block,
-		OPCODE_MK_ARRAY,
+		BSHELL_OPCODE_MK_ARRAY,
 		nr_items);
 	compile_push_value(ctx, &array_type, src);
 	return COMPILE_OK(0);

bshell.runtime/compile/block.c

@@ -1,6 +1,6 @@
-#include "../compile.h"
 #include "compile-node.h"
 
+#include <bshell/compile.h>
 #include <stdio.h>
 
 static enum bshell_status block_load(
@@ -9,7 +9,7 @@ static enum bshell_status block_load(
 {
 	bshell_scriptblock_push_instruction(
 		ctx->c_block,
-		OPCODE_LDBLOCK,
+		BSHELL_OPCODE_LDBLOCK,
 		value->v_pool);
 	return BSHELL_SUCCESS;
 }
@@ -20,7 +20,7 @@ static const struct compile_value_type block_type = {
 
 struct compile_result compile_block(
 	struct compile_ctx *ctx,
-	struct ast_node *src)
+	struct bshell_ast_node *src)
 {
 	bshell_scriptblock *sub_block = bshell_scriptblock_create();
 	if (!sub_block) {
@@ -45,14 +45,18 @@ struct compile_result compile_block(
 
 enum bshell_status compile_block_immediate(
 	struct compile_ctx *ctx,
-	struct ast_node *src)
+	struct bshell_ast_node *src)
 {
 	enum bshell_status status = BSHELL_SUCCESS;
-	struct block_ast_node *block = (struct block_ast_node *)src;
+	struct bshell_block_ast_node *block = (struct bshell_block_ast_node *)
+		src;
 
 	fx_queue_entry *cur = fx_queue_first(&block->n_statements);
 	while (cur && status == BSHELL_SUCCESS) {
-		struct ast_node *node = fx_unbox(struct ast_node, cur, n_entry);
+		struct bshell_ast_node *node = fx_unbox(
+			struct bshell_ast_node,
+			cur,
+			n_entry);
 		status = compile_node(ctx, node);
 		cur = fx_queue_next(cur);
 	}

bshell.runtime/compile/command.c

@@ -4,9 +4,9 @@ enum bshell_status cmdcall_load(
 	struct compile_ctx *ctx,
 	struct compile_value *value)
 {
-	struct cmdcall_ast_node *cmdcall = (struct cmdcall_ast_node *)
+	struct bshell_cmdcall_ast_node *cmdcall;
-	                                           value->v_node;
+	cmdcall = (struct bshell_cmdcall_ast_node *)value->v_node;
-	bshell_scriptblock_push_instruction(ctx->c_block, OPCODE_PEXEC, 1);
+	bshell_scriptblock_push_instruction(ctx->c_block, BSHELL_OPCODE_PEXEC, 1);
 	return BSHELL_SUCCESS;
 }
 
@@ -14,12 +14,12 @@ enum bshell_status pipeline_load(
 	struct compile_ctx *ctx,
 	struct compile_value *value)
 {
-	struct pipeline_ast_node *pipeline = (struct pipeline_ast_node *)
+	struct bshell_pipeline_ast_node *pipeline;
-	                                             value->v_node;
+	pipeline = (struct bshell_pipeline_ast_node *)value->v_node;
 	size_t nr_items = fx_queue_length(&pipeline->n_stages);
 	bshell_scriptblock_push_instruction(
 		ctx->c_block,
-		OPCODE_PEXEC,
+		BSHELL_OPCODE_PEXEC,
 		nr_items);
 	return BSHELL_SUCCESS;
 }
@@ -34,9 +34,10 @@ static const struct compile_value_type pipeline_type = {
 
 struct compile_result compile_cmdcall(
 	struct compile_ctx *ctx,
-	struct ast_node *src)
+	struct bshell_ast_node *src)
 {
-	struct cmdcall_ast_node *cmdcall = (struct cmdcall_ast_node *)src;
+	struct bshell_cmdcall_ast_node *cmdcall;
+	cmdcall = (struct bshell_cmdcall_ast_node *)src;
 	size_t nr_args = fx_queue_length(&cmdcall->n_args);
 	for (size_t i = 0; i < nr_args; i++) {
 		struct compile_value *arg = compile_pop_value(ctx);
@@ -46,7 +47,7 @@ struct compile_result compile_cmdcall(
 
 	bshell_scriptblock_push_instruction(
 		ctx->c_block,
-		OPCODE_LDCMD,
+		BSHELL_OPCODE_LDCMD,
 		nr_args);
 
 	compile_push_value(ctx, &cmdcall_type, src);
@@ -55,13 +56,14 @@ struct compile_result compile_cmdcall(
 
 struct compile_result compile_pipeline(
 	struct compile_ctx *ctx,
-	struct ast_node *src)
+	struct bshell_ast_node *src)
 {
-	struct pipeline_ast_node *pipeline = (struct pipeline_ast_node *)src;
+	struct bshell_pipeline_ast_node *pipeline;
+	pipeline = (struct bshell_pipeline_ast_node *)src;
 	size_t nr_items = fx_queue_length(&pipeline->n_stages);
 	for (size_t i = 0; i < nr_items; i++) {
 		struct compile_value *item = compile_pop_value(ctx);
-		if (item->v_node->n_type != AST_CMDCALL) {
+		if (item->v_node->n_type != BSHELL_AST_CMDCALL) {
 			compile_value_load(ctx, item);
 		}
 		compile_value_destroy(item);

bshell.runtime/compile/compile-node.h

@@ -1,11 +1,11 @@
 #ifndef COMPILE_COMPILE_NODE_H_
 #define COMPILE_COMPILE_NODE_H_
 
-#include "../ast/ast.h"
+#include <bshell/ast.h>
-#include "../operator.h"
+#include <bshell/parse/token.h>
-#include "../parse/token.h"
+#include <bshell/runtime/operator.h>
-#include "../script-block.h"
+#include <bshell/runtime/script-block.h>
-
+#include <bshell/status.h>
 #include <fx/queue.h>
 #include <fx/vector.h>
 
@@ -27,7 +27,7 @@ struct compile_result {
 typedef struct compile_result (*compile_begin_impl)(struct compile_ctx *);
 typedef struct compile_result (*compile_end_impl)(struct compile_ctx *);
 typedef struct compile_result (
-	*compile_node_impl)(struct compile_ctx *, struct ast_node *);
+	*compile_node_impl)(struct compile_ctx *, struct bshell_ast_node *);
 
 enum compile_state_type_id {
 	COMPILE_NORMAL = 0,
@@ -43,11 +43,11 @@ struct compile_value_type {
 
 struct compile_value {
 	const struct compile_value_type *v_type;
-	enum operator_id v_op;
+	enum bshell_operator_id v_op;
 	struct compile_value *v_left, *v_right;
 	struct compile_value **v_args;
 	size_t v_nr_args;
-	struct ast_node *v_node;
+	struct bshell_ast_node *v_node;
 	unsigned long v_pool;
 	fx_queue_entry v_entry;
 };
@@ -94,11 +94,11 @@ extern struct compile_state *compile_get_state(const struct compile_ctx *ctx);
 extern enum bshell_status compile_push_value(
 	struct compile_ctx *ctx,
 	const struct compile_value_type *type,
-	struct ast_node *node);
+	struct bshell_ast_node *node);
 extern enum bshell_status compile_push_value_array(
 	struct compile_ctx *ctx,
 	const struct compile_value_type *type,
-	struct ast_node *node,
+	struct bshell_ast_node *node,
 	struct compile_value **values,
 	size_t nr_values);
 extern enum bshell_status compile_push_pool_value(
@@ -107,9 +107,9 @@ extern enum bshell_status compile_push_pool_value(
 	unsigned long pool_slot);
 extern enum bshell_status compile_push_op(
 	struct compile_ctx *ctx,
-	struct ast_node *node,
+	struct bshell_ast_node *node,
 	const struct compile_value_type *type,
-	enum operator_id op,
+	enum bshell_operator_id op,
 	struct compile_value *left,
 	struct compile_value *right);
 extern struct compile_value *compile_pop_value(struct compile_ctx *ctx);
@@ -128,60 +128,60 @@ extern enum bshell_status compile_resolve_labels(struct compile_ctx *ctx);
 
 extern struct compile_result compile_int(
 	struct compile_ctx *ctx,
-	struct ast_node *src);
+	struct bshell_ast_node *src);
 extern struct compile_result compile_double(
 	struct compile_ctx *ctx,
-	struct ast_node *src);
+	struct bshell_ast_node *src);
 extern struct compile_result compile_string(
 	struct compile_ctx *ctx,
-	struct ast_node *src);
+	struct bshell_ast_node *src);
 extern struct compile_result compile_word(
 	struct compile_ctx *ctx,
-	struct ast_node *src);
+	struct bshell_ast_node *src);
 extern struct compile_result compile_op(
 	struct compile_ctx *ctx,
-	struct ast_node *src);
+	struct bshell_ast_node *src);
 extern struct compile_result compile_var(
 	struct compile_ctx *ctx,
-	struct ast_node *src);
+	struct bshell_ast_node *src);
 
 extern struct compile_result compile_fstring(
 	struct compile_ctx *ctx,
-	struct ast_node *src);
+	struct bshell_ast_node *src);
 extern struct compile_result compile_array(
 	struct compile_ctx *ctx,
-	struct ast_node *src);
+	struct bshell_ast_node *src);
 extern struct compile_result compile_hashtable_item(
 	struct compile_ctx *ctx,
-	struct ast_node *src);
+	struct bshell_ast_node *src);
 extern struct compile_result compile_hashtable(
 	struct compile_ctx *ctx,
-	struct ast_node *src);
+	struct bshell_ast_node *src);
 
 extern struct compile_result compile_block(
 	struct compile_ctx *ctx,
-	struct ast_node *src);
+	struct bshell_ast_node *src);
 
 extern struct compile_result compile_cmdcall(
 	struct compile_ctx *ctx,
-	struct ast_node *src);
+	struct bshell_ast_node *src);
 extern struct compile_result compile_pipeline(
 	struct compile_ctx *ctx,
-	struct ast_node *src);
+	struct bshell_ast_node *src);
 
 extern enum bshell_status compile_if(
 	struct compile_ctx *ctx,
-	struct ast_node *src);
+	struct bshell_ast_node *src);
 
 extern enum bshell_status compile_block_immediate(
 	struct compile_ctx *ctx,
-	struct ast_node *src);
+	struct bshell_ast_node *src);
 
 extern enum bshell_status compile_expression(
 	struct compile_ctx *ctx,
-	struct ast_node *src);
+	struct bshell_ast_node *src);
 extern enum bshell_status compile_node(
 	struct compile_ctx *ctx,
-	struct ast_node *src);
+	struct bshell_ast_node *src);
 
 #endif

bshell.runtime/compile/compile.c

@@ -1,20 +1,17 @@
-#include "../compile.h"
-
-#include "../ast/ast.h"
-#include "../debug.h"
-#include "../status.h"
 #include "compile-node.h"
 
-#include <stdio.h>
+#include <bshell/ast.h>
+#include <bshell/compile.h>
+#include <bshell/status.h>
 
 extern enum bshell_status compile_node(
 	struct compile_ctx *ctx,
-	struct ast_node *src)
+	struct bshell_ast_node *src)
 {
 	switch (src->n_type) {
-	case AST_IF:
+	case BSHELL_AST_IF:
 		return compile_if(ctx, src);
-	case AST_BLOCK:
+	case BSHELL_AST_BLOCK:
 		return compile_block_immediate(ctx, src);
 	default:
 		return compile_expression(ctx, src);
@@ -24,7 +21,7 @@ extern enum bshell_status compile_node(
 }
 
 enum bshell_status bshell_compile(
-	struct ast_node *src,
+	struct bshell_ast_node *src,
 	bshell_scriptblock *dest)
 {
 	struct compile_ctx ctx = {.c_block = dest};

bshell.runtime/compile/const.c

@@ -4,10 +4,11 @@ enum bshell_status int_load(
 	struct compile_ctx *ctx,
 	struct compile_value *value)
 {
-	struct int_ast_node *i = (struct int_ast_node *)value->v_node;
+	struct bshell_int_ast_node *i
+		= (struct bshell_int_ast_node *)value->v_node;
 	long long v;
 	fx_value_get_longlong(&i->n_value->tok_number, &v);
-	bshell_scriptblock_push_instruction(ctx->c_block, OPCODE_LDC_INT, v);
+	bshell_scriptblock_push_instruction(ctx->c_block, BSHELL_OPCODE_LDC_INT, v);
 	return BSHELL_SUCCESS;
 }
 
@@ -15,11 +16,12 @@ enum bshell_status double_load(
 	struct compile_ctx *ctx,
 	struct compile_value *value)
 {
-	struct double_ast_node *d = (struct double_ast_node *)value->v_node;
+	struct bshell_double_ast_node *d
+		= (struct bshell_double_ast_node *)value->v_node;
 	double v;
 	fx_value_get_double(&d->n_value->tok_number, &v);
 	unsigned long index = bshell_scriptblock_get_double(ctx->c_block, v);
-	bshell_scriptblock_push_instruction(ctx->c_block, OPCODE_LDC_FP, index);
+	bshell_scriptblock_push_instruction(ctx->c_block, BSHELL_OPCODE_LDC_FP, index);
 	return BSHELL_SUCCESS;
 }
 
@@ -27,7 +29,8 @@ enum bshell_status string_load(
 	struct compile_ctx *ctx,
 	struct compile_value *value)
 {
-	struct string_ast_node *s = (struct string_ast_node *)value->v_node;
+	struct bshell_string_ast_node *s
+		= (struct bshell_string_ast_node *)value->v_node;
 	unsigned long index = bshell_scriptblock_get_string(
 		ctx->c_block,
 		s->n_value->tok_str);
@@ -37,7 +40,7 @@ enum bshell_status string_load(
 
 	bshell_scriptblock_push_instruction(
 		ctx->c_block,
-		OPCODE_LDC_STR,
+		BSHELL_OPCODE_LDC_STR,
 		index);
 	return BSHELL_SUCCESS;
 }
@@ -46,7 +49,8 @@ enum bshell_status word_load(
 	struct compile_ctx *ctx,
 	struct compile_value *value)
 {
-	struct word_ast_node *s = (struct word_ast_node *)value->v_node;
+	struct bshell_word_ast_node *s
+		= (struct bshell_word_ast_node *)value->v_node;
 	unsigned long index = bshell_scriptblock_get_string(
 		ctx->c_block,
 		s->n_value->tok_str);
@@ -56,7 +60,7 @@ enum bshell_status word_load(
 
 	bshell_scriptblock_push_instruction(
 		ctx->c_block,
-		OPCODE_LDC_STR,
+		BSHELL_OPCODE_LDC_STR,
 		index);
 	return BSHELL_SUCCESS;
 }
@@ -77,7 +81,9 @@ static const struct compile_value_type word_type = {
 	.v_load = word_load,
 };
 
-struct compile_result compile_int(struct compile_ctx *ctx, struct ast_node *src)
+struct compile_result compile_int(
+	struct compile_ctx *ctx,
+	struct bshell_ast_node *src)
 {
 	compile_push_value(ctx, &int_type, src);
 	return COMPILE_OK(0);
@@ -85,7 +91,7 @@ struct compile_result compile_int(struct compile_ctx *ctx, struct ast_node *src)
 
 struct compile_result compile_double(
 	struct compile_ctx *ctx,
-	struct ast_node *src)
+	struct bshell_ast_node *src)
 {
 	compile_push_value(ctx, &double_type, src);
 	return COMPILE_OK(0);
@@ -93,7 +99,7 @@ struct compile_result compile_double(
 
 struct compile_result compile_string(
 	struct compile_ctx *ctx,
-	struct ast_node *src)
+	struct bshell_ast_node *src)
 {
 	compile_push_value(ctx, &string_type, src);
 	return COMPILE_OK(0);
@@ -101,7 +107,7 @@ struct compile_result compile_string(
 
 struct compile_result compile_word(
 	struct compile_ctx *ctx,
-	struct ast_node *src)
+	struct bshell_ast_node *src)
 {
 	compile_push_value(ctx, &word_type, src);
 	return COMPILE_OK(0);

bshell.runtime/compile/expression.c

@@ -1,22 +1,22 @@
 #include "compile-node.h"
 
-static struct ast_iterate_result do_compile_node(
+static struct bshell_ast_iterate_result do_compile_node(
-	struct ast_node *node,
+	struct bshell_ast_node *node,
-	enum ast_iteration_type it_type,
+	enum bshell_ast_iteration_type it_type,
-	struct ast_iterator *it,
+	struct bshell_ast_iterator *it,
 	struct compile_ctx *ctx)
 {
-	if (it_type != AST_ITERATION_POST) {
+	if (it_type != BSHELL_AST_ITERATION_POST) {
 		int flags = 0;
 		switch (node->n_type) {
-		case AST_BLOCK:
+		case BSHELL_AST_BLOCK:
 			break;
 		default:
-			flags |= AST_ITERATE_ADD_CHILDREN;
+			flags |= BSHELL_AST_ITERATE_ADD_CHILDREN;
 			break;
 		}
 
-		return AST_ITERATE_OK(flags);
+		return BSHELL_AST_ITERATE_OK(flags);
 	}
 
 	ctx->c_depth = node->n_it.e_depth;
@@ -37,30 +37,34 @@ static struct ast_iterate_result do_compile_node(
 	}
 
 	if (!impl) {
-		return AST_ITERATE_OK(0);
+		return BSHELL_AST_ITERATE_OK(0);
 	}
 
 	struct compile_result result = impl(ctx, node);
 	unsigned int flags = 0;
 	if (result.r_flags & COMPILE_REPEAT_NODE) {
-		flags |= AST_ITERATE_REPEAT;
+		flags |= BSHELL_AST_ITERATE_REPEAT;
 	}
 
 	if (result.r_status == BSHELL_SUCCESS) {
-		return AST_ITERATE_OK(flags);
+		return BSHELL_AST_ITERATE_OK(flags);
 	}
 
-	return AST_ITERATE_ERR(result.r_status);
+	return BSHELL_AST_ITERATE_ERR(result.r_status);
 }
 
 enum bshell_status compile_expression(
 	struct compile_ctx *ctx,
-	struct ast_node *src)
+	struct bshell_ast_node *src)
 {
 	compile_push_state(ctx, COMPILE_NORMAL);
 
-	struct ast_iterator it = {0};
+	struct bshell_ast_iterator it = {0};
-	ast_node_iterate(src, &it, (ast_iterator_callback)do_compile_node, ctx);
+	bshell_ast_node_iterate(
+		src,
+		&it,
+		(bshell_ast_iterator_callback)do_compile_node,
+		ctx);
 
 	struct compile_value *result = compile_pop_value(ctx);
 	if (result) {

bshell.runtime/compile/fstring.c

@@ -4,15 +4,15 @@ enum bshell_status fstring_load(
 	struct compile_ctx *ctx,
 	struct compile_value *value)
 {
-	struct fstring_ast_node *fstring = (struct fstring_ast_node *)
+	struct bshell_fstring_ast_node *fstring
-	                                           value->v_node;
+		= (struct bshell_fstring_ast_node *)value->v_node;
 	for (size_t i = 0; i < value->v_nr_args; i++) {
 		compile_value_load(ctx, value->v_args[i]);
 	}
 
 	bshell_scriptblock_push_instruction(
 		ctx->c_block,
-		OPCODE_MK_STR,
+		BSHELL_OPCODE_MK_STR,
 		fx_queue_length(&fstring->n_elements));
 	return BSHELL_SUCCESS;
 }
@@ -23,9 +23,10 @@ static const struct compile_value_type fstring_type = {
 
 struct compile_result compile_fstring(
 	struct compile_ctx *ctx,
-	struct ast_node *src)
+	struct bshell_ast_node *src)
 {
-	struct fstring_ast_node *fstring = (struct fstring_ast_node *)src;
+	struct bshell_fstring_ast_node *fstring
+		= (struct bshell_fstring_ast_node *)src;
 	size_t nr_items = fx_queue_length(&fstring->n_elements);
 	struct compile_value **items = calloc(nr_items, sizeof *items);
 

bshell.runtime/compile/hashtable.c

@@ -5,9 +5,10 @@ static const struct compile_value_type hashtable_item_type = {};
 
 struct compile_result compile_hashtable(
 	struct compile_ctx *ctx,
-	struct ast_node *src)
+	struct bshell_ast_node *src)
 {
-	struct hashtable_ast_node *hashtable = (struct hashtable_ast_node *)src;
+	struct bshell_hashtable_ast_node *hashtable
+		= (struct bshell_hashtable_ast_node *)src;
 	size_t nr_items = fx_queue_length(&hashtable->n_items);
 	for (size_t i = 0; i < nr_items; i++) {
 		struct compile_value *item = compile_pop_value(ctx);
@@ -17,7 +18,7 @@ struct compile_result compile_hashtable(
 
 	bshell_scriptblock_push_instruction(
 		ctx->c_block,
-		OPCODE_MK_HTAB,
+		BSHELL_OPCODE_MK_HTAB,
 		nr_items);
 	compile_push_value(ctx, &hashtable_type, src);
 	return COMPILE_OK(0);
@@ -25,7 +26,7 @@ struct compile_result compile_hashtable(
 
 struct compile_result compile_hashtable_item(
 	struct compile_ctx *ctx,
-	struct ast_node *src)
+	struct bshell_ast_node *src)
 {
 	struct compile_value *value = compile_pop_value(ctx);
 	struct compile_value *key = compile_pop_value(ctx);

bshell.runtime/compile/if.c

@@ -1,8 +1,11 @@
 #include "compile-node.h"
 
-enum bshell_status compile_if(struct compile_ctx *ctx, struct ast_node *src)
+enum bshell_status compile_if(
+	struct compile_ctx *ctx,
+	struct bshell_ast_node *src)
 {
-	struct if_ast_node *if_group = (struct if_ast_node *)src;
+	struct bshell_if_ast_node *if_group;
+	if_group = (struct bshell_if_ast_node *)src;
 	size_t nr_labels = fx_queue_length(&if_group->n_branches);
 	// add one extra label for the end of the if group
 	nr_labels++;
@@ -20,8 +23,9 @@ enum bshell_status compile_if(struct compile_ctx *ctx, struct ast_node *src)
 	i = 0;
 	fx_queue_entry *cur = fx_queue_first(&if_group->n_branches);
 	while (cur) {
-		struct if_branch_ast_node *branch = fx_unbox(
+		struct bshell_if_branch_ast_node *branch;
-			struct if_branch_ast_node,
+		branch = fx_unbox(
+			struct bshell_if_branch_ast_node,
 			cur,
 			n_base.n_entry);
 		if (!branch->n_cond) {
@@ -29,7 +33,7 @@ enum bshell_status compile_if(struct compile_ctx *ctx, struct ast_node *src)
 			compile_ref_label(ctx, label_ids[nr_labels - 1]);
 			bshell_scriptblock_push_instruction(
 				ctx->c_block,
-				OPCODE_BR,
+				BSHELL_OPCODE_BR,
 				0);
 			break;
 		}
@@ -38,7 +42,7 @@ enum bshell_status compile_if(struct compile_ctx *ctx, struct ast_node *src)
 		compile_ref_label(ctx, label_ids[i++]);
 		bshell_scriptblock_push_instruction(
 			ctx->c_block,
-			OPCODE_BR_TRUE,
+			BSHELL_OPCODE_BR_TRUE,
 			0);
 
 		cur = fx_queue_next(cur);
@@ -47,8 +51,8 @@ enum bshell_status compile_if(struct compile_ctx *ctx, struct ast_node *src)
 	i = 0;
 	cur = fx_queue_first(&if_group->n_branches);
 	while (cur) {
-		struct if_branch_ast_node *branch = fx_unbox(
+		struct bshell_if_branch_ast_node *branch = fx_unbox(
-			struct if_branch_ast_node,
+			struct bshell_if_branch_ast_node,
 			cur,
 			n_base.n_entry);
 		if (!branch->n_cond) {
@@ -63,7 +67,7 @@ enum bshell_status compile_if(struct compile_ctx *ctx, struct ast_node *src)
 			compile_ref_label(ctx, label_ids[nr_labels - 1]);
 			bshell_scriptblock_push_instruction(
 				ctx->c_block,
-				OPCODE_BR,
+				BSHELL_OPCODE_BR,
 				0);
 		}
 	}

bshell.runtime/compile/normal.c

@@ -0,0 +1,25 @@
+#include "compile-node.h"
+
+static const compile_node_impl node_compilers[] = {
+	[BSHELL_AST_INT] = compile_int,
+	[BSHELL_AST_DOUBLE] = compile_double,
+	[BSHELL_AST_STRING] = compile_string,
+	[BSHELL_AST_WORD] = compile_word,
+	[BSHELL_AST_OP] = compile_op,
+	[BSHELL_AST_VAR] = compile_var,
+	[BSHELL_AST_FSTRING] = compile_fstring,
+	[BSHELL_AST_ARRAY] = compile_array,
+	[BSHELL_AST_HASHTABLE] = compile_hashtable,
+	[BSHELL_AST_HASHTABLE_ITEM] = compile_hashtable_item,
+	[BSHELL_AST_CMDCALL] = compile_cmdcall,
+	[BSHELL_AST_PIPELINE] = compile_pipeline,
+	[BSHELL_AST_BLOCK] = compile_block,
+};
+static const size_t nr_node_compilers = sizeof node_compilers
+                                      / sizeof node_compilers[0];
+
+const struct compile_state_type normal_state = {
+	.s_size = sizeof(struct compile_state),
+	.s_compile_node = node_compilers,
+	.s_nr_compile_node = nr_node_compilers,
+};

bshell.runtime/compile/op.c

@@ -0,0 +1,126 @@
+#include "compile-node.h"
+
+#include <bshell/runtime/operator.h>
+
+static enum bshell_opcode opcode_for_op(enum bshell_operator_id op)
+{
+	switch (op) {
+	case BSHELL_OP_ADD:
+		return BSHELL_OPCODE_ADD;
+	case BSHELL_OP_SUBTRACT:
+		return BSHELL_OPCODE_SUB;
+	case BSHELL_OP_MULTIPLY:
+		return BSHELL_OPCODE_MUL;
+	case BSHELL_OP_DIVIDE:
+		return BSHELL_OPCODE_DIV;
+	case BSHELL_OP_MODULO:
+		return BSHELL_OPCODE_MOD;
+	case BSHELL_OP_INCREMENT:
+		return BSHELL_OPCODE_INC;
+	case BSHELL_OP_DECREMENT:
+		return BSHELL_OPCODE_DEC;
+	case BSHELL_OP_LEFT_SHIFT:
+		return BSHELL_OPCODE_SHL;
+	case BSHELL_OP_RIGHT_SHIFT:
+		return BSHELL_OPCODE_SHR;
+	case BSHELL_OP_BINARY_AND:
+		return BSHELL_OPCODE_BAND;
+	case BSHELL_OP_BINARY_OR:
+		return BSHELL_OPCODE_BOR;
+	case BSHELL_OP_BINARY_XOR:
+		return BSHELL_OPCODE_BXOR;
+	case BSHELL_OP_BINARY_NOT:
+		return BSHELL_OPCODE_BNOT;
+	case BSHELL_OP_LESS_THAN:
+		return BSHELL_OPCODE_CMP_LT;
+	case BSHELL_OP_GREATER_THAN:
+		return BSHELL_OPCODE_CMP_GT;
+	case BSHELL_OP_EQUAL:
+		return BSHELL_OPCODE_CMP_EQ;
+	case BSHELL_OP_NOT_EQUAL:
+		return BSHELL_OPCODE_CMP_NE;
+	case BSHELL_OP_LESS_EQUAL:
+		return BSHELL_OPCODE_CMP_LE;
+	case BSHELL_OP_GREATER_EQUAL:
+		return BSHELL_OPCODE_CMP_GE;
+	case BSHELL_OP_LOGICAL_AND:
+		return BSHELL_OPCODE_LAND;
+	case BSHELL_OP_LOGICAL_OR:
+		return BSHELL_OPCODE_LOR;
+	case BSHELL_OP_LOGICAL_XOR:
+		return BSHELL_OPCODE_LXOR;
+	case BSHELL_OP_LOGICAL_NOT:
+		return BSHELL_OPCODE_LNOT;
+	case BSHELL_OP_RANGE:
+		return BSHELL_OPCODE_RANGE;
+	case BSHELL_OP_MATCH:
+		return BSHELL_OPCODE_MATCH;
+	case BSHELL_OP_REPLACE:
+		return BSHELL_OPCODE_REPLACE;
+	case BSHELL_OP_LIKE:
+		return BSHELL_OPCODE_LIKE;
+	case BSHELL_OP_IN:
+		return BSHELL_OPCODE_IN;
+	case BSHELL_OP_FORMAT:
+		return BSHELL_OPCODE_FMT;
+	case BSHELL_OP_CONTAINS:
+		return BSHELL_OPCODE_CONTAINS;
+	case BSHELL_OP_USPLIT:
+		return BSHELL_OPCODE_SPLIT;
+	case BSHELL_OP_BSPLIT:
+		return BSHELL_OPCODE_SPLIT;
+	case BSHELL_OP_UJOIN:
+		return BSHELL_OPCODE_JOIN;
+	case BSHELL_OP_BJOIN:
+		return BSHELL_OPCODE_JOIN;
+	case BSHELL_OP_IS:
+		return BSHELL_OPCODE_IS;
+	case BSHELL_OP_AS:
+		return BSHELL_OPCODE_AS;
+	case BSHELL_OP_ACCESS:
+		return BSHELL_OPCODE_LDPROP;
+	default:
+		return BSHELL_OPCODE_NOP;
+	}
+}
+
+enum bshell_status op_load(struct compile_ctx *ctx, struct compile_value *value)
+{
+	enum bshell_opcode opcode = opcode_for_op(value->v_op);
+	if (opcode != BSHELL_OPCODE_NOP) {
+		compile_value_load(ctx, value->v_right);
+		compile_value_load(ctx, value->v_left);
+		bshell_scriptblock_push_instruction(
+			ctx->c_block,
+			opcode_for_op(value->v_op),
+			0);
+		return BSHELL_SUCCESS;
+	}
+
+	switch (value->v_op) {
+	case BSHELL_OP_ASSIGN:
+		compile_value_load(ctx, value->v_right);
+		compile_value_store(ctx, value->v_left);
+		break;
+	default:
+		return BSHELL_ERR_NOT_SUPPORTED;
+	}
+
+	return BSHELL_SUCCESS;
+}
+
+static const struct compile_value_type op_type = {
+	.v_load = op_load,
+};
+
+struct compile_result compile_op(
+	struct compile_ctx *ctx,
+	struct bshell_ast_node *src)
+{
+	struct bshell_op_ast_node *op = (struct bshell_op_ast_node *)src;
+	struct compile_value *left = NULL, *right = NULL;
+	left = compile_pop_value(ctx);
+	right = compile_pop_value(ctx);
+	compile_push_op(ctx, src, &op_type, op->n_op->op_id, left, right);
+	return COMPILE_OK(0);
+}

bshell.runtime/compile/stack.c

@@ -3,7 +3,7 @@
 enum bshell_status compile_push_value(
 	struct compile_ctx *ctx,
 	const struct compile_value_type *type,
-	struct ast_node *node)
+	struct bshell_ast_node *node)
 {
 	struct compile_value *item = malloc(sizeof *item);
 	if (!item) {
@@ -22,7 +22,7 @@ enum bshell_status compile_push_value(
 enum bshell_status compile_push_value_array(
 	struct compile_ctx *ctx,
 	const struct compile_value_type *type,
-	struct ast_node *node,
+	struct bshell_ast_node *node,
 	struct compile_value **values,
 	size_t nr_values)
 {
@@ -63,9 +63,9 @@ enum bshell_status compile_push_pool_value(
 
 enum bshell_status compile_push_op(
 	struct compile_ctx *ctx,
-	struct ast_node *node,
+	struct bshell_ast_node *node,
 	const struct compile_value_type *type,
-	enum operator_id op,
+	enum bshell_operator_id op,
 	struct compile_value *left,
 	struct compile_value *right)
 {

bshell.runtime/compile/var.c

@@ -4,7 +4,8 @@ enum bshell_status var_load(
 	struct compile_ctx *ctx,
 	struct compile_value *value)
 {
-	struct var_ast_node *var = (struct var_ast_node *)value->v_node;
+	struct bshell_var_ast_node *var
+		= (struct bshell_var_ast_node *)value->v_node;
 	unsigned long index = bshell_scriptblock_get_string(
 		ctx->c_block,
 		var->n_ident->tok_str);
@@ -14,7 +15,7 @@ enum bshell_status var_load(
 
 	bshell_scriptblock_push_instruction(
 		ctx->c_block,
-		OPCODE_LDLOCAL,
+		BSHELL_OPCODE_LDLOCAL,
 		index);
 	return BSHELL_SUCCESS;
 }
@@ -23,7 +24,8 @@ enum bshell_status var_store(
 	struct compile_ctx *ctx,
 	struct compile_value *value)
 {
-	struct var_ast_node *var = (struct var_ast_node *)value->v_node;
+	struct bshell_var_ast_node *var
+		= (struct bshell_var_ast_node *)value->v_node;
 	unsigned long index = bshell_scriptblock_get_string(
 		ctx->c_block,
 		var->n_ident->tok_str);
@@ -33,7 +35,7 @@ enum bshell_status var_store(
 
 	bshell_scriptblock_push_instruction(
 		ctx->c_block,
-		OPCODE_STLOCAL,
+		BSHELL_OPCODE_STLOCAL,
 		index);
 	return BSHELL_SUCCESS;
 }
@@ -43,7 +45,9 @@ static const struct compile_value_type var_type = {
 	.v_store = var_store,
 };
 
-struct compile_result compile_var(struct compile_ctx *ctx, struct ast_node *src)
+struct compile_result compile_var(
+	struct compile_ctx *ctx,
+	struct bshell_ast_node *src)
 {
 	compile_push_value(ctx, &var_type, src);
 	return COMPILE_OK(0);

bshell.runtime/file.c

@@ -1,7 +1,5 @@
-#include "file.h"
+#include <bshell/file.h>
-
+#include <bshell/line-source.h>
-#include "line-source.h"
-
 #include <errno.h>
 #include <fx/collections/array.h>
 #include <fx/string.h>
@@ -9,24 +7,24 @@
 #include <string.h>
 
 static enum bshell_status get_name(
-	struct line_source *src,
+	struct bshell_line_source *src,
 	char *buf,
 	size_t count,
 	size_t *nr_read)
 {
-	struct file *f = (struct file *)src;
+	struct bshell_file *f = (struct bshell_file *)src;
 	*nr_read = snprintf(buf, count, "%s", f->f_path);
 	return BSHELL_SUCCESS;
 }
 
 static enum bshell_status get_row(
-	struct line_source *src,
+	struct bshell_line_source *src,
 	size_t row,
 	char *buf,
 	size_t count,
 	size_t *nr_read)
 {
-	struct file *f = (struct file *)src;
+	struct bshell_file *f = (struct bshell_file *)src;
 	size_t nr_rows = fx_array_get_size(f->f_lines);
 
 	if (row > nr_rows) {
@@ -50,10 +48,10 @@ static enum bshell_status get_row(
 }
 
 static enum bshell_status readline(
-	struct line_source *src,
+	struct bshell_line_source *src,
 	fx_stringstream *out)
 {
-	struct file *f = (struct file *)src;
+	struct bshell_file *f = (struct bshell_file *)src;
 	fx_wchar c = FX_WCHAR_INVALID;
 	size_t nr_read = 0;
 
@@ -78,7 +76,7 @@ static enum bshell_status readline(
 	return BSHELL_SUCCESS;
 }
 
-enum bshell_status file_open(const char *path, struct file **out)
+enum bshell_status bshell_file_open(const char *path, struct bshell_file **out)
 {
 	FILE *fp = fopen(path, "r");
 	if (!fp) {
@@ -87,7 +85,7 @@ enum bshell_status file_open(const char *path, struct file **out)
 
 	fx_stream *strp = fx_stream_open_fp(fp);
 
-	struct file *file = malloc(sizeof *file);
+	struct bshell_file *file = malloc(sizeof *file);
 	if (!file) {
 		fclose(fp);
 		return BSHELL_ERR_NO_MEMORY;
@@ -108,7 +106,7 @@ enum bshell_status file_open(const char *path, struct file **out)
 	return BSHELL_SUCCESS;
 }
 
-void file_close(struct file *file)
+void bshell_file_close(struct bshell_file *file)
 {
 	fx_stream_unref(file->f_strp);
 	fx_array_unref(file->f_lines);

bshell.runtime/format/command.c

@@ -0,0 +1,14 @@
+#include <bshell/format.h>
+
+static struct bshell_table_column command_table_columns[] = {
+	TABLE_COLUMN("command_type", "command_type", 13),
+	TABLE_COLUMN("name", "name", COL_WIDTH_INFINITE),
+	TABLE_COLUMN("version", "version", 12),
+	TABLE_COLUMN("source", "source", 35),
+};
+
+struct bshell_table command_bshell_table = {
+	.fmt_columns = command_table_columns,
+	.fmt_column_count
+	= sizeof command_table_columns / sizeof command_table_columns[0],
+};

bshell.runtime/format/format.c

@@ -1,5 +1,4 @@
-#include "format.h"
+#include <bshell/format.h>
-
 #include <fx/term/print.h>
 #include <fx/type.h>
 #include <fx/value-type.h>

bshell.runtime/format/hashtable.c

@@ -0,0 +1,12 @@
+#include <bshell/format.h>
+
+static struct bshell_table_column hashtable_table_columns[] = {
+	TABLE_COLUMN("key", "key", 37),
+	TABLE_COLUMN("value", "value", COL_WIDTH_INFINITE),
+};
+
+struct bshell_table hashtable_bshell_table = {
+	.fmt_columns = hashtable_table_columns,
+	.fmt_column_count
+	= sizeof hashtable_table_columns / sizeof hashtable_table_columns[0],
+};

bshell.runtime/format/table.c

@@ -1,5 +1,4 @@
-#include "format.h"
+#include <bshell/format.h>
-
 #include <fx/collections/array.h>
 #include <fx/iterator.h>
 #include <fx/reflection/type.h>
@@ -8,36 +7,36 @@
 #include <fx/term/tty.h>
 #include <fx/value.h>
 
-static fx_namemap table_formats = FX_NAMEMAP_INIT;
+static fx_namemap bshell_tables = FX_NAMEMAP_INIT;
 
-extern struct table_format hashtable_table_format;
+extern struct bshell_table hashtable_bshell_table;
-extern struct table_format verb_table_format;
+extern struct bshell_table verb_bshell_table;
-extern struct table_format command_table_format;
+extern struct bshell_table command_bshell_table;
 
-enum bshell_status table_format_init(void)
+enum bshell_status bshell_table_init(void)
 {
 	fx_namemap_put(
-		&table_formats,
+		&bshell_tables,
 		"fx.collections.hashtable",
-		&hashtable_table_format.fmt_entry);
+		&hashtable_bshell_table.fmt_entry);
 	fx_namemap_put(
-		&table_formats,
+		&bshell_tables,
 		"bshell.verb",
-		&verb_table_format.fmt_entry);
+		&verb_bshell_table.fmt_entry);
 	fx_namemap_put(
-		&table_formats,
+		&bshell_tables,
 		"bshell.command",
-		&command_table_format.fmt_entry);
+		&command_bshell_table.fmt_entry);
 	return BSHELL_SUCCESS;
 }
 
-const struct table_format *table_format_get_for_type(const fx_type *ty)
+const struct bshell_table *bshell_table_get_for_type(const fx_type *ty)
 {
 	while (ty) {
 		const char *name = fx_type_get_name(ty);
-		fx_namemap_entry *entry = fx_namemap_get(&table_formats, name);
+		fx_namemap_entry *entry = fx_namemap_get(&bshell_tables, name);
 		if (entry) {
-			return fx_unbox(struct table_format, entry, fmt_entry);
+			return fx_unbox(struct bshell_table, entry, fmt_entry);
 		}
 
 		ty = fx_type_get_parent(ty);
@@ -53,43 +52,43 @@ enum bshell_status format_object_table(fx_object *object, fx_stream *dest)
 		return BSHELL_ERR_NOT_SUPPORTED;
 	}
 
-	const struct table_format *fmt = table_format_get_for_type(type);
+	const struct bshell_table *fmt = bshell_table_get_for_type(type);
 	if (!fmt) {
 		return BSHELL_ERR_NOT_SUPPORTED;
 	}
 
-	struct table_format_ctx ctx;
+	struct bshell_table_ctx ctx;
-	table_format_ctx_init(&ctx, dest);
+	bshell_table_ctx_init(&ctx, dest);
 	fx_iterator *it = fx_iterator_begin(object);
 	if (!it) {
-		table_format_ctx_prepare_columns_from_format(
+		bshell_table_ctx_prepare_columns_from_format(
 			&ctx,
 			fx_type_get_by_id(fx_object_query_type(object)),
 			fmt);
-		table_format_ctx_print_headers(&ctx);
+		bshell_table_ctx_print_headers(&ctx);
-		table_format_ctx_print_record(&ctx, &FX_VALUE_OBJECT(object));
+		bshell_table_ctx_print_record(&ctx, &FX_VALUE_OBJECT(object));
 	} else {
 		fx_value first = fx_iterator_get_value(it);
 		if (first.v_type) {
-			table_format_ctx_prepare_columns_from_format(
+			bshell_table_ctx_prepare_columns_from_format(
 				&ctx,
 				fx_type_get_by_id(first.v_type),
 				fmt);
 		}
-		table_format_ctx_print_headers(&ctx);
+		bshell_table_ctx_print_headers(&ctx);
 		fx_foreach(value, it)
 		{
-			table_format_ctx_print_record(&ctx, &value);
+			bshell_table_ctx_print_record(&ctx, &value);
 		}
 	}
 
-	table_format_ctx_cleanup(&ctx);
+	bshell_table_ctx_cleanup(&ctx);
 
 	return BSHELL_SUCCESS;
 }
 
-enum bshell_status table_format_ctx_init(
+enum bshell_status bshell_table_ctx_init(
-	struct table_format_ctx *ctx,
+	struct bshell_table_ctx *ctx,
 	fx_stream *out)
 {
 	memset(ctx, 0x0, sizeof *ctx);
@@ -97,7 +96,7 @@ enum bshell_status table_format_ctx_init(
 	return BSHELL_SUCCESS;
 }
 
-enum bshell_status table_format_ctx_cleanup(struct table_format_ctx *ctx)
+enum bshell_status bshell_table_ctx_cleanup(struct bshell_table_ctx *ctx)
 {
 	if (ctx->ctx_columns) {
 		free(ctx->ctx_columns);
@@ -107,35 +106,34 @@ enum bshell_status table_format_ctx_cleanup(struct table_format_ctx *ctx)
 	return BSHELL_SUCCESS;
 }
 
-enum bshell_status table_format_ctx_prepare_columns_from_format(
+enum bshell_status bshell_table_ctx_prepare_columns_from_format(
-	struct table_format_ctx *ctx,
+	struct bshell_table_ctx *ctx,
 	const fx_type *record_type,
-	const struct table_format *fmt)
+	const struct bshell_table *fmt)
 {
 	if (!fmt && !record_type) {
 		return BSHELL_ERR_INVALID_ARGUMENT;
 	}
 
 	if (!fmt) {
-		fmt = table_format_get_for_type(record_type);
+		fmt = bshell_table_get_for_type(record_type);
 	}
 
 	if (!fmt) {
-		return table_format_ctx_prepare_columns_from_object(
+		return bshell_table_ctx_prepare_columns_from_object(
 			ctx,
 			record_type);
 	}
 
 	ctx->ctx_fmt = fmt;
-	struct table_format_ctx_column *columns = calloc(
+	struct bshell_table_ctx_column *columns
-		fmt->fmt_column_count,
+		= calloc(fmt->fmt_column_count, sizeof *columns);
-		sizeof *columns);
 
 	if (!columns) {
 		return BSHELL_ERR_NO_MEMORY;
 	}
 
-	const struct table_format_column *column_defs = fmt->fmt_columns;
+	const struct bshell_table_column *column_defs = fmt->fmt_columns;
 
 	ctx->ctx_columns = columns;
 	ctx->ctx_columns_count = fmt->fmt_column_count;
@@ -173,16 +171,16 @@ enum bshell_status table_format_ctx_prepare_columns_from_format(
 
 	for (size_t i = 0; i < fmt->fmt_column_count; i++) {
 		if (column_defs[i].col_width == COL_WIDTH_INFINITE) {
-			columns[i].col_width = tty_width
+			columns[i].col_width
-			                     / ctx->ctx_variable_columns_count;
+				= tty_width / ctx->ctx_variable_columns_count;
 		}
 	}
 
 	return BSHELL_SUCCESS;
 }
 
-enum bshell_status table_format_ctx_prepare_columns_from_object(
+enum bshell_status bshell_table_ctx_prepare_columns_from_object(
-	struct table_format_ctx *ctx,
+	struct bshell_table_ctx *ctx,
 	const fx_type *record_type)
 {
 	fx_array *properties = fx_array_create();
@@ -200,9 +198,8 @@ enum bshell_status table_format_ctx_prepare_columns_from_object(
 		return BSHELL_SUCCESS;
 	}
 
-	struct table_format_ctx_column *columns = calloc(
+	struct bshell_table_ctx_column *columns
-		column_count,
+		= calloc(column_count, sizeof *columns);
-		sizeof *columns);
 
 	if (!columns) {
 		fx_array_unref(properties);
@@ -235,11 +232,11 @@ enum bshell_status table_format_ctx_prepare_columns_from_object(
 	return BSHELL_SUCCESS;
 }
 
-enum bshell_status table_format_ctx_print_headers(struct table_format_ctx *ctx)
+enum bshell_status bshell_table_ctx_print_headers(struct bshell_table_ctx *ctx)
 {
 	fx_printf("[bold,bright_green]");
 	bool repeat = false;
-	struct table_format_ctx_column *c = NULL;
+	struct bshell_table_ctx_column *c = NULL;
 
 	do {
 		repeat = false;
@@ -276,7 +273,7 @@ enum bshell_status table_format_ctx_print_headers(struct table_format_ctx *ctx)
 	fx_stream_write_char(ctx->ctx_out, '\n');
 
 	for (size_t i = 0; i < ctx->ctx_columns_count; i++) {
-		struct table_format_ctx_column *c = &ctx->ctx_columns[i];
+		struct bshell_table_ctx_column *c = &ctx->ctx_columns[i];
 		if (c->col_width == 0) {
 			continue;
 		}
@@ -301,13 +298,13 @@ enum bshell_status table_format_ctx_print_headers(struct table_format_ctx *ctx)
 	return BSHELL_SUCCESS;
 }
 
-enum bshell_status table_format_ctx_print_record(
+enum bshell_status bshell_table_ctx_print_record(
-	struct table_format_ctx *ctx,
+	struct bshell_table_ctx *ctx,
 	const fx_value *record)
 {
 	fx_stringstream *strm = fx_stringstream_create();
 	for (size_t i = 0; i < ctx->ctx_columns_count; i++) {
-		struct table_format_ctx_column *c = &ctx->ctx_columns[i];
+		struct bshell_table_ctx_column *c = &ctx->ctx_columns[i];
 		if (c->col_width == 0) {
 			continue;
 		}

bshell.runtime/format/verb.c

@@ -1,13 +1,13 @@
-#include "format.h"
+#include <bshell/format.h>
 
-static struct table_format_column verb_table_columns[] = {
+static struct bshell_table_column verb_table_columns[] = {
 	TABLE_COLUMN("verb", "verb", 13),
 	TABLE_COLUMN("alias_prefix", "alias_prefix", 13),
 	TABLE_COLUMN("group", "group", 13),
 	TABLE_COLUMN("description", "description", COL_WIDTH_INFINITE),
 };
 
-struct table_format verb_table_format = {
+struct bshell_table verb_bshell_table = {
 	.fmt_columns = verb_table_columns,
 	.fmt_column_count = sizeof verb_table_columns
                           / sizeof verb_table_columns[0],

bshell.runtime/include/bshell/ast.h

@@ -0,0 +1,232 @@
+#ifndef BSHELL_AST_H_
+#define BSHELL_AST_H_
+
+#include <bshell/status.h>
+#include <fx/bstr.h>
+#include <fx/queue.h>
+
+struct bshell_lex_token;
+
+#define BSHELL_AST_ITERATE_OK(flags)                                           \
+	((struct bshell_ast_iterate_result) {.r_status = BSHELL_SUCCESS,       \
+	                                     .r_flags = (flags)})
+#define BSHELL_AST_ITERATE_ERR(status)                                         \
+	((struct bshell_ast_iterate_result) {.r_status = (status)})
+
+enum bshell_ast_node_type {
+	BSHELL_AST_NONE = 0x00u,
+	BSHELL_AST_NULL,
+	BSHELL_AST_STMT_LIST,
+	BSHELL_AST_INT,
+	BSHELL_AST_DOUBLE,
+	BSHELL_AST_WORD,
+	BSHELL_AST_STRING,
+	BSHELL_AST_FSTRING,
+	BSHELL_AST_VAR,
+	BSHELL_AST_VAR_SPLAT,
+	BSHELL_AST_FLAG,
+	BSHELL_AST_CMDCALL,
+	BSHELL_AST_FUNCALL,
+	BSHELL_AST_PIPELINE,
+	BSHELL_AST_REDIRECTION,
+	BSHELL_AST_BLOCK,
+	BSHELL_AST_FUNC,
+	BSHELL_AST_ARRAY,
+	BSHELL_AST_HASHTABLE,
+	BSHELL_AST_HASHTABLE_ITEM,
+	BSHELL_AST_OP,
+	BSHELL_AST_IF,
+	BSHELL_AST_IF_BRANCH,
+};
+
+struct bshell_ast_iterator_entry {
+	fx_queue_entry e_entry;
+	unsigned long e_depth;
+};
+
+struct bshell_ast_node {
+	enum bshell_ast_node_type n_type;
+	struct bshell_ast_node *n_parent;
+	fx_queue_entry n_entry;
+	struct bshell_ast_iterator_entry n_it;
+};
+
+struct bshell_null_ast_node {
+	struct bshell_ast_node n_base;
+};
+
+struct bshell_int_ast_node {
+	struct bshell_ast_node n_base;
+	struct bshell_lex_token *n_value;
+};
+
+struct bshell_double_ast_node {
+	struct bshell_ast_node n_base;
+	struct bshell_lex_token *n_value;
+};
+
+struct bshell_word_ast_node {
+	struct bshell_ast_node n_base;
+	struct bshell_lex_token *n_value;
+};
+
+struct bshell_string_ast_node {
+	struct bshell_ast_node n_base;
+	struct bshell_lex_token *n_value;
+};
+
+struct bshell_fstring_ast_node {
+	struct bshell_ast_node n_base;
+	fx_queue n_elements;
+};
+
+struct bshell_var_ast_node {
+	struct bshell_ast_node n_base;
+	struct bshell_lex_token *n_ident;
+};
+
+struct bshell_var_splat_ast_node {
+	struct bshell_ast_node n_base;
+	struct bshell_lex_token *n_ident;
+};
+
+struct bshell_cmdcall_ast_node {
+	struct bshell_ast_node n_base;
+	fx_queue n_args;
+	fx_queue n_redirect;
+};
+
+struct bshell_funcall_ast_node {
+	struct bshell_ast_node n_base;
+	struct bshell_ast_node *n_func;
+	fx_queue n_args;
+};
+
+struct bshell_pipeline_ast_node {
+	struct bshell_ast_node n_base;
+	fx_queue n_stages;
+};
+
+struct bshell_redirection_ast_node {
+	struct bshell_ast_node n_base;
+	bool n_append : 1;
+	bool n_out_is_fd : 1;
+	bool n_out_is_expr : 1;
+
+	unsigned int n_in, n_out;
+	struct bshell_ast_node *n_out_path_expr;
+	const char *n_out_path;
+	struct bshell_lex_token *n_out_tok;
+};
+
+struct bshell_stmt_list_ast_node {
+	struct bshell_ast_node n_base;
+	fx_queue n_statements;
+};
+
+struct bshell_block_ast_node {
+	struct bshell_ast_node n_base;
+	fx_queue n_statements;
+};
+
+struct bshell_func_ast_node {
+	struct bshell_ast_node n_base;
+	struct bshell_lex_token *n_name;
+	fx_queue n_params;
+	struct bshell_ast_node *n_body;
+};
+
+struct bshell_array_ast_node {
+	struct bshell_ast_node n_base;
+	fx_queue n_items;
+};
+
+struct bshell_hashtable_ast_node {
+	struct bshell_ast_node n_base;
+	fx_queue n_items;
+};
+
+struct bshell_hashtable_item_ast_node {
+	struct bshell_ast_node n_base;
+	struct bshell_ast_node *n_key, *n_value;
+};
+
+struct bshell_op_ast_node {
+	struct bshell_ast_node n_base;
+	const struct bshell_operator_info *n_op;
+	struct bshell_ast_node *n_left, *n_right;
+};
+
+struct bshell_if_branch_ast_node {
+	struct bshell_ast_node n_base;
+	struct bshell_ast_node *n_cond;
+	struct bshell_ast_node *n_body;
+};
+
+struct bshell_if_ast_node {
+	struct bshell_ast_node n_base;
+	fx_queue n_branches;
+};
+
+struct bshell_ast_iterator {
+	struct bshell_ast_node *it_cur;
+	fx_queue it_queue;
+	unsigned int it_depth;
+	fx_queue_entry *it_insert_after;
+};
+
+struct bshell_ast_iterate_result {
+	enum bshell_status r_status;
+	enum {
+		BSHELL_AST_ITERATE_CONTINUE = 0x00u,
+		BSHELL_AST_ITERATE_STOP = 0x01u,
+		BSHELL_AST_ITERATE_ADD_CHILDREN = 0x02u,
+		BSHELL_AST_ITERATE_REPEAT = 0x04u,
+	} r_flags;
+};
+
+enum bshell_ast_iteration_type {
+	BSHELL_AST_ITERATION_PRE,
+	BSHELL_AST_ITERATION_POST,
+};
+
+typedef struct bshell_ast_iterate_result (*bshell_ast_iterator_callback)(
+	struct bshell_ast_node *,
+	enum bshell_ast_iteration_type,
+	struct bshell_ast_iterator *,
+	void *);
+
+struct bshell_ast_node_definition {
+	enum bshell_ast_node_type def_id;
+	size_t def_node_size;
+	enum bshell_status (*def_collect_children)(
+		struct bshell_ast_node *,
+		struct bshell_ast_iterator *);
+	enum bshell_status (*def_cleanup)(struct bshell_ast_node *);
+	void (*def_to_string)(const struct bshell_ast_node *, fx_bstr *);
+};
+
+extern struct bshell_ast_node *bshell_ast_node_create(
+	enum bshell_ast_node_type type);
+extern void bshell_ast_node_destroy(struct bshell_ast_node *node);
+extern void bshell_ast_node_to_string(
+	const struct bshell_ast_node *node,
+	fx_bstr *out);
+extern enum bshell_status bshell_ast_node_iterate(
+	struct bshell_ast_node *node,
+	struct bshell_ast_iterator *it,
+	bshell_ast_iterator_callback callback,
+	void *arg);
+
+extern const char *bshell_ast_node_type_to_string(
+	enum bshell_ast_node_type type);
+
+extern struct bshell_ast_node *bshell_ast_iterator_peek(
+	struct bshell_ast_iterator *it);
+extern struct bshell_ast_node *bshell_ast_iterator_dequeue(
+	struct bshell_ast_iterator *it);
+extern void bshell_ast_iterator_enqueue(
+	struct bshell_ast_iterator *it,
+	struct bshell_ast_node *node);
+
+#endif

bshell.runtime/include/bshell/command/alias.h

@@ -1,5 +1,5 @@
-#ifndef COMMAND_ALIAS_H_
+#ifndef BSHELL_COMMAND_ALIAS_H_
-#define COMMAND_ALIAS_H_
+#define BSHELL_COMMAND_ALIAS_H_
 
 #include "../verb.h"
 

bshell.runtime/include/bshell/command/cmdlet.h

@@ -1,5 +1,5 @@
-#ifndef COMMAND_CMDLET_H_
+#ifndef BSHELL_COMMAND_CMDLET_H_
-#define COMMAND_CMDLET_H_
+#define BSHELL_COMMAND_CMDLET_H_
 
 #include "../verb.h"
 

bshell.runtime/include/bshell/command/command.h

@@ -1,5 +1,5 @@
-#ifndef COMMAND_COMMAND_H_
+#ifndef BSHELL_COMMAND_COMMAND_H_
-#define COMMAND_COMMAND_H_
+#define BSHELL_COMMAND_COMMAND_H_
 
 #include <fx/macros.h>
 #include <fx/reflection/type.h>

bshell.runtime/include/bshell/command/function.h

@@ -1,5 +1,5 @@
-#ifndef COMMAND_FUNCTION_H_
+#ifndef BSHELL_COMMAND_FUNCTION_H_
-#define COMMAND_FUNCTION_H_
+#define BSHELL_COMMAND_FUNCTION_H_
 
 #include <fx/macros.h>
 

bshell.runtime/include/bshell/compile.h

@@ -0,0 +1,12 @@
+#ifndef BSHELL_COMPILE_H_
+#define BSHELL_COMPILE_H_
+
+#include <bshell/runtime/script-block.h>
+
+struct bshell_ast_node;
+
+extern enum bshell_status bshell_compile(
+	struct bshell_ast_node *src,
+	bshell_scriptblock *dest);
+
+#endif

bshell.runtime/include/bshell/file.h

@@ -0,0 +1,21 @@
+#ifndef BSHELL_FILE_H_
+#define BSHELL_FILE_H_
+
+#include <bshell/line-source.h>
+#include <fx/collections/array.h>
+#include <stdio.h>
+
+struct bshell_file {
+	struct bshell_line_source f_base;
+	fx_array *f_lines;
+	char *f_path;
+	fx_stream *f_strp;
+	FILE *f_fp;
+};
+
+extern enum bshell_status bshell_file_open(
+	const char *path,
+	struct bshell_file **out);
+extern void bshell_file_close(struct bshell_file *file);
+
+#endif

bshell.runtime/include/bshell/format.h

@@ -1,8 +1,7 @@
-#ifndef FORMAT_H_
+#ifndef BSHELL_FORMAT_H_
-#define FORMAT_H_
+#define BSHELL_FORMAT_H_
-
-#include "../status.h"
 
+#include <bshell/status.h>
 #include <fx/namemap.h>
 #include <fx/object.h>
 #include <fx/queue.h>
@@ -19,19 +18,19 @@
 	}
 #define COL_WIDTH_INFINITE ((size_t)-1)
 
-struct table_format_column {
+struct bshell_table_column {
 	const char *col_display_name;
 	const char *col_property_name;
 	size_t col_width;
 };
 
-struct table_format {
+struct bshell_table {
 	fx_namemap_entry fmt_entry;
-	const struct table_format_column *fmt_columns;
+	const struct bshell_table_column *fmt_columns;
 	size_t fmt_column_count;
 };
 
-struct table_format_ctx_column {
+struct bshell_table_ctx_column {
 	const char *col_title;
 	size_t col_width;
 	size_t col_title_chars_written;
@@ -39,17 +38,17 @@ struct table_format_ctx_column {
 	const fx_property *col_property;
 };
 
-struct table_format_ctx {
+struct bshell_table_ctx {
-	const struct table_format *ctx_fmt;
+	const struct bshell_table *ctx_fmt;
-	struct table_format_ctx_column *ctx_columns;
+	struct bshell_table_ctx_column *ctx_columns;
 	size_t ctx_columns_count;
 	unsigned int ctx_tty_width;
 	size_t ctx_variable_columns_count;
 	fx_stream *ctx_out;
 };
 
-extern enum bshell_status table_format_init(void);
+extern enum bshell_status bshell_table_init(void);
-extern const struct table_format *table_format_get_for_type(const fx_type *ty);
+extern const struct bshell_table *bshell_table_get_for_type(const fx_type *ty);
 extern enum bshell_status format_object_table(
 	fx_object *object,
 	fx_stream *dest);
@@ -57,22 +56,22 @@ extern enum bshell_status format_value_default(
 	const fx_value *value,
 	fx_stream *dest);
 
-extern enum bshell_status table_format_ctx_init(
+extern enum bshell_status bshell_table_ctx_init(
-	struct table_format_ctx *ctx,
+	struct bshell_table_ctx *ctx,
 	fx_stream *out);
-extern enum bshell_status table_format_ctx_cleanup(
+extern enum bshell_status bshell_table_ctx_cleanup(
-	struct table_format_ctx *ctx);
+	struct bshell_table_ctx *ctx);
-extern enum bshell_status table_format_ctx_prepare_columns_from_format(
+extern enum bshell_status bshell_table_ctx_prepare_columns_from_format(
-	struct table_format_ctx *ctx,
+	struct bshell_table_ctx *ctx,
 	const fx_type *record_type,
-	const struct table_format *fmt);
+	const struct bshell_table *fmt);
-extern enum bshell_status table_format_ctx_prepare_columns_from_object(
+extern enum bshell_status bshell_table_ctx_prepare_columns_from_object(
-	struct table_format_ctx *ctx,
+	struct bshell_table_ctx *ctx,
 	const fx_type *record_type);
-extern enum bshell_status table_format_ctx_print_headers(
+extern enum bshell_status bshell_table_ctx_print_headers(
-	struct table_format_ctx *ctx);
+	struct bshell_table_ctx *ctx);
-extern enum bshell_status table_format_ctx_print_record(
+extern enum bshell_status bshell_table_ctx_print_record(
-	struct table_format_ctx *ctx,
+	struct bshell_table_ctx *ctx,
 	const fx_value *record);
 
 #endif

bshell.runtime/include/bshell/line-source.h

@@ -0,0 +1,40 @@
+#ifndef BSHELL_LINE_SOURCE_H_
+#define BSHELL_LINE_SOURCE_H_
+
+#include "status.h"
+
+#include <fx/stringstream.h>
+#include <stddef.h>
+
+struct bshell_line_source {
+	enum bshell_status (*s_get_name)(
+		struct bshell_line_source *,
+		char *,
+		size_t,
+		size_t *);
+	enum bshell_status (
+		*s_readline)(struct bshell_line_source *, fx_stringstream *);
+	enum bshell_status (*s_get_row)(
+		struct bshell_line_source *,
+		size_t,
+		char *,
+		size_t,
+		size_t *);
+};
+
+extern enum bshell_status bshell_line_source_get_name(
+	struct bshell_line_source *src,
+	char *buf,
+	size_t count,
+	size_t *nr_read);
+extern enum bshell_status bshell_line_source_readline(
+	struct bshell_line_source *src,
+	fx_stringstream *out);
+extern enum bshell_status bshell_line_source_get_row(
+	struct bshell_line_source *src,
+	size_t row,
+	char *buf,
+	size_t count,
+	size_t *nr_read);
+
+#endif

bshell.runtime/include/bshell/parse/lex.h

@@ -0,0 +1,97 @@
+#ifndef BSHELL_PARSE_LEX_H_
+#define BSHELL_PARSE_LEX_H_
+
+#include <bshell/parse/token.h>
+#include <bshell/status.h>
+#include <fx/queue.h>
+#include <fx/string.h>
+#include <fx/stringstream.h>
+
+#define BSHELL_LEX_STATE_MAX_TERMINATORS 16
+
+struct bshell_line_source;
+
+enum bshell_lex_flags {
+	LEX_PRINT_TOKENS = 0x01u,
+};
+
+enum bshell_lex_token_flags {
+	/* a token with this flag not only interrupts the word currently being
+	 * scanned, but also stops multi-words */
+	BSHELL_LEX_TOKEN_TERMINATES_WORD = 0x01u,
+	/* a token with this flag can appear at the start of an arithmetic
+	 * expression. a statement that encounters this token as its first char
+	 * will switch to arithmetic mode */
+	BSHELL_LEX_TOKEN_UNARY_ARITHMETIC = 0x02u,
+	/* if a token has this flag defined, the lexer will
+	 * switch to command mode after encountering it. */
+	BSHELL_LEX_TOKEN_COMMAND_MODE = 0x08u,
+	/* if a token has this flag defined, the lexer will
+	 * switch to statement mode after encountering it. */
+	BSHELL_LEX_TOKEN_STATEMENT_MODE = 0x10u,
+};
+
+enum bshell_lex_state_id {
+	BSHELL_LEX_STATE_STATEMENT = 0x01u,
+	BSHELL_LEX_STATE_COMMAND = 0x02u,
+	BSHELL_LEX_STATE_ARITHMETIC = 0x04u,
+	BSHELL_LEX_STATE_STRING = 0x08u,
+	BSHELL_LEX_STATE_WORD = 0x10u,
+	BSHELL_LEX_STATE_HASHTABLE = 0x20u,
+};
+
+struct bshell_lex_token_definition {
+	int id;
+	const char *name;
+	uint64_t name_hash;
+	enum bshell_lex_state_id enabled_states;
+	enum bshell_lex_token_flags flags;
+};
+
+struct bshell_lex_symbol_node {
+	char s_char;
+	struct bshell_lex_token_definition *s_def;
+
+	fx_queue_entry s_entry;
+	fx_queue s_children;
+};
+
+struct bshell_lex_state {
+	const struct bshell_lex_state_type *s_type;
+	unsigned int s_terminators[BSHELL_LEX_STATE_MAX_TERMINATORS];
+	unsigned int s_nr_terminators;
+	unsigned int s_paren_depth;
+	fx_queue_entry s_entry;
+	fx_string *s_tempstr;
+	unsigned int s_flags;
+};
+
+struct bshell_lex_ctx {
+	enum bshell_lex_flags lex_flags;
+	fx_queue lex_tokens;
+	struct bshell_line_source *lex_src;
+	fx_stringstream *lex_buf;
+	fx_string *lex_tmp;
+	fx_wchar lex_ch;
+	fx_queue lex_state;
+	void (*lex_token_scanned)(
+		struct bshell_lex_ctx *,
+		struct bshell_lex_token *);
+	enum bshell_lex_token_type lex_prev_token;
+	struct bshell_char_cell lex_cursor, lex_start, lex_end;
+	struct bshell_lex_symbol_node *lex_sym_tree;
+	enum bshell_status lex_status;
+};
+
+extern enum bshell_status bshell_lex_ctx_init(
+	struct bshell_lex_ctx *ctx,
+	enum bshell_lex_flags flags,
+	struct bshell_line_source *src);
+extern enum bshell_status bshell_lex_ctx_cleanup(struct bshell_lex_ctx *ctx);
+
+extern struct bshell_lex_token *bshell_lex_ctx_peek(struct bshell_lex_ctx *ctx);
+extern struct bshell_lex_token *bshell_lex_ctx_claim(
+	struct bshell_lex_ctx *ctx);
+extern void bshell_lex_ctx_discard(struct bshell_lex_ctx *ctx);
+
+#endif

bshell.runtime/include/bshell/parse/parse.h

@@ -0,0 +1,22 @@
+#ifndef BSHELL_PARSE_PARSE_H_
+#define BSHELL_PARSE_PARSE_H_
+
+#include <bshell/status.h>
+
+struct bshell_lex_ctx;
+struct bshell_ast_node;
+
+struct bshell_parse_ctx {
+	struct bshell_lex_ctx *p_src;
+	enum bshell_status p_status;
+};
+
+extern enum bshell_status bshell_parse_ctx_init(
+	struct bshell_parse_ctx *ctx,
+	struct bshell_lex_ctx *src);
+extern void bshell_parse_ctx_cleanup(struct bshell_parse_ctx *ctx);
+
+extern struct bshell_ast_node *bshell_parse_ctx_read_node(
+	struct bshell_parse_ctx *ctx);
+
+#endif

bshell.runtime/include/bshell/parse/token.h

@@ -0,0 +1,190 @@
+#ifndef BSHELL_PARSE_TOKEN_H_
+#define BSHELL_PARSE_TOKEN_H_
+
+#include <fx/queue.h>
+#include <fx/value.h>
+#include <stdbool.h>
+
+struct bshell_char_cell {
+	unsigned long c_row, c_col;
+};
+
+enum bshell_lex_token_type {
+	BSHELL_TOK_NONE = 0,
+	__BSHELL_TOK_INDEX_BASE = 100,
+	BSHELL_TOK_KEYWORD,
+	BSHELL_TOK_SYMBOL,
+	BSHELL_TOK_INT,
+	BSHELL_TOK_DOUBLE,
+	BSHELL_TOK_WORD,
+	BSHELL_TOK_WORD_START,
+	BSHELL_TOK_WORD_END,
+	BSHELL_TOK_FLAG,
+	BSHELL_TOK_OPERATOR,
+	BSHELL_TOK_VAR,
+	BSHELL_TOK_VAR_SPLAT,
+	BSHELL_TOK_STRING,
+	BSHELL_TOK_STR_START,
+	BSHELL_TOK_STR_END,
+	BSHELL_TOK_LINEFEED,
+	__BSHELL_TOK_INDEX_LIMIT,
+};
+
+enum bshell_lex_keyword {
+	BSHELL_KW_NONE = 0,
+	__BSHELL_KW_INDEX_BASE = 200,
+	BSHELL_KW_FUNC,
+	BSHELL_KW_IF,
+	BSHELL_KW_ELSEIF,
+	BSHELL_KW_ELSE,
+	__BSHELL_KW_INDEX_LIMIT,
+};
+
+enum bshell_lex_operator {
+	BSHELL_TKOP_NONE = 0,
+	__BSHELL_TKOP_INDEX_BASE = 300,
+	BSHELL_TKOP_F,
+	BSHELL_TKOP_BAND,
+	BSHELL_TKOP_BOR,
+	BSHELL_TKOP_BXOR,
+	BSHELL_TKOP_BNOT,
+	BSHELL_TKOP_SHL,
+	BSHELL_TKOP_SHR,
+	BSHELL_TKOP_EQ,
+	BSHELL_TKOP_NE,
+	BSHELL_TKOP_GT,
+	BSHELL_TKOP_LT,
+	BSHELL_TKOP_GE,
+	BSHELL_TKOP_LE,
+	BSHELL_TKOP_MATCH,
+	BSHELL_TKOP_NOTMATCH,
+	BSHELL_TKOP_REPLACE,
+	BSHELL_TKOP_LIKE,
+	BSHELL_TKOP_NOTLIKE,
+	BSHELL_TKOP_IN,
+	BSHELL_TKOP_NOTIN,
+	BSHELL_TKOP_CONTAINS,
+	BSHELL_TKOP_NOTCONTAINS,
+	BSHELL_TKOP_AND,
+	BSHELL_TKOP_OR,
+	BSHELL_TKOP_XOR,
+	BSHELL_TKOP_NOT,
+	BSHELL_TKOP_SPLIT,
+	BSHELL_TKOP_JOIN,
+	BSHELL_TKOP_IS,
+	BSHELL_TKOP_ISNOT,
+	BSHELL_TKOP_AS,
+	__BSHELL_TKOP_INDEX_LIMIT,
+};
+
+enum bshell_lex_symbol {
+	BSHELL_SYM_NONE = 0,
+	__BSHELL_SYM_INDEX_BASE = 400,
+	BSHELL_SYM_BANG,
+	BSHELL_SYM_PLUS,
+	BSHELL_SYM_HYPHEN,
+	BSHELL_SYM_FORWARD_SLASH,
+	BSHELL_SYM_ASTERISK,
+	BSHELL_SYM_AMPERSAND,
+	BSHELL_SYM_PERCENT,
+	BSHELL_SYM_SQUOTE,
+	BSHELL_SYM_DQUOTE,
+	BSHELL_SYM_HASH,
+	BSHELL_SYM_COLON_COLON,
+	BSHELL_SYM_SEMICOLON,
+	BSHELL_SYM_COMMA,
+	BSHELL_SYM_DOLLAR,
+	BSHELL_SYM_DOLLAR_LEFT_PAREN,
+	BSHELL_SYM_DOLLAR_LEFT_BRACE,
+	BSHELL_SYM_DOT,
+	BSHELL_SYM_DOT_DOT,
+	BSHELL_SYM_PIPE,
+	BSHELL_SYM_AT,
+	BSHELL_SYM_AT_LEFT_PAREN,
+	BSHELL_SYM_AT_LEFT_BRACE,
+	BSHELL_SYM_LEFT_BRACE,
+	BSHELL_SYM_RIGHT_BRACE,
+	BSHELL_SYM_LEFT_BRACKET,
+	BSHELL_SYM_RIGHT_BRACKET,
+	BSHELL_SYM_LEFT_PAREN,
+	BSHELL_SYM_RIGHT_PAREN,
+	BSHELL_SYM_EQUAL,
+	BSHELL_SYM_PLUS_EQUAL,
+	BSHELL_SYM_HYPHEN_EQUAL,
+	BSHELL_SYM_ASTERISK_EQUAL,
+	BSHELL_SYM_FORWARD_SLASH_EQUAL,
+	BSHELL_SYM_PERCENT_EQUAL,
+	BSHELL_SYM_QUESTION_DOT,
+	BSHELL_SYM_QUESTION_LEFT_BRACKET,
+	__BSHELL_SYM_INDEX_LIMIT,
+};
+
+struct bshell_lex_token {
+	enum bshell_lex_token_type tok_type;
+
+	struct bshell_char_cell tok_start, tok_end;
+
+	fx_queue_entry tok_entry;
+
+	union {
+		enum bshell_lex_keyword tok_keyword;
+		enum bshell_lex_symbol tok_symbol;
+		enum bshell_lex_operator tok_operator;
+		fx_value tok_number;
+		char *tok_str;
+	};
+};
+
+extern struct bshell_lex_token *bshell_lex_token_create(
+	enum bshell_lex_token_type type);
+extern struct bshell_lex_token *bshell_lex_token_create_with_string(
+	enum bshell_lex_token_type type,
+	const char *s);
+extern void bshell_lex_token_destroy(struct bshell_lex_token *tok);
+
+extern struct bshell_lex_token *bshell_lex_token_change_type(
+	struct bshell_lex_token *tok,
+	enum bshell_lex_token_type new_type);
+extern void bshell_lex_token_change_string(
+	struct bshell_lex_token *tok,
+	const char *s);
+
+static inline bool bshell_lex_token_is_symbol(
+	struct bshell_lex_token *tok,
+	enum bshell_lex_symbol sym)
+{
+	return (tok->tok_type == BSHELL_TOK_SYMBOL && tok->tok_symbol == sym);
+}
+static inline bool bshell_lex_token_is_keyword(
+	struct bshell_lex_token *tok,
+	enum bshell_lex_keyword kw)
+{
+	return (tok->tok_type == BSHELL_TOK_KEYWORD && tok->tok_keyword == kw);
+}
+static inline bool bshell_lex_token_type_has_string_value(
+	enum bshell_lex_token_type type)
+{
+	switch (type) {
+	case BSHELL_TOK_WORD:
+	case BSHELL_TOK_STRING:
+	case BSHELL_TOK_FLAG:
+	case BSHELL_TOK_VAR:
+	case BSHELL_TOK_VAR_SPLAT:
+		return true;
+	default:
+		return false;
+	}
+}
+static inline bool bshell_lex_token_has_string_value(
+	const struct bshell_lex_token *tok)
+{
+	return bshell_lex_token_type_has_string_value(tok->tok_type);
+}
+
+extern const char *bshell_token_type_to_string(enum bshell_lex_token_type type);
+extern const char *bshell_lex_keyword_to_string(
+	enum bshell_lex_keyword keyword);
+extern const char *bshell_lex_symbol_to_string(enum bshell_lex_symbol sym);
+extern const char *bshell_lex_operator_to_string(enum bshell_lex_operator op);
+
+#endif

bshell.runtime/include/bshell/runtime/cmdcall.h

@@ -1,5 +1,5 @@
-#ifndef RUNTIME_CMDCALL_H_
+#ifndef BSHELL_RUNTIME_CMDCALL_H_
-#define RUNTIME_CMDCALL_H_
+#define BSHELL_RUNTIME_CMDCALL_H_
 
 #include <fx/macros.h>
 #include <fx/value.h>

bshell.runtime/include/bshell/runtime/opcode.h

@@ -0,0 +1,82 @@
+#ifndef BSHELL_RUNTIME_OPCODE_H_
+#define BSHELL_RUNTIME_OPCODE_H_
+
+#include <stdint.h>
+
+#define BSHELL_INSTRUCTION_INVALID 0xFFFFFFFF
+
+typedef uint32_t bshell_instruction;
+
+enum bshell_opcode {
+	BSHELL_OPCODE_NOP = 0,
+	BSHELL_OPCODE_LDC_INT,
+	BSHELL_OPCODE_LDC_STR,
+	BSHELL_OPCODE_LDC_FP,
+	BSHELL_OPCODE_LDGLOBAL,
+	BSHELL_OPCODE_LDLOCAL,
+	BSHELL_OPCODE_LDBLOCK,
+	BSHELL_OPCODE_LDENV,
+	BSHELL_OPCODE_LDSTATIC,
+	BSHELL_OPCODE_LDARG,
+	BSHELL_OPCODE_LDPROP,
+	BSHELL_OPCODE_LDELEM,
+	BSHELL_OPCODE_LDELEM_C,
+	BSHELL_OPCODE_STLOCAL,
+	BSHELL_OPCODE_STPROP,
+	BSHELL_OPCODE_STELEM,
+	BSHELL_OPCODE_LDCMD,
+	BSHELL_OPCODE_PEXEC,
+	BSHELL_OPCODE_CALL,
+	BSHELL_OPCODE_MK_STR,
+	BSHELL_OPCODE_MK_ARRAY,
+	BSHELL_OPCODE_MK_HTAB,
+	BSHELL_OPCODE_POP,
+	BSHELL_OPCODE_ADD,
+	BSHELL_OPCODE_SUB,
+	BSHELL_OPCODE_MUL,
+	BSHELL_OPCODE_DIV,
+	BSHELL_OPCODE_ADD_IP,
+	BSHELL_OPCODE_MOD,
+	BSHELL_OPCODE_INC,
+	BSHELL_OPCODE_DEC,
+	BSHELL_OPCODE_SHL,
+	BSHELL_OPCODE_SHR,
+	BSHELL_OPCODE_BAND,
+	BSHELL_OPCODE_BOR,
+	BSHELL_OPCODE_BXOR,
+	BSHELL_OPCODE_BNOT,
+	BSHELL_OPCODE_CMP_NULL,
+	BSHELL_OPCODE_CMP_EQ,
+	BSHELL_OPCODE_CMP_NE,
+	BSHELL_OPCODE_CMP_LT,
+	BSHELL_OPCODE_CMP_GT,
+	BSHELL_OPCODE_CMP_LE,
+	BSHELL_OPCODE_CMP_GE,
+	BSHELL_OPCODE_LAND,
+	BSHELL_OPCODE_LOR,
+	BSHELL_OPCODE_LXOR,
+	BSHELL_OPCODE_LNOT,
+	BSHELL_OPCODE_BR,
+	BSHELL_OPCODE_BR_TRUE,
+	BSHELL_OPCODE_RANGE,
+	BSHELL_OPCODE_MATCH,
+	BSHELL_OPCODE_REPLACE,
+	BSHELL_OPCODE_LIKE,
+	BSHELL_OPCODE_IN,
+	BSHELL_OPCODE_FMT,
+	BSHELL_OPCODE_CONTAINS,
+	BSHELL_OPCODE_SPLIT,
+	BSHELL_OPCODE_JOIN,
+	BSHELL_OPCODE_IS,
+	BSHELL_OPCODE_AS,
+};
+
+extern bshell_instruction bshell_instruction_encode(
+	enum bshell_opcode opcode,
+	uint32_t arg);
+extern void bshell_instruction_decode(
+	bshell_instruction instr,
+	enum bshell_opcode *out_opcode,
+	uint32_t *out_arg);
+
+#endif

bshell.runtime/include/bshell/runtime/operator.h

@@ -0,0 +1,126 @@
+#ifndef BSHELL_RUNTIME_OPERATOR_H_
+#define BSHELL_RUNTIME_OPERATOR_H_
+
+enum bshell_operator_precedence {
+	BSHELL_PRECEDENCE_MINIMUM = 0,
+	BSHELL_PRECEDENCE_ASSIGN,
+	BSHELL_PRECEDENCE_PIPELINE,
+	BSHELL_PRECEDENCE_LOGICAL,
+	BSHELL_PRECEDENCE_BITWISE,
+	BSHELL_PRECEDENCE_COMPARISON,
+	BSHELL_PRECEDENCE_ADDITION,
+	BSHELL_PRECEDENCE_MULTIPLICATION,
+	BSHELL_PRECEDENCE_NEGATE,
+	BSHELL_PRECEDENCE_FORMAT,
+	BSHELL_PRECEDENCE_RANGE,
+	BSHELL_PRECEDENCE_NOT,
+	BSHELL_PRECEDENCE_INCREMENT,
+	BSHELL_PRECEDENCE_ARRAY,
+	BSHELL_PRECEDENCE_JOIN,
+	BSHELL_PRECEDENCE_SPLIT,
+	BSHELL_PRECEDENCE_CAST,
+	BSHELL_PRECEDENCE_SUBSCRIPT,
+	BSHELL_PRECEDENCE_STATIC_ACCESS,
+	BSHELL_PRECEDENCE_MEMBER_ACCESS,
+	BSHELL_PRECEDENCE_PARENTHESIS,
+};
+
+enum bshell_operator_associativity {
+	BSHELL_ASSOCIATIVITY_LEFT,
+	BSHELL_ASSOCIATIVITY_RIGHT,
+};
+
+enum bshell_operator_location {
+	BSHELL_OPL_PREFIX,
+	BSHELL_OPL_INFIX,
+	BSHELL_OPL_POSTFIX,
+};
+
+enum bshell_operator_arity {
+	BSHELL_OPA_UNARY,
+	BSHELL_OPA_BINARY,
+};
+
+enum bshell_operator_id {
+	BSHELL_OP_NONE = 0,
+	BSHELL_OP_ADD,
+	BSHELL_OP_SUBTRACT,
+	BSHELL_OP_MULTIPLY,
+	BSHELL_OP_DIVIDE,
+	BSHELL_OP_MODULO,
+	BSHELL_OP_INCREMENT,
+	BSHELL_OP_DECREMENT,
+	BSHELL_OP_LEFT_SHIFT,
+	BSHELL_OP_RIGHT_SHIFT,
+	BSHELL_OP_BINARY_AND,
+	BSHELL_OP_BINARY_OR,
+	BSHELL_OP_BINARY_XOR,
+	BSHELL_OP_BINARY_NOT,
+	BSHELL_OP_LESS_THAN,
+	BSHELL_OP_GREATER_THAN,
+	BSHELL_OP_EQUAL,
+	BSHELL_OP_NOT_EQUAL,
+	BSHELL_OP_LESS_EQUAL,
+	BSHELL_OP_GREATER_EQUAL,
+	BSHELL_OP_ASSIGN,
+	BSHELL_OP_ADD_ASSIGN,
+	BSHELL_OP_SUBTRACT_ASSIGN,
+	BSHELL_OP_MULTIPLY_ASSIGN,
+	BSHELL_OP_DIVIDE_ASSIGN,
+	BSHELL_OP_MODULO_ASSIGN,
+	BSHELL_OP_LOGICAL_AND,
+	BSHELL_OP_LOGICAL_OR,
+	BSHELL_OP_LOGICAL_XOR,
+	BSHELL_OP_LOGICAL_NOT,
+	BSHELL_OP_RANGE,
+	BSHELL_OP_MATCH,
+	BSHELL_OP_NOTMATCH,
+	BSHELL_OP_REPLACE,
+	BSHELL_OP_LIKE,
+	BSHELL_OP_NOTLIKE,
+	BSHELL_OP_IN,
+	BSHELL_OP_NOTIN,
+	BSHELL_OP_FORMAT,
+	BSHELL_OP_CONTAINS,
+	BSHELL_OP_NOTCONTAINS,
+	BSHELL_OP_USPLIT,
+	BSHELL_OP_BSPLIT,
+	BSHELL_OP_UJOIN,
+	BSHELL_OP_BJOIN,
+	BSHELL_OP_IS,
+	BSHELL_OP_ISNOT,
+	BSHELL_OP_AS,
+
+	BSHELL_OP_SUBSCRIPT,
+	BSHELL_OP_CONDITIONAL_SUBSCRIPT,
+
+	BSHELL_OP_ARRAY_DELIMITER,
+	BSHELL_OP_ACCESS,
+	BSHELL_OP_STATIC_ACCESS,
+	BSHELL_OP_CONDITIONAL_ACCESS,
+
+	/* these are not real operators, and are just used internally by the
+	 * parser. */
+	BSHELL_OP_CAST,
+	BSHELL_OP_SUBEXPR,
+	BSHELL_OP_PAREN,
+	BSHELL_OP_SCRIPTBLOCK,
+	BSHELL_OP_ARRAY_START,
+	BSHELL_OP_HASHTABLE_START,
+};
+
+struct bshell_operator_info {
+	enum bshell_operator_id op_id;
+	enum bshell_operator_precedence op_precedence;
+	enum bshell_operator_associativity op_associativity;
+	enum bshell_operator_location op_location;
+	enum bshell_operator_arity op_arity;
+};
+
+extern const struct bshell_operator_info *bshell_operator_get_by_id(
+	enum bshell_operator_id id);
+extern const struct bshell_operator_info *bshell_operator_get_by_token(
+	unsigned int token);
+extern const char *bshell_operator_id_to_string(enum bshell_operator_id op);
+
+#endif

bshell.runtime/include/bshell/runtime/pipeline.h

@@ -1,5 +1,5 @@
-#ifndef RUNTIME_PIPELINE_H_
+#ifndef BSHELL_RUNTIME_PIPELINE_H_
-#define RUNTIME_PIPELINE_H_
+#define BSHELL_RUNTIME_PIPELINE_H_
 
 #include "../command/command.h"
 #include "../runtime/cmdcall.h"

bshell.runtime/include/bshell/runtime/runtime.h

@@ -1,18 +1,17 @@
-#ifndef RUNTIME_RUNTIME_H_
+#ifndef BSHELL_RUNTIME_RUNTIME_H_
-#define RUNTIME_RUNTIME_H_
+#define BSHELL_RUNTIME_RUNTIME_H_
-
-#include "../command/command.h"
-#include "../script-block.h"
-#include "var.h"
 
+#include <bshell/command/command.h>
+#include <bshell/runtime/script-block.h>
+#include <bshell/runtime/var.h>
 #include <fx/collections/hashtable.h>
 #include <fx/queue.h>
 #include <fx/value.h>
 
-struct runtime_scope;
+struct bshell_runtime_scope;
 
 struct bshell_runtime {
-	struct runtime_scope *rt_global;
+	struct bshell_runtime_scope *rt_global;
 	fx_hashtable *rt_aliases;
 	fx_queue rt_scope;
 };
@@ -44,4 +43,10 @@ extern enum bshell_status bshell_runtime_push_scope(
 extern enum bshell_status bshell_runtime_pop_scope(struct bshell_runtime *rt);
 extern fx_value bshell_runtime_eval(struct bshell_runtime *rt);
 
+extern struct bshell_runtime_scope *bshell_runtime_get_current_scope(
+	struct bshell_runtime *rt);
+extern struct bshell_runtime_scope *bshell_runtime_get_parent_scope(
+	struct bshell_runtime *rt,
+	struct bshell_runtime_scope *scope);
+
 #endif

bshell.runtime/include/bshell/runtime/scope.h

@@ -0,0 +1,11 @@
+#ifndef BSHELL_RUNTIME_SCOPE_H_
+#define BSHELL_RUNTIME_SCOPE_H_
+
+#include <fx/collections/hashtable.h>
+
+struct bshell_runtime_scope;
+
+extern fx_hashtable *bshell_runtime_scope_get_functions(
+	struct bshell_runtime_scope *scope);
+
+#endif

bshell.runtime/include/bshell/runtime/script-block.h

@@ -1,8 +1,7 @@
-#ifndef SCRIPT_BLOCK_H_
+#ifndef BSHELL_RUNTIME_SCRIPT_BLOCK_H_
-#define SCRIPT_BLOCK_H_
+#define BSHELL_RUNTIME_SCRIPT_BLOCK_H_
-
-#include "runtime/opcode.h"
 
+#include <bshell/runtime/opcode.h>
 #include <fx/macros.h>
 #include <fx/value.h>
 

bshell.runtime/include/bshell/runtime/var.h

@@ -1,5 +1,5 @@
-#ifndef RUNTIME_VAR_H_
+#ifndef BSHELL_RUNTIME_VAR_H_
-#define RUNTIME_VAR_H_
+#define BSHELL_RUNTIME_VAR_H_
 
 #include <fx/macros.h>
 #include <fx/value.h>

bshell.runtime/include/bshell/status.h

@@ -1,5 +1,5 @@
-#ifndef STATUS_H_
+#ifndef BSHELL_STATUS_H_
-#define STATUS_H_
+#define BSHELL_STATUS_H_
 
 enum bshell_status {
 	BSHELL_SUCCESS = 0,

bshell.runtime/include/bshell/verb.h

@@ -1,5 +1,5 @@
-#ifndef VERB_H_
+#ifndef BSHELL_VERB_H_
-#define VERB_H_
+#define BSHELL_VERB_H_
 
 #include <fx/collections/hashtable.h>
 #include <fx/macros.h>

bshell.runtime/line-source.c

@@ -1,7 +1,7 @@
-#include "line-source.h"
+#include <bshell/line-source.h>
 
-enum bshell_status line_source_get_name(
+enum bshell_status bshell_line_source_get_name(
-	struct line_source *src,
+	struct bshell_line_source *src,
 	char *buf,
 	size_t count,
 	size_t *nr_read)
@@ -13,8 +13,8 @@ enum bshell_status line_source_get_name(
 	return BSHELL_ERR_NOT_SUPPORTED;
 }
 
-enum bshell_status line_source_readline(
+enum bshell_status bshell_line_source_readline(
-	struct line_source *src,
+	struct bshell_line_source *src,
 	fx_stringstream *out)
 {
 	if (src->s_readline) {
@@ -24,8 +24,8 @@ enum bshell_status line_source_readline(
 	return BSHELL_ERR_NOT_SUPPORTED;
 }
 
-enum bshell_status line_source_get_row(
+enum bshell_status bshell_line_source_get_row(
-	struct line_source *src,
+	struct bshell_line_source *src,
 	size_t row,
 	char *buf,
 	size_t count,

bshell.runtime/operator.c

@@ -0,0 +1,274 @@
+#include <bshell/parse/token.h>
+#include <bshell/runtime/operator.h>
+
+#define OP(id, p, a, l, u)                                                     \
+	[BSHELL_OP_##id] = {                                                   \
+		.op_id = (BSHELL_OP_##id),                                     \
+		.op_precedence = (BSHELL_PRECEDENCE_##p),                      \
+		.op_associativity = (BSHELL_ASSOCIATIVITY_##a),                \
+		.op_location = (BSHELL_OPL_##l),                               \
+		.op_arity = (BSHELL_OPA_##u),                                  \
+	}
+
+#define BSHELL_TOK_OP(id, tok)                                                        \
+	[BSHELL_TOK_##tok - __BSHELL_TOK_INDEX_BASE] = &operators[BSHELL_OP_##id]
+#define BSHELL_SYM_OP(id, sym)                                                        \
+	[BSHELL_SYM_##sym - __BSHELL_SYM_INDEX_BASE] = &operators[BSHELL_OP_##id]
+#define BSHELL_KW_OP(id, kw) [BSHELL_KW_##kw - __BSHELL_KW_INDEX_BASE] = &operators[BSHELL_OP_##id]
+#define BSHELL_TKOP_OP(id, kw)                                                 \
+	[BSHELL_TKOP_##kw - __BSHELL_TKOP_INDEX_BASE]                          \
+		= &operators[BSHELL_OP_##id]
+
+/* clang-format off */
+static const struct bshell_operator_info operators[] = {
+	OP(ACCESS,			MEMBER_ACCESS,	LEFT,	INFIX,		BINARY),
+	OP(CONDITIONAL_ACCESS,		MEMBER_ACCESS,	LEFT,	INFIX,		BINARY),
+	OP(STATIC_ACCESS,		STATIC_ACCESS,	LEFT,	INFIX,		BINARY),
+	OP(SUBSCRIPT,			SUBSCRIPT,	LEFT,	INFIX,		BINARY),
+	OP(CONDITIONAL_SUBSCRIPT,	SUBSCRIPT,	LEFT,	INFIX,		BINARY),
+	OP(CAST,			CAST,		LEFT,	PREFIX,		UNARY),
+	OP(USPLIT,			SPLIT,		LEFT,	PREFIX,		UNARY),
+	OP(UJOIN,			JOIN,		LEFT,	PREFIX,		UNARY),
+	OP(ARRAY_DELIMITER,		ARRAY,		LEFT,	INFIX,		BINARY),
+	OP(INCREMENT,			INCREMENT,	LEFT,	INFIX,		BINARY),
+	OP(LOGICAL_NOT,			NOT,		LEFT,	PREFIX,		UNARY),
+	OP(RANGE,			RANGE,		LEFT,	INFIX,		BINARY),
+	OP(FORMAT,			FORMAT,		LEFT,	INFIX,		BINARY),
+	OP(MULTIPLY,			MULTIPLICATION,	LEFT,	INFIX,		BINARY),
+	OP(DIVIDE,			MULTIPLICATION,	LEFT,	INFIX,		BINARY),
+	OP(MODULO,			MULTIPLICATION,	LEFT,	INFIX,		BINARY),
+	OP(ADD,				ADDITION,	LEFT,	INFIX,		BINARY),
+	OP(SUBTRACT,			ADDITION,	LEFT,	INFIX,		BINARY),
+
+	OP(BSPLIT,			COMPARISON,	LEFT,	INFIX,		BINARY),
+	OP(BJOIN,			COMPARISON,	LEFT,	INFIX,		BINARY),
+	OP(IS,				COMPARISON,	LEFT,	INFIX,		BINARY),
+	OP(ISNOT,			COMPARISON,	LEFT,	INFIX,		BINARY),
+	OP(AS,				COMPARISON,	LEFT,	INFIX,		BINARY),
+	OP(EQUAL,			COMPARISON,	LEFT,	INFIX,		BINARY),
+	OP(NOT_EQUAL,			COMPARISON,	LEFT,	INFIX,		BINARY),
+	OP(GREATER_THAN,		COMPARISON,	LEFT,	INFIX,		BINARY),
+	OP(LESS_THAN,			COMPARISON,	LEFT,	INFIX,		BINARY),
+	OP(GREATER_EQUAL,		COMPARISON,	LEFT,	INFIX,		BINARY),
+	OP(LESS_EQUAL,			COMPARISON,	LEFT,	INFIX,		BINARY),
+	OP(LIKE,			COMPARISON,	LEFT,	INFIX,		BINARY),
+	OP(NOTLIKE,			COMPARISON,	LEFT,	INFIX,		BINARY),
+	OP(MATCH,			COMPARISON,	LEFT,	INFIX,		BINARY),
+	OP(NOTMATCH,			COMPARISON,	LEFT,	INFIX,		BINARY),
+	OP(IN,				COMPARISON,	LEFT,	INFIX,		BINARY),
+	OP(NOTIN,			COMPARISON,	LEFT,	INFIX,		BINARY),
+	OP(CONTAINS,			COMPARISON,	LEFT,	INFIX,		BINARY),
+	OP(NOTCONTAINS,			COMPARISON,	LEFT,	INFIX,		BINARY),
+	OP(REPLACE,			COMPARISON,	LEFT,	INFIX,		BINARY),
+
+	OP(LOGICAL_AND,			LOGICAL,	LEFT,	INFIX,		BINARY),
+	OP(LOGICAL_OR,			LOGICAL,	LEFT,	INFIX,		BINARY),
+	OP(LOGICAL_XOR,			LOGICAL,	LEFT,	INFIX,		BINARY),
+
+	OP(BINARY_AND,			BITWISE,	LEFT,	INFIX,		BINARY),
+	OP(BINARY_OR,			BITWISE,	LEFT,	INFIX,		BINARY),
+	OP(BINARY_NOT,			BITWISE,	LEFT,	INFIX,		BINARY),
+	OP(BINARY_XOR,			BITWISE,	LEFT,	INFIX,		BINARY),
+	OP(LEFT_SHIFT,			BITWISE,	LEFT,	INFIX,		BINARY),
+	OP(RIGHT_SHIFT,			BITWISE,	LEFT,	INFIX,		BINARY),
+
+	OP(ASSIGN,			ASSIGN,		RIGHT,	INFIX,		BINARY),
+	OP(ADD_ASSIGN,			ASSIGN,		RIGHT,	INFIX,		BINARY),
+	OP(SUBTRACT_ASSIGN,		ASSIGN,		RIGHT,	INFIX,		BINARY),
+	OP(MULTIPLY_ASSIGN,		ASSIGN,		RIGHT,	INFIX,		BINARY),
+	OP(DIVIDE_ASSIGN,		ASSIGN,		RIGHT,	INFIX,		BINARY),
+	OP(MODULO_ASSIGN,		ASSIGN,		RIGHT,	INFIX,		BINARY),
+
+	/* these are not real operators, and are just used internally by the
+	 * parser. */
+	OP(SUBEXPR,			PARENTHESIS,	LEFT,	PREFIX,		UNARY),
+	OP(ARRAY_START,			PARENTHESIS,	LEFT,	PREFIX,		UNARY),
+	OP(PAREN,			PARENTHESIS,	LEFT,	PREFIX,		UNARY),
+	OP(HASHTABLE_START,		PARENTHESIS,	LEFT,	PREFIX,		UNARY),
+	OP(SCRIPTBLOCK,			PARENTHESIS,	LEFT,	PREFIX,		UNARY),
+};
+static const size_t nr_operators = sizeof operators / sizeof operators[0];
+
+static const struct bshell_operator_info *bshell_operator_symbols[] = {
+	BSHELL_SYM_OP(LOGICAL_NOT,		BANG),
+	BSHELL_SYM_OP(ASSIGN,			EQUAL),
+	BSHELL_SYM_OP(ADD,			PLUS),
+	BSHELL_SYM_OP(SUBTRACT,		HYPHEN),
+	BSHELL_SYM_OP(MULTIPLY,		ASTERISK),
+	BSHELL_SYM_OP(DIVIDE,			FORWARD_SLASH),
+	BSHELL_SYM_OP(MODULO,			PERCENT),
+	BSHELL_SYM_OP(ADD_ASSIGN,		PLUS_EQUAL),
+	BSHELL_SYM_OP(SUBTRACT_ASSIGN,		HYPHEN_EQUAL),
+	BSHELL_SYM_OP(MULTIPLY_ASSIGN, 	ASTERISK_EQUAL),
+	BSHELL_SYM_OP(DIVIDE_ASSIGN,		FORWARD_SLASH_EQUAL),
+	BSHELL_SYM_OP(MODULO_ASSIGN,		PERCENT_EQUAL),
+	BSHELL_SYM_OP(RANGE,			DOT_DOT),
+	BSHELL_SYM_OP(SUBSCRIPT,		LEFT_BRACKET),
+	BSHELL_SYM_OP(CONDITIONAL_SUBSCRIPT,	QUESTION_LEFT_BRACKET),
+
+	BSHELL_SYM_OP(ACCESS,			DOT),
+	BSHELL_SYM_OP(CONDITIONAL_ACCESS,	QUESTION_DOT),
+	BSHELL_SYM_OP(STATIC_ACCESS,		COLON_COLON),
+
+	/* parser-internal pseudo-operators. */
+
+	/* CAST uses the same symbol as SUBSCRIPT */
+	/* BSHELL_SYM_OP(CAST,			LEFT_BRACKET), */
+	BSHELL_SYM_OP(SUBEXPR,			DOLLAR_LEFT_PAREN),
+	BSHELL_SYM_OP(PAREN,			LEFT_PAREN),
+	BSHELL_SYM_OP(ARRAY_START,		AT_LEFT_PAREN),
+	BSHELL_SYM_OP(HASHTABLE_START,		AT_LEFT_BRACE),
+};
+static const size_t nr_bshell_operator_symbols = sizeof bshell_operator_symbols / sizeof bshell_operator_symbols[0];
+
+static const struct bshell_operator_info *bshell_operator_token_ops[] = {
+	BSHELL_TKOP_OP(FORMAT,			F),
+	BSHELL_TKOP_OP(BINARY_AND,		BAND),
+	BSHELL_TKOP_OP(BINARY_OR,		BOR),
+	BSHELL_TKOP_OP(BINARY_XOR,		BXOR),
+	BSHELL_TKOP_OP(BINARY_NOT,		BNOT),
+	BSHELL_TKOP_OP(LEFT_SHIFT,		SHL),
+	BSHELL_TKOP_OP(RIGHT_SHIFT,		SHR),
+	BSHELL_TKOP_OP(EQUAL,			EQ),
+	BSHELL_TKOP_OP(NOT_EQUAL,		NE),
+	BSHELL_TKOP_OP(GREATER_THAN,		GT),
+	BSHELL_TKOP_OP(LESS_THAN,		LT),
+	BSHELL_TKOP_OP(GREATER_EQUAL,		GE),
+	BSHELL_TKOP_OP(LESS_EQUAL,		LE),
+	BSHELL_TKOP_OP(MATCH,			MATCH),
+	BSHELL_TKOP_OP(NOTMATCH,		NOTMATCH),
+	BSHELL_TKOP_OP(REPLACE,		REPLACE),
+	BSHELL_TKOP_OP(LIKE,			LIKE),
+	BSHELL_TKOP_OP(NOTLIKE,		NOTLIKE),
+	BSHELL_TKOP_OP(IN,			IN),
+	BSHELL_TKOP_OP(NOTIN,			NOTIN),
+	BSHELL_TKOP_OP(CONTAINS,		CONTAINS),
+	BSHELL_TKOP_OP(NOTCONTAINS,		NOTCONTAINS),
+	BSHELL_TKOP_OP(LOGICAL_AND,		AND),
+	BSHELL_TKOP_OP(LOGICAL_OR,		OR),
+	BSHELL_TKOP_OP(LOGICAL_XOR,		XOR),
+	BSHELL_TKOP_OP(LOGICAL_NOT,		NOT),
+	/* there are also unary versions of these operators */
+	BSHELL_TKOP_OP(BSPLIT,			SPLIT),
+	BSHELL_TKOP_OP(BJOIN,			JOIN),
+
+	BSHELL_TKOP_OP(IS,			IS),
+	BSHELL_TKOP_OP(ISNOT,			ISNOT),
+	BSHELL_TKOP_OP(AS,			AS),
+};
+static const size_t nr_bshell_operator_token_ops = sizeof bshell_operator_token_ops / sizeof bshell_operator_token_ops[0];
+
+/* clang-format on */
+
+const struct bshell_operator_info *bshell_operator_get_by_token(
+	unsigned int token)
+{
+	const struct bshell_operator_info **op_list = NULL;
+	size_t base = 0;
+	size_t op_list_size = 0;
+
+	if (token > __BSHELL_TKOP_INDEX_BASE
+	    && token < __BSHELL_TKOP_INDEX_LIMIT) {
+		op_list = bshell_operator_token_ops;
+		base = __BSHELL_TKOP_INDEX_BASE;
+		op_list_size = nr_bshell_operator_token_ops;
+	} else if (token > __BSHELL_SYM_INDEX_BASE && token < __BSHELL_SYM_INDEX_LIMIT) {
+		op_list = bshell_operator_symbols;
+		base = __BSHELL_SYM_INDEX_BASE;
+		op_list_size = nr_bshell_operator_symbols;
+	} else {
+		return NULL;
+	}
+
+	if (token - base >= op_list_size) {
+		return NULL;
+	}
+
+	return op_list[token - base];
+}
+
+const struct bshell_operator_info *bshell_operator_get_by_id(
+	enum bshell_operator_id id)
+{
+	if (id >= nr_operators) {
+		return NULL;
+	}
+
+	const struct bshell_operator_info *op = &operators[id];
+	if (op->op_id != id) {
+		return NULL;
+	}
+
+	return op;
+}
+
+#define ENUM_STR(x)                                                            \
+	case x:                                                                \
+		return #x
+
+const char *bshell_operator_id_to_string(enum bshell_operator_id op)
+{
+	switch (op) {
+		ENUM_STR(BSHELL_OP_NONE);
+		ENUM_STR(BSHELL_OP_ADD);
+		ENUM_STR(BSHELL_OP_SUBTRACT);
+		ENUM_STR(BSHELL_OP_MULTIPLY);
+		ENUM_STR(BSHELL_OP_DIVIDE);
+		ENUM_STR(BSHELL_OP_MODULO);
+		ENUM_STR(BSHELL_OP_INCREMENT);
+		ENUM_STR(BSHELL_OP_DECREMENT);
+		ENUM_STR(BSHELL_OP_LEFT_SHIFT);
+		ENUM_STR(BSHELL_OP_RIGHT_SHIFT);
+		ENUM_STR(BSHELL_OP_BINARY_AND);
+		ENUM_STR(BSHELL_OP_BINARY_OR);
+		ENUM_STR(BSHELL_OP_BINARY_XOR);
+		ENUM_STR(BSHELL_OP_BINARY_NOT);
+		ENUM_STR(BSHELL_OP_LESS_THAN);
+		ENUM_STR(BSHELL_OP_GREATER_THAN);
+		ENUM_STR(BSHELL_OP_EQUAL);
+		ENUM_STR(BSHELL_OP_NOT_EQUAL);
+		ENUM_STR(BSHELL_OP_LESS_EQUAL);
+		ENUM_STR(BSHELL_OP_GREATER_EQUAL);
+		ENUM_STR(BSHELL_OP_ASSIGN);
+		ENUM_STR(BSHELL_OP_ADD_ASSIGN);
+		ENUM_STR(BSHELL_OP_SUBTRACT_ASSIGN);
+		ENUM_STR(BSHELL_OP_MULTIPLY_ASSIGN);
+		ENUM_STR(BSHELL_OP_DIVIDE_ASSIGN);
+		ENUM_STR(BSHELL_OP_MODULO_ASSIGN);
+		ENUM_STR(BSHELL_OP_LOGICAL_AND);
+		ENUM_STR(BSHELL_OP_LOGICAL_OR);
+		ENUM_STR(BSHELL_OP_LOGICAL_XOR);
+		ENUM_STR(BSHELL_OP_LOGICAL_NOT);
+		ENUM_STR(BSHELL_OP_RANGE);
+		ENUM_STR(BSHELL_OP_MATCH);
+		ENUM_STR(BSHELL_OP_NOTMATCH);
+		ENUM_STR(BSHELL_OP_REPLACE);
+		ENUM_STR(BSHELL_OP_LIKE);
+		ENUM_STR(BSHELL_OP_NOTLIKE);
+		ENUM_STR(BSHELL_OP_IN);
+		ENUM_STR(BSHELL_OP_NOTIN);
+		ENUM_STR(BSHELL_OP_FORMAT);
+		ENUM_STR(BSHELL_OP_CONTAINS);
+		ENUM_STR(BSHELL_OP_NOTCONTAINS);
+		ENUM_STR(BSHELL_OP_USPLIT);
+		ENUM_STR(BSHELL_OP_BSPLIT);
+		ENUM_STR(BSHELL_OP_UJOIN);
+		ENUM_STR(BSHELL_OP_BJOIN);
+		ENUM_STR(BSHELL_OP_IS);
+		ENUM_STR(BSHELL_OP_ISNOT);
+		ENUM_STR(BSHELL_OP_AS);
+		ENUM_STR(BSHELL_OP_SUBSCRIPT);
+		ENUM_STR(BSHELL_OP_CONDITIONAL_SUBSCRIPT);
+		ENUM_STR(BSHELL_OP_ARRAY_DELIMITER);
+		ENUM_STR(BSHELL_OP_ACCESS);
+		ENUM_STR(BSHELL_OP_STATIC_ACCESS);
+		ENUM_STR(BSHELL_OP_CONDITIONAL_ACCESS);
+		ENUM_STR(BSHELL_OP_CAST);
+		ENUM_STR(BSHELL_OP_SUBEXPR);
+		ENUM_STR(BSHELL_OP_PAREN);
+		ENUM_STR(BSHELL_OP_ARRAY_START);
+		ENUM_STR(BSHELL_OP_HASHTABLE_START);
+	default:
+		return "";
+	}
+}

bshell.runtime/parse/lex/arithmetic.c

@@ -0,0 +1,232 @@
+#include "lex-internal.h"
+
+static enum bshell_status arithmetic_hyphen(struct bshell_lex_ctx *ctx)
+{
+	fx_wchar c = peek_char(ctx);
+	if (!fx_wchar_is_alnum(c)) {
+		push_symbol(ctx, BSHELL_SYM_HYPHEN);
+		handle_lex_state_transition(ctx, BSHELL_SYM_HYPHEN);
+		return BSHELL_SUCCESS;
+	}
+
+	struct bshell_lex_token *tok = NULL;
+	enum bshell_status status = read_word(
+		ctx,
+		READ_NO_SET_TOKEN_START | READ_APPEND_HYPHEN,
+		&tok);
+	if (status != BSHELL_SUCCESS) {
+		return status;
+	}
+
+	unsigned int token_type = BSHELL_TOK_WORD;
+	if (convert_word_to_number(tok)) {
+		token_type = tok->tok_type;
+
+		/* because of APPEND_HYPHEN (which is needed to ensure operator
+		 * tokens are detected properly), the resulting number will be
+		 * negative.
+		 * this token will be preceded by a HYPHEN token, so the number
+		 * must be positive */
+		fx_value neg = FX_INT(-1);
+		fx_value_multiply(&tok->tok_number, &neg, &tok->tok_number);
+		push_symbol(ctx, BSHELL_SYM_HYPHEN);
+	} else if (convert_word_to_operator(ctx, tok)) {
+		token_type = tok->tok_operator;
+	}
+
+	enqueue_token(ctx, tok);
+	return BSHELL_SUCCESS;
+}
+
+static enum bshell_status arithmetic_symbol(struct bshell_lex_ctx *ctx)
+{
+	const struct bshell_lex_token_definition *sym = NULL;
+	enum bshell_status status = read_symbol(ctx, &sym);
+
+	if (status != BSHELL_SUCCESS) {
+		return status;
+	}
+
+	handle_lex_state_transition(ctx, sym->id);
+
+	struct bshell_lex_token *tok = NULL;
+	switch (sym->id) {
+	case BSHELL_SYM_DQUOTE:
+		return BSHELL_SUCCESS;
+	case BSHELL_SYM_SQUOTE:
+		status = read_literal_string(ctx, &tok);
+		if (status != BSHELL_SUCCESS) {
+			return status;
+		}
+		enqueue_token(ctx, tok);
+		return BSHELL_SUCCESS;
+	case BSHELL_SYM_HYPHEN:
+		return arithmetic_hyphen(ctx);
+	case BSHELL_SYM_HASH:
+		return read_line_comment(ctx);
+	case BSHELL_SYM_DOLLAR:
+		status = read_var(ctx, BSHELL_TOK_VAR, &tok);
+		if (status != BSHELL_SUCCESS) {
+			return status;
+		}
+
+		enqueue_token(ctx, tok);
+		return status;
+	case BSHELL_SYM_AT:
+		status = read_var(ctx, BSHELL_TOK_VAR_SPLAT, &tok);
+		if (status != BSHELL_SUCCESS) {
+			return status;
+		}
+
+		enqueue_token(ctx, tok);
+		return status;
+	case BSHELL_SYM_DOLLAR_LEFT_BRACE:
+		status = read_braced_var(ctx, BSHELL_TOK_VAR, &tok);
+		if (status != BSHELL_SUCCESS) {
+			return status;
+		}
+
+		enqueue_token(ctx, tok);
+		return status;
+	default:
+		break;
+	}
+
+	push_symbol(ctx, sym->id);
+
+	return BSHELL_SUCCESS;
+}
+
+static enum bshell_status arithmetic_word(struct bshell_lex_ctx *ctx)
+{
+	struct bshell_lex_token *word = NULL;
+	enum bshell_status status = read_word(ctx, 0, &word);
+	if (status != BSHELL_SUCCESS) {
+		return status;
+	}
+
+	unsigned int token_type = BSHELL_TOK_WORD;
+	bool kw = false, number = false;
+	if (convert_word_to_keyword(word)) {
+		token_type = word->tok_keyword;
+	} else if (convert_word_to_number(word)) {
+		token_type = word->tok_type;
+	}
+
+	handle_lex_state_transition(ctx, token_type);
+
+	enqueue_token(ctx, word);
+	return BSHELL_SUCCESS;
+}
+
+static enum bshell_status arithmetic_pump_token(struct bshell_lex_ctx *ctx)
+{
+	fx_wchar c = peek_char(ctx);
+	bool newline = false;
+
+	set_token_start(ctx);
+	while (fx_wchar_is_space(c)) {
+		if (c == '\n') {
+			newline = true;
+		}
+
+		set_token_end(ctx);
+		advance_char_noread(ctx);
+		c = peek_char_noread(ctx);
+	}
+
+	if (newline) {
+		struct bshell_lex_token *tok = bshell_lex_token_create(BSHELL_TOK_LINEFEED);
+		enqueue_token(ctx, tok);
+		handle_lex_state_transition(ctx, BSHELL_TOK_LINEFEED);
+		return BSHELL_SUCCESS;
+	}
+
+	if (char_can_begin_symbol(ctx, c)) {
+		return arithmetic_symbol(ctx);
+	}
+
+	return arithmetic_word(ctx);
+}
+
+static const struct bshell_lex_state_link links[] = {
+	LINK_CHANGE(BSHELL_SYM_EQUAL, BSHELL_LEX_STATE_STATEMENT),
+	LINK_PUSH(BSHELL_SYM_DQUOTE, BSHELL_LEX_STATE_STRING, 0),
+	LINK_PUSH(BSHELL_SYM_DOLLAR_LEFT_PAREN, BSHELL_LEX_STATE_STATEMENT, 0),
+	LINK_POP(BSHELL_SYM_RIGHT_PAREN),
+	LINK_CHANGE(BSHELL_SYM_SEMICOLON, BSHELL_LEX_STATE_STATEMENT),
+	LINK_CHANGE(BSHELL_TOK_LINEFEED, BSHELL_LEX_STATE_STATEMENT),
+	LINK_CHANGE(BSHELL_SYM_PIPE, BSHELL_LEX_STATE_STATEMENT),
+	LINK_PUSH(BSHELL_SYM_AT_LEFT_BRACE, BSHELL_LEX_STATE_HASHTABLE, 0),
+	LINK_PUSH(
+		BSHELL_SYM_LEFT_PAREN,
+		BSHELL_LEX_STATE_STATEMENT,
+		STATEMENT_F_DISABLE_KEYWORDS),
+	LINK_END,
+};
+
+static const unsigned int keywords[] = {
+	BSHELL_KW_IF,
+	BSHELL_KW_ELSEIF,
+	BSHELL_KW_ELSE,
+	BSHELL_KW_NONE,
+};
+
+static const unsigned int operators[] = {
+	BSHELL_TKOP_F,        BSHELL_TKOP_BAND,        BSHELL_TKOP_BOR,      BSHELL_TKOP_BXOR,
+	BSHELL_TKOP_BNOT,     BSHELL_TKOP_SHL,         BSHELL_TKOP_SHR,      BSHELL_TKOP_EQ,
+	BSHELL_TKOP_NE,       BSHELL_TKOP_GT,          BSHELL_TKOP_LT,       BSHELL_TKOP_GE,
+	BSHELL_TKOP_LE,       BSHELL_TKOP_MATCH,       BSHELL_TKOP_NOTMATCH, BSHELL_TKOP_REPLACE,
+	BSHELL_TKOP_LIKE,     BSHELL_TKOP_NOTLIKE,     BSHELL_TKOP_IN,       BSHELL_TKOP_NOTIN,
+	BSHELL_TKOP_CONTAINS, BSHELL_TKOP_NOTCONTAINS, BSHELL_TKOP_AND,      BSHELL_TKOP_OR,
+	BSHELL_TKOP_XOR,      BSHELL_TKOP_NOT,         BSHELL_TKOP_SPLIT,    BSHELL_TKOP_JOIN,
+	BSHELL_TKOP_IS,       BSHELL_TKOP_ISNOT,       BSHELL_TKOP_AS,       BSHELL_TKOP_NONE,
+};
+
+static const unsigned int symbols[] = {
+	BSHELL_SYM_BANG,
+	BSHELL_SYM_PLUS,
+	BSHELL_SYM_HYPHEN,
+	BSHELL_SYM_FORWARD_SLASH,
+	BSHELL_SYM_ASTERISK,
+	BSHELL_SYM_AMPERSAND,
+	BSHELL_SYM_PERCENT,
+	BSHELL_SYM_SQUOTE,
+	BSHELL_SYM_DQUOTE,
+	BSHELL_SYM_HASH,
+	BSHELL_SYM_DOLLAR,
+	BSHELL_SYM_DOLLAR_LEFT_PAREN,
+	BSHELL_SYM_DOLLAR_LEFT_BRACE,
+	BSHELL_SYM_AT,
+	BSHELL_SYM_AT_LEFT_BRACE,
+	BSHELL_SYM_PIPE,
+	BSHELL_SYM_COMMA,
+	BSHELL_SYM_SEMICOLON,
+	BSHELL_SYM_LEFT_PAREN,
+	BSHELL_SYM_RIGHT_PAREN,
+	BSHELL_SYM_LEFT_BRACE,
+	BSHELL_SYM_RIGHT_BRACE,
+	BSHELL_SYM_LEFT_BRACKET,
+	BSHELL_SYM_RIGHT_BRACKET,
+	BSHELL_SYM_QUESTION_DOT,
+	BSHELL_SYM_QUESTION_LEFT_BRACKET,
+	BSHELL_SYM_EQUAL,
+	BSHELL_SYM_PLUS_EQUAL,
+	BSHELL_SYM_HYPHEN_EQUAL,
+	BSHELL_SYM_FORWARD_SLASH_EQUAL,
+	BSHELL_SYM_ASTERISK_EQUAL,
+	BSHELL_SYM_PERCENT_EQUAL,
+	BSHELL_SYM_DOT,
+	BSHELL_SYM_DOT_DOT,
+	BSHELL_SYM_COLON_COLON,
+	BSHELL_SYM_NONE,
+};
+
+const struct bshell_lex_state_type lex_arithmetic_state = {
+	.s_id = BSHELL_LEX_STATE_ARITHMETIC,
+	.s_pump_token = arithmetic_pump_token,
+	.s_links = links,
+	.s_keywords = keywords,
+	.s_operators = operators,
+	.s_symbols = symbols,
+};

bshell.runtime/parse/lex/command.c

@@ -1,7 +1,8 @@
-#include "../token.h"
 #include "lex-internal.h"
 
-static bool char_can_continue_word(struct lex_ctx *ctx, fx_wchar c)
+#include <bshell/parse/token.h>
+
+static bool char_can_continue_word(struct bshell_lex_ctx *ctx, fx_wchar c)
 {
 	if (fx_wchar_is_alnum(c)) {
 		return true;
@@ -15,16 +16,16 @@ static bool char_can_continue_word(struct lex_ctx *ctx, fx_wchar c)
 		return true;
 	}
 
-	if (char_can_begin_symbol_in_state(ctx, c, LEX_STATE_WORD)) {
+	if (char_can_begin_symbol_in_state(ctx, c, BSHELL_LEX_STATE_WORD)) {
 		return false;
 	}
 
 	return true;
 }
 
-static enum bshell_status command_symbol(struct lex_ctx *ctx)
+static enum bshell_status command_symbol(struct bshell_lex_ctx *ctx)
 {
-	const struct lex_token_def *sym = NULL;
+	const struct bshell_lex_token_definition *sym = NULL;
 	enum bshell_status status = read_symbol(ctx, &sym);
 
 	if (status != BSHELL_SUCCESS) {
@@ -33,11 +34,11 @@ static enum bshell_status command_symbol(struct lex_ctx *ctx)
 
 	handle_lex_state_transition(ctx, sym->id);
 
-	struct lex_token *tok = NULL;
+	struct bshell_lex_token *tok = NULL;
 	switch (sym->id) {
-	case SYM_DQUOTE:
+	case BSHELL_SYM_DQUOTE:
 		return BSHELL_SUCCESS;
-	case SYM_SQUOTE:
+	case BSHELL_SYM_SQUOTE:
 		status = read_literal_string(ctx, &tok);
 		if (status != BSHELL_SUCCESS) {
 			return status;
@@ -45,36 +46,36 @@ static enum bshell_status command_symbol(struct lex_ctx *ctx)
 		enqueue_token(ctx, tok);
 		return BSHELL_SUCCESS;
 
-	case SYM_HASH:
+	case BSHELL_SYM_HASH:
 		return read_line_comment(ctx);
-	case SYM_DOLLAR:
+	case BSHELL_SYM_DOLLAR:
-		status = read_var(ctx, TOK_VAR, &tok);
+		status = read_var(ctx, BSHELL_TOK_VAR, &tok);
 		if (status != BSHELL_SUCCESS) {
 			return status;
 		}
 
 		if (char_can_continue_word(ctx, peek_char(ctx))) {
-			lex_state_push(ctx, LEX_STATE_WORD, 0);
+			lex_state_push(ctx, BSHELL_LEX_STATE_WORD, 0);
 		}
 
 		enqueue_token(ctx, tok);
 		return status;
-	case SYM_AT:
+	case BSHELL_SYM_AT:
-		status = read_var(ctx, TOK_VAR_SPLAT, &tok);
+		status = read_var(ctx, BSHELL_TOK_VAR_SPLAT, &tok);
 		if (status != BSHELL_SUCCESS) {
 			return status;
 		}
 
 		enqueue_token(ctx, tok);
 		return status;
-	case SYM_DOLLAR_LEFT_BRACE:
+	case BSHELL_SYM_DOLLAR_LEFT_BRACE:
-		status = read_braced_var(ctx, TOK_VAR, &tok);
+		status = read_braced_var(ctx, BSHELL_TOK_VAR, &tok);
 		if (status != BSHELL_SUCCESS) {
 			return status;
 		}
 
 		if (char_can_continue_word(ctx, peek_char(ctx))) {
-			lex_state_push(ctx, LEX_STATE_WORD, 0);
+			lex_state_push(ctx, BSHELL_LEX_STATE_WORD, 0);
 		}
 
 		enqueue_token(ctx, tok);
@@ -121,9 +122,9 @@ static bool string_is_redirection(const char *s)
 	return true;
 }
 
-static enum bshell_status command_word(struct lex_ctx *ctx)
+static enum bshell_status command_word(struct bshell_lex_ctx *ctx)
 {
-	struct lex_token *word = NULL;
+	struct bshell_lex_token *word = NULL;
 	enum bshell_status status
 		= read_word(ctx, READ_NO_NUMBER_RECOGNITION, &word);
 	if (status != BSHELL_SUCCESS) {
@@ -134,11 +135,11 @@ static enum bshell_status command_word(struct lex_ctx *ctx)
 
 	fx_wchar c = peek_char(ctx);
 	const char *s = word->tok_str;
-	if (char_can_begin_symbol_in_state(ctx, c, LEX_STATE_WORD)) {
+	if (char_can_begin_symbol_in_state(ctx, c, BSHELL_LEX_STATE_WORD)) {
 		continue_word = true;
 	}
 
-	if (char_has_flags(ctx, c, LEX_TOKEN_TERMINATES_WORD)) {
+	if (char_has_flags(ctx, c, BSHELL_LEX_TOKEN_TERMINATES_WORD)) {
 		continue_word = false;
 	}
 
@@ -147,14 +148,14 @@ static enum bshell_status command_word(struct lex_ctx *ctx)
 	}
 
 	if (continue_word) {
-		lex_state_push(ctx, LEX_STATE_WORD, 0);
+		lex_state_push(ctx, BSHELL_LEX_STATE_WORD, 0);
 	}
 
 	enqueue_token(ctx, word);
 	return BSHELL_SUCCESS;
 }
 
-enum bshell_status command_pump_token(struct lex_ctx *ctx)
+enum bshell_status command_pump_token(struct bshell_lex_ctx *ctx)
 {
 	fx_wchar c = peek_char(ctx);
 	bool newline = false;
@@ -171,9 +172,10 @@ enum bshell_status command_pump_token(struct lex_ctx *ctx)
 	}
 
 	if (newline) {
-		struct lex_token *tok = lex_token_create(TOK_LINEFEED);
+		struct bshell_lex_token *tok
+			= bshell_lex_token_create(BSHELL_TOK_LINEFEED);
 		enqueue_token(ctx, tok);
-		handle_lex_state_transition(ctx, TOK_LINEFEED);
+		handle_lex_state_transition(ctx, BSHELL_TOK_LINEFEED);
 		return BSHELL_SUCCESS;
 	}
 
@@ -184,42 +186,42 @@ enum bshell_status command_pump_token(struct lex_ctx *ctx)
 	return command_word(ctx);
 }
 
-const struct lex_state_link links[] = {
+const struct bshell_lex_state_link links[] = {
-	LINK_PUSH(SYM_DQUOTE, LEX_STATE_STRING, 0),
+	LINK_PUSH(BSHELL_SYM_DQUOTE, BSHELL_LEX_STATE_STRING, 0),
 	LINK_PUSH(
-		SYM_LEFT_PAREN,
+		BSHELL_SYM_LEFT_PAREN,
-		LEX_STATE_STATEMENT,
+		BSHELL_LEX_STATE_STATEMENT,
 		STATEMENT_F_DISABLE_KEYWORDS),
-	LINK_PUSH(SYM_DOLLAR_LEFT_PAREN, LEX_STATE_STATEMENT, 0),
+	LINK_PUSH(BSHELL_SYM_DOLLAR_LEFT_PAREN, BSHELL_LEX_STATE_STATEMENT, 0),
-	LINK_POP(SYM_RIGHT_PAREN),
+	LINK_POP(BSHELL_SYM_RIGHT_PAREN),
-	LINK_POP(SYM_RIGHT_BRACE),
+	LINK_POP(BSHELL_SYM_RIGHT_BRACE),
-	LINK_CHANGE(SYM_SEMICOLON, LEX_STATE_STATEMENT),
+	LINK_CHANGE(BSHELL_SYM_SEMICOLON, BSHELL_LEX_STATE_STATEMENT),
-	LINK_PUSH(SYM_AT_LEFT_BRACE, LEX_STATE_HASHTABLE, 0),
+	LINK_PUSH(BSHELL_SYM_AT_LEFT_BRACE, BSHELL_LEX_STATE_HASHTABLE, 0),
-	LINK_CHANGE(TOK_LINEFEED, LEX_STATE_STATEMENT),
+	LINK_CHANGE(BSHELL_TOK_LINEFEED, BSHELL_LEX_STATE_STATEMENT),
 	LINK_END,
 };
 
 static const unsigned int symbols[] = {
-	SYM_DQUOTE,
+	BSHELL_SYM_DQUOTE,
-	SYM_SQUOTE,
+	BSHELL_SYM_SQUOTE,
-	SYM_DOLLAR,
+	BSHELL_SYM_DOLLAR,
-	SYM_DOLLAR_LEFT_PAREN,
+	BSHELL_SYM_DOLLAR_LEFT_PAREN,
-	SYM_DOLLAR_LEFT_BRACE,
+	BSHELL_SYM_DOLLAR_LEFT_BRACE,
-	SYM_AT,
+	BSHELL_SYM_AT,
-	SYM_AT_LEFT_BRACE,
+	BSHELL_SYM_AT_LEFT_BRACE,
-	SYM_AT_LEFT_PAREN,
+	BSHELL_SYM_AT_LEFT_PAREN,
-	SYM_AMPERSAND,
+	BSHELL_SYM_AMPERSAND,
-	SYM_PIPE,
+	BSHELL_SYM_PIPE,
-	SYM_SEMICOLON,
+	BSHELL_SYM_SEMICOLON,
-	SYM_RIGHT_PAREN,
+	BSHELL_SYM_RIGHT_PAREN,
-	SYM_LEFT_PAREN,
+	BSHELL_SYM_LEFT_PAREN,
-	SYM_LEFT_BRACE,
+	BSHELL_SYM_LEFT_BRACE,
-	SYM_RIGHT_BRACE,
+	BSHELL_SYM_RIGHT_BRACE,
-	SYM_NONE,
+	BSHELL_SYM_NONE,
 };
 
-const struct lex_state_type lex_command_state = {
+const struct bshell_lex_state_type lex_command_state = {
-	.s_id = LEX_STATE_COMMAND,
+	.s_id = BSHELL_LEX_STATE_COMMAND,
 	.s_pump_token = command_pump_token,
 	.s_links = links,
 	.s_symbols = symbols,

bshell.runtime/parse/lex/hashtable.c

@@ -1,15 +1,15 @@
 #include "lex-internal.h"
 
-static enum bshell_status hashtable_hyphen(struct lex_ctx *ctx)
+static enum bshell_status hashtable_hyphen(struct bshell_lex_ctx *ctx)
 {
 	fx_wchar c = peek_char(ctx);
 	if (!fx_wchar_is_alnum(c)) {
-		push_symbol(ctx, SYM_HYPHEN);
+		push_symbol(ctx, BSHELL_SYM_HYPHEN);
-		handle_lex_state_transition(ctx, SYM_HYPHEN);
+		handle_lex_state_transition(ctx, BSHELL_SYM_HYPHEN);
 		return BSHELL_SUCCESS;
 	}
 
-	struct lex_token *tok = NULL;
+	struct bshell_lex_token *tok = NULL;
 	enum bshell_status status = read_word(
 		ctx,
 		READ_NO_SET_TOKEN_START | READ_APPEND_HYPHEN,
@@ -18,7 +18,7 @@ static enum bshell_status hashtable_hyphen(struct lex_ctx *ctx)
 		return status;
 	}
 
-	unsigned int token_type = TOK_WORD;
+	unsigned int token_type = BSHELL_TOK_WORD;
 	if (convert_word_to_number(tok)) {
 		token_type = tok->tok_type;
 		/* because of APPEND_HYPHEN (which is needed to ensure operator
@@ -28,7 +28,7 @@ static enum bshell_status hashtable_hyphen(struct lex_ctx *ctx)
 		 * must be positive */
 		fx_value neg = FX_INT(-1);
 		fx_value_multiply(&tok->tok_number, &neg, &tok->tok_number);
-		push_symbol(ctx, SYM_HYPHEN);
+		push_symbol(ctx, BSHELL_SYM_HYPHEN);
 	} else if (convert_word_to_operator(ctx, tok)) {
 		token_type = tok->tok_operator;
 	}
@@ -38,9 +38,9 @@ static enum bshell_status hashtable_hyphen(struct lex_ctx *ctx)
 	return BSHELL_SUCCESS;
 }
 
-static enum bshell_status hashtable_symbol(struct lex_ctx *ctx)
+static enum bshell_status hashtable_symbol(struct bshell_lex_ctx *ctx)
 {
-	const struct lex_token_def *sym = NULL;
+	const struct bshell_lex_token_definition *sym = NULL;
 	enum bshell_status status = read_symbol(ctx, &sym);
 
 	if (status != BSHELL_SUCCESS) {
@@ -49,37 +49,37 @@ static enum bshell_status hashtable_symbol(struct lex_ctx *ctx)
 
 	handle_lex_state_transition(ctx, sym->id);
 
-	struct lex_token *tok = NULL;
+	struct bshell_lex_token *tok = NULL;
 	switch (sym->id) {
-	case SYM_SQUOTE:
+	case BSHELL_SYM_SQUOTE:
 		status = read_literal_string(ctx, &tok);
 		if (status != BSHELL_SUCCESS) {
 			return status;
 		}
 		enqueue_token(ctx, tok);
 		return BSHELL_SUCCESS;
-	case SYM_HYPHEN:
+	case BSHELL_SYM_HYPHEN:
 		return hashtable_hyphen(ctx);
-	case SYM_HASH:
+	case BSHELL_SYM_HASH:
 		return read_line_comment(ctx);
-	case SYM_DOLLAR:
+	case BSHELL_SYM_DOLLAR:
-		status = read_var(ctx, TOK_VAR, &tok);
+		status = read_var(ctx, BSHELL_TOK_VAR, &tok);
 		if (status != BSHELL_SUCCESS) {
 			return status;
 		}
 
 		enqueue_token(ctx, tok);
 		return status;
-	case SYM_AT:
+	case BSHELL_SYM_AT:
-		status = read_var(ctx, TOK_VAR_SPLAT, &tok);
+		status = read_var(ctx, BSHELL_TOK_VAR_SPLAT, &tok);
 		if (status != BSHELL_SUCCESS) {
 			return status;
 		}
 
 		enqueue_token(ctx, tok);
 		return status;
-	case SYM_DOLLAR_LEFT_BRACE:
+	case BSHELL_SYM_DOLLAR_LEFT_BRACE:
-		status = read_braced_var(ctx, TOK_VAR, &tok);
+		status = read_braced_var(ctx, BSHELL_TOK_VAR, &tok);
 		if (status != BSHELL_SUCCESS) {
 			return status;
 		}
@@ -95,9 +95,9 @@ static enum bshell_status hashtable_symbol(struct lex_ctx *ctx)
 	return BSHELL_SUCCESS;
 }
 
-static enum bshell_status hashtable_word(struct lex_ctx *ctx)
+static enum bshell_status hashtable_word(struct bshell_lex_ctx *ctx)
 {
-	struct lex_token *word = NULL;
+	struct bshell_lex_token *word = NULL;
 	enum bshell_status status = read_word(ctx, 0, &word);
 	if (status != BSHELL_SUCCESS) {
 		return status;
@@ -110,7 +110,7 @@ static enum bshell_status hashtable_word(struct lex_ctx *ctx)
 	return BSHELL_SUCCESS;
 }
 
-static enum bshell_status hashtable_pump_token(struct lex_ctx *ctx)
+static enum bshell_status hashtable_pump_token(struct bshell_lex_ctx *ctx)
 {
 	fx_wchar c = peek_char(ctx);
 	bool newline = false;
@@ -128,7 +128,7 @@ static enum bshell_status hashtable_pump_token(struct lex_ctx *ctx)
 
 #if 1
 	if (newline) {
-		struct lex_token *tok = lex_token_create(TOK_LINEFEED);
+		struct bshell_lex_token *tok = bshell_lex_token_create(BSHELL_TOK_LINEFEED);
 		enqueue_token(ctx, tok);
 		return BSHELL_SUCCESS;
 	}
@@ -141,44 +141,44 @@ static enum bshell_status hashtable_pump_token(struct lex_ctx *ctx)
 	return hashtable_word(ctx);
 }
 
-static const struct lex_state_link links[] = {
+static const struct bshell_lex_state_link links[] = {
 	LINK_PUSH_WITH_TERM(
-		SYM_EQUAL,
+		BSHELL_SYM_EQUAL,
-		LEX_STATE_STATEMENT,
+		BSHELL_LEX_STATE_STATEMENT,
 		0,
-		SYM_RIGHT_BRACE,
+		BSHELL_SYM_RIGHT_BRACE,
-		SYM_SEMICOLON,
+		BSHELL_SYM_SEMICOLON,
-		TOK_LINEFEED),
+		BSHELL_TOK_LINEFEED),
 	LINK_PUSH_WITH_TERM(
-		TOK_LINEFEED,
+		BSHELL_TOK_LINEFEED,
-		LEX_STATE_STATEMENT,
+		BSHELL_LEX_STATE_STATEMENT,
 		0,
-		SYM_SEMICOLON,
+		BSHELL_SYM_SEMICOLON,
-		TOK_LINEFEED),
+		BSHELL_TOK_LINEFEED),
-	LINK_PUSH(SYM_DQUOTE, LEX_STATE_STRING, 0),
+	LINK_PUSH(BSHELL_SYM_DQUOTE, BSHELL_LEX_STATE_STRING, 0),
 	LINK_PUSH(
-		SYM_LEFT_PAREN,
+		BSHELL_SYM_LEFT_PAREN,
-		LEX_STATE_STATEMENT,
+		BSHELL_LEX_STATE_STATEMENT,
 		STATEMENT_F_DISABLE_KEYWORDS),
-	LINK_PUSH(SYM_DOLLAR_LEFT_PAREN, LEX_STATE_STATEMENT, 0),
+	LINK_PUSH(BSHELL_SYM_DOLLAR_LEFT_PAREN, BSHELL_LEX_STATE_STATEMENT, 0),
-	LINK_POP2(SYM_RIGHT_BRACE, LINK_ALLOW_RECURSION),
+	LINK_POP2(BSHELL_SYM_RIGHT_BRACE, LINK_ALLOW_RECURSION),
 	LINK_END,
 };
 
 static const unsigned int symbols[] = {
-	SYM_EQUAL,
+	BSHELL_SYM_EQUAL,
-	SYM_DQUOTE,
+	BSHELL_SYM_DQUOTE,
-	SYM_SQUOTE,
+	BSHELL_SYM_SQUOTE,
-	SYM_SEMICOLON,
+	BSHELL_SYM_SEMICOLON,
-	SYM_RIGHT_BRACE,
+	BSHELL_SYM_RIGHT_BRACE,
-	SYM_DOLLAR_LEFT_PAREN,
+	BSHELL_SYM_DOLLAR_LEFT_PAREN,
-	SYM_LEFT_PAREN,
+	BSHELL_SYM_LEFT_PAREN,
-	SYM_HASH,
+	BSHELL_SYM_HASH,
-	SYM_NONE,
+	BSHELL_SYM_NONE,
 };
 
-const struct lex_state_type lex_hashtable_state = {
+const struct bshell_lex_state_type lex_hashtable_state = {
-	.s_id = LEX_STATE_HASHTABLE,
+	.s_id = BSHELL_LEX_STATE_HASHTABLE,
 	.s_pump_token = hashtable_pump_token,
 	.s_links = links,
 	.s_symbols = symbols,

bshell.runtime/parse/lex/lex-internal.h

@@ -0,0 +1,204 @@
+#ifndef PARSE_LEX_INTERNAL_H_
+#define PARSE_LEX_INTERNAL_H_
+
+#include <bshell/parse/lex.h>
+#include <bshell/parse/token.h>
+#include <bshell/status.h>
+
+struct bshell_lex_ctx;
+
+enum state_flags {
+	/* statement: don't convert matching words to keywords */
+	STATEMENT_F_DISABLE_KEYWORDS = 0x01u,
+	/* arithmetic: don't switch back to statement mode even when
+	 * encountering a token that would otherwise require it. */
+	ARITHMETIC_F_DISABLE_STATEMENTS = 0x01u,
+};
+
+enum read_flags {
+	READ_APPEND_HYPHEN = 0x01u,
+	READ_NO_SET_TOKEN_START = 0x02u,
+	READ_NO_NUMBER_RECOGNITION = 0x04u,
+};
+
+enum link_flags {
+	LINK_ALLOW_RECURSION = 0x01u,
+};
+
+#define LINK_PUSH(tok, target, flags)                                          \
+	((struct bshell_lex_state_link) {                                      \
+		.l_token = (tok),                                              \
+		.l_type = BSHELL_LEX_STATE_LINK_PUSH,                          \
+		.l_target = (target),                                          \
+		.l_target_flags = (flags),                                     \
+	})
+#define LINK_PUSH_WITH_TERM(tok, target, flags, ...)                           \
+	((struct bshell_lex_state_link) {                                      \
+		.l_token = (tok),                                              \
+		.l_type = BSHELL_LEX_STATE_LINK_PUSH,                          \
+		.l_target = (target),                                          \
+		.l_target_flags = (flags),                                     \
+		.l_terminators = {__VA_ARGS__, BSHELL_TOK_NONE},               \
+	})
+#define LINK_CHANGE(tok, target)                                               \
+	((struct bshell_lex_state_link) {                                      \
+		.l_token = (tok),                                              \
+		.l_type = BSHELL_LEX_STATE_LINK_CHANGE,                        \
+		.l_target = (target),                                          \
+	})
+#define LINK_POP(tok)                                                          \
+	((struct bshell_lex_state_link) {                                      \
+		.l_token = (tok),                                              \
+		.l_type = BSHELL_LEX_STATE_LINK_POP,                           \
+	})
+#define LINK_POP2(tok, flags)                                                  \
+	((struct bshell_lex_state_link) {                                      \
+		.l_token = (tok),                                              \
+		.l_type = BSHELL_LEX_STATE_LINK_POP,                           \
+		.l_flags = (flags),                                            \
+	})
+#define LINK_NONE(tok)                                                         \
+	((struct bshell_lex_state_link) {                                      \
+		.l_token = (tok),                                              \
+		.l_type = BSHELL_LEX_STATE_LINK_NONE,                          \
+	})
+#define LINK_END ((struct bshell_lex_state_link) {})
+
+struct bshell_lex_state_link {
+	unsigned int l_token;
+	enum {
+		BSHELL_LEX_STATE_LINK_NONE,
+		BSHELL_LEX_STATE_LINK_PUSH,
+		BSHELL_LEX_STATE_LINK_CHANGE,
+		BSHELL_LEX_STATE_LINK_POP,
+	} l_type;
+	enum link_flags l_flags;
+	enum bshell_lex_state_id l_target;
+	enum state_flags l_target_flags;
+	unsigned int l_terminators[BSHELL_LEX_STATE_MAX_TERMINATORS];
+};
+
+typedef enum bshell_status (*lex_state_pump_token)(struct bshell_lex_ctx *);
+typedef enum bshell_status (*lex_state_begin)(struct bshell_lex_ctx *);
+typedef enum bshell_status (*lex_state_end)(struct bshell_lex_ctx *);
+
+struct bshell_lex_state_type {
+	enum bshell_lex_state_id s_id;
+	lex_state_pump_token s_pump_token;
+	lex_state_begin s_begin;
+	lex_state_end s_end;
+
+	const unsigned int *s_keywords;
+	const unsigned int *s_operators;
+	const unsigned int *s_symbols;
+	const struct bshell_lex_state_link *s_links;
+};
+
+extern enum bshell_status pump_token_statement(struct bshell_lex_ctx *ctx);
+extern enum bshell_status pump_token_expression(struct bshell_lex_ctx *ctx);
+extern enum bshell_status pump_token_command(struct bshell_lex_ctx *ctx);
+extern enum bshell_status pump_token_arithmetic(struct bshell_lex_ctx *ctx);
+extern enum bshell_status pump_token_string(struct bshell_lex_ctx *ctx);
+
+extern void set_token_start(struct bshell_lex_ctx *ctx);
+extern void set_token_end(struct bshell_lex_ctx *ctx);
+
+extern struct bshell_lex_state *lex_state_push(
+	struct bshell_lex_ctx *ctx,
+	enum bshell_lex_state_id state_type,
+	enum state_flags flags);
+extern void lex_state_pop(struct bshell_lex_ctx *ctx);
+extern struct bshell_lex_state *lex_state_get(struct bshell_lex_ctx *ctx);
+extern void lex_state_change(
+	struct bshell_lex_ctx *ctx,
+	enum bshell_lex_state_id type);
+extern fx_string *lex_state_get_tempstr(struct bshell_lex_ctx *ctx);
+extern void lex_state_add_terminator(
+	struct bshell_lex_state *state,
+	unsigned int tok);
+extern bool lex_state_terminates_at_token(
+	struct bshell_lex_ctx *ctx,
+	unsigned int tok);
+
+extern fx_wchar peek_char(struct bshell_lex_ctx *ctx);
+extern fx_wchar peek_char_noread(struct bshell_lex_ctx *ctx);
+extern fx_wchar peek2_char(struct bshell_lex_ctx *ctx);
+extern fx_wchar peek2_char_noread(struct bshell_lex_ctx *ctx);
+extern void advance_char(struct bshell_lex_ctx *ctx);
+extern void advance_char_noread(struct bshell_lex_ctx *ctx);
+
+extern bool string_is_valid_number(
+	const char *s,
+	fx_value *out,
+	enum bshell_lex_token_type *out_type);
+extern bool convert_word_to_number(struct bshell_lex_token *tok);
+extern bool convert_word_to_keyword(struct bshell_lex_token *tok);
+extern bool convert_word_to_operator(
+	struct bshell_lex_ctx *ctx,
+	struct bshell_lex_token *tok);
+
+extern void enqueue_token(
+	struct bshell_lex_ctx *ctx,
+	struct bshell_lex_token *tok);
+extern void enqueue_token_with_coordinates(
+	struct bshell_lex_ctx *ctx,
+	struct bshell_lex_token *tok,
+	const struct bshell_char_cell *start,
+	const struct bshell_char_cell *end);
+
+extern enum bshell_status read_word(
+	struct bshell_lex_ctx *ctx,
+	enum read_flags flags,
+	struct bshell_lex_token **out);
+extern enum bshell_status read_symbol(
+	struct bshell_lex_ctx *ctx,
+	const struct bshell_lex_token_definition **out);
+extern enum bshell_status read_literal_string(
+	struct bshell_lex_ctx *ctx,
+	struct bshell_lex_token **out);
+extern enum bshell_status read_line_comment(struct bshell_lex_ctx *lex);
+extern enum bshell_status read_var(
+	struct bshell_lex_ctx *ctx,
+	enum bshell_lex_token_type type,
+	struct bshell_lex_token **out);
+extern enum bshell_status read_braced_var(
+	struct bshell_lex_ctx *ctx,
+	enum bshell_lex_token_type type,
+	struct bshell_lex_token **out);
+
+extern enum bshell_status push_symbol(
+	struct bshell_lex_ctx *ctx,
+	enum bshell_lex_symbol sym);
+
+extern bool char_can_begin_symbol(struct bshell_lex_ctx *ctx, char c);
+extern bool char_can_begin_symbol_in_state(
+	struct bshell_lex_ctx *ctx,
+	char c,
+	enum bshell_lex_state_id state_type);
+extern bool char_has_flags(
+	struct bshell_lex_ctx *ctx,
+	char c,
+	enum bshell_lex_token_flags flags);
+extern bool keyword_has_flags(
+	struct bshell_lex_ctx *ctx,
+	enum bshell_lex_keyword kw,
+	enum bshell_lex_token_flags flags);
+extern enum bshell_lex_token_flags keyword_get_flags(
+	struct bshell_lex_ctx *ctx,
+	enum bshell_lex_keyword kw);
+extern bool symbol_has_flags(
+	struct bshell_lex_ctx *ctx,
+	enum bshell_lex_symbol sym,
+	enum bshell_lex_token_flags flags);
+extern enum bshell_lex_token_flags symbol_get_flags(
+	struct bshell_lex_ctx *ctx,
+	enum bshell_lex_symbol sym);
+extern enum bshell_lex_operator get_bshell_operator_with_string(
+	struct bshell_lex_ctx *ctx,
+	const char *s);
+
+extern void handle_lex_state_transition(
+	struct bshell_lex_ctx *ctx,
+	unsigned int token);
+
+#endif

bshell.runtime/parse/lex/statement.c

@@ -0,0 +1,254 @@
+#include "lex-internal.h"
+
+static enum bshell_status statement_hyphen(struct bshell_lex_ctx *ctx)
+{
+	fx_wchar c = peek_char(ctx);
+	if (!fx_wchar_is_alnum(c)) {
+		push_symbol(ctx, BSHELL_SYM_HYPHEN);
+		handle_lex_state_transition(ctx, BSHELL_SYM_HYPHEN);
+		return BSHELL_SUCCESS;
+	}
+
+	struct bshell_lex_token *tok = NULL;
+	enum bshell_status status = read_word(
+		ctx,
+		READ_NO_SET_TOKEN_START | READ_APPEND_HYPHEN,
+		&tok);
+	if (status != BSHELL_SUCCESS) {
+		return status;
+	}
+
+	unsigned int token_type = BSHELL_TOK_WORD;
+
+	if (convert_word_to_number(tok)) {
+		token_type = tok->tok_type;
+
+		/* because of APPEND_HYPHEN (which is needed to ensure operator
+		 * tokens are detected properly), the resulting number will be
+		 * negative.
+		 * this token will be preceded by a HYPHEN token, so the number
+		 * must be positive */
+		fx_value neg = FX_INT(-1);
+		fx_value_multiply(&tok->tok_number, &neg, &tok->tok_number);
+		push_symbol(ctx, BSHELL_SYM_HYPHEN);
+	} else if (convert_word_to_operator(ctx, tok)) {
+		token_type = tok->tok_operator;
+	}
+
+	handle_lex_state_transition(ctx, token_type);
+	enqueue_token(ctx, tok);
+
+	return BSHELL_SUCCESS;
+}
+
+static enum bshell_status statement_symbol(struct bshell_lex_ctx *ctx)
+{
+	const struct bshell_lex_token_definition *sym = NULL;
+	enum bshell_status status = read_symbol(ctx, &sym);
+
+	if (status != BSHELL_SUCCESS) {
+		return status;
+	}
+
+	handle_lex_state_transition(ctx, sym->id);
+
+	struct bshell_lex_token *tok = NULL;
+	switch (sym->id) {
+	case BSHELL_SYM_DQUOTE:
+		return BSHELL_SUCCESS;
+	case BSHELL_SYM_HYPHEN:
+		return statement_hyphen(ctx);
+	case BSHELL_SYM_SQUOTE:
+		status = read_literal_string(ctx, &tok);
+		if (status != BSHELL_SUCCESS) {
+			return status;
+		}
+		enqueue_token(ctx, tok);
+		return BSHELL_SUCCESS;
+
+	case BSHELL_SYM_HASH:
+		return read_line_comment(ctx);
+	case BSHELL_SYM_DOLLAR:
+		status = read_var(ctx, BSHELL_TOK_VAR, &tok);
+		if (status != BSHELL_SUCCESS) {
+			return status;
+		}
+
+		enqueue_token(ctx, tok);
+		return status;
+	case BSHELL_SYM_AT:
+		status = read_var(ctx, BSHELL_TOK_VAR_SPLAT, &tok);
+		if (status != BSHELL_SUCCESS) {
+			return status;
+		}
+
+		enqueue_token(ctx, tok);
+		return status;
+	case BSHELL_SYM_DOLLAR_LEFT_BRACE:
+		status = read_braced_var(ctx, BSHELL_TOK_VAR, &tok);
+		if (status != BSHELL_SUCCESS) {
+			return status;
+		}
+
+		enqueue_token(ctx, tok);
+		return status;
+	default:
+		break;
+	}
+
+	push_symbol(ctx, sym->id);
+	return BSHELL_SUCCESS;
+}
+
+static enum bshell_status statement_word(struct bshell_lex_ctx *ctx)
+{
+	struct bshell_lex_token *word = NULL;
+	enum bshell_status status = read_word(ctx, 0, &word);
+	if (status != BSHELL_SUCCESS) {
+		return status;
+	}
+
+	struct bshell_lex_state *state = lex_state_get(ctx);
+
+	bool enable_keywords = !(state->s_flags & STATEMENT_F_DISABLE_KEYWORDS);
+	unsigned int token = BSHELL_TOK_WORD;
+
+	if (enable_keywords && convert_word_to_keyword(word)) {
+		token = word->tok_keyword;
+	} else if (convert_word_to_number(word)) {
+		token = word->tok_type;
+	}
+
+	handle_lex_state_transition(ctx, token);
+
+	enqueue_token(ctx, word);
+	return BSHELL_SUCCESS;
+}
+
+static enum bshell_status statement_pump_token(struct bshell_lex_ctx *ctx)
+{
+	fx_wchar c = peek_char(ctx);
+	bool newline = false;
+
+	set_token_start(ctx);
+	while (fx_wchar_is_space(c)) {
+		if (c == '\n') {
+			newline = true;
+		}
+
+		set_token_end(ctx);
+		advance_char_noread(ctx);
+		c = peek_char_noread(ctx);
+	}
+
+	if (newline) {
+		struct bshell_lex_token *tok = bshell_lex_token_create(BSHELL_TOK_LINEFEED);
+		enqueue_token(ctx, tok);
+		handle_lex_state_transition(ctx, BSHELL_TOK_LINEFEED);
+		return BSHELL_SUCCESS;
+	}
+
+	if (char_can_begin_symbol(ctx, c)) {
+		return statement_symbol(ctx);
+	}
+
+	if (char_has_flags(ctx, c, BSHELL_LEX_TOKEN_UNARY_ARITHMETIC)) {
+		lex_state_change(ctx, BSHELL_LEX_STATE_ARITHMETIC);
+		return BSHELL_SUCCESS;
+	}
+
+	return statement_word(ctx);
+}
+
+static const struct bshell_lex_state_link links[] = {
+	LINK_PUSH(BSHELL_SYM_DQUOTE, BSHELL_LEX_STATE_STRING, 0),
+	/* arithmetic tokens */
+	LINK_CHANGE(BSHELL_TOK_KEYWORD, BSHELL_LEX_STATE_ARITHMETIC),
+	LINK_CHANGE(BSHELL_SYM_SQUOTE, BSHELL_LEX_STATE_ARITHMETIC),
+	LINK_CHANGE(BSHELL_TOK_INT, BSHELL_LEX_STATE_ARITHMETIC),
+	LINK_CHANGE(BSHELL_TOK_DOUBLE, BSHELL_LEX_STATE_ARITHMETIC),
+	LINK_PUSH(BSHELL_SYM_DOLLAR, BSHELL_LEX_STATE_ARITHMETIC, 0),
+	LINK_PUSH_WITH_TERM(
+		BSHELL_SYM_DOLLAR_LEFT_BRACE,
+		BSHELL_LEX_STATE_ARITHMETIC,
+		0,
+		BSHELL_SYM_RIGHT_BRACE),
+	LINK_CHANGE(BSHELL_SYM_AT_LEFT_BRACE, BSHELL_LEX_STATE_ARITHMETIC),
+	LINK_CHANGE(BSHELL_SYM_AT_LEFT_PAREN, BSHELL_LEX_STATE_ARITHMETIC),
+	LINK_PUSH_WITH_TERM(
+		BSHELL_SYM_AT_LEFT_BRACE,
+		BSHELL_LEX_STATE_HASHTABLE,
+		0,
+		BSHELL_SYM_RIGHT_BRACE),
+	LINK_PUSH(BSHELL_SYM_AT, BSHELL_LEX_STATE_ARITHMETIC, 0),
+	LINK_CHANGE(BSHELL_SYM_LEFT_PAREN, BSHELL_LEX_STATE_ARITHMETIC),
+	LINK_CHANGE(BSHELL_SYM_LEFT_BRACKET, BSHELL_LEX_STATE_ARITHMETIC),
+	LINK_CHANGE(BSHELL_SYM_BANG, BSHELL_LEX_STATE_ARITHMETIC),
+	LINK_PUSH_WITH_TERM(
+		BSHELL_SYM_LEFT_PAREN,
+		BSHELL_LEX_STATE_STATEMENT,
+		STATEMENT_F_DISABLE_KEYWORDS,
+		BSHELL_SYM_RIGHT_PAREN),
+
+	/* statement tokens */
+	LINK_PUSH_WITH_TERM(
+		BSHELL_SYM_LEFT_BRACE,
+		BSHELL_LEX_STATE_STATEMENT,
+		0,
+		BSHELL_SYM_RIGHT_BRACE),
+	LINK_PUSH_WITH_TERM(
+		BSHELL_SYM_DOLLAR_LEFT_PAREN,
+		BSHELL_LEX_STATE_STATEMENT,
+		0,
+		BSHELL_SYM_RIGHT_PAREN),
+
+	/* command tokens */
+	LINK_CHANGE(BSHELL_KW_FUNC, BSHELL_LEX_STATE_COMMAND),
+	LINK_CHANGE(BSHELL_SYM_AMPERSAND, BSHELL_LEX_STATE_COMMAND),
+	LINK_CHANGE(BSHELL_TOK_WORD, BSHELL_LEX_STATE_COMMAND),
+	LINK_END,
+};
+
+static const unsigned int keywords[] = {
+	BSHELL_KW_FUNC,
+	BSHELL_KW_IF,
+	BSHELL_KW_ELSEIF,
+	BSHELL_KW_ELSE,
+	BSHELL_KW_NONE,
+};
+
+static const unsigned int operators[] = {
+	BSHELL_TKOP_BNOT,
+	BSHELL_TKOP_NOT,
+	BSHELL_TKOP_NONE,
+};
+
+static const unsigned int symbols[] = {
+	BSHELL_SYM_AMPERSAND,
+	BSHELL_SYM_BANG,
+	BSHELL_SYM_SQUOTE,
+	BSHELL_SYM_DQUOTE,
+	BSHELL_SYM_HASH,
+	BSHELL_SYM_AT,
+	BSHELL_SYM_AT_LEFT_PAREN,
+	BSHELL_SYM_AT_LEFT_BRACE,
+	BSHELL_SYM_PIPE,
+	BSHELL_SYM_COMMA,
+	BSHELL_SYM_SEMICOLON,
+	BSHELL_SYM_LEFT_BRACE,
+	BSHELL_SYM_RIGHT_BRACE,
+	BSHELL_SYM_LEFT_BRACKET,
+	BSHELL_SYM_RIGHT_BRACKET,
+	BSHELL_SYM_LEFT_PAREN,
+	BSHELL_SYM_RIGHT_PAREN,
+	BSHELL_SYM_NONE,
+};
+
+const struct bshell_lex_state_type lex_statement_state = {
+	.s_id = BSHELL_LEX_STATE_STATEMENT,
+	.s_pump_token = statement_pump_token,
+	.s_links = links,
+	.s_keywords = keywords,
+	.s_operators = operators,
+	.s_symbols = symbols,
+};

bshell.runtime/parse/lex/string.c

@@ -1,8 +1,8 @@
 #include "lex-internal.h"
 
-static enum bshell_status string_symbol(struct lex_ctx *ctx)
+static enum bshell_status string_symbol(struct bshell_lex_ctx *ctx)
 {
-	const struct lex_token_def *sym = NULL;
+	const struct bshell_lex_token_definition *sym = NULL;
 	enum bshell_status status = read_symbol(ctx, &sym);
 
 	if (status != BSHELL_SUCCESS) {
@@ -11,31 +11,31 @@ static enum bshell_status string_symbol(struct lex_ctx *ctx)
 
 	handle_lex_state_transition(ctx, sym->id);
 
-	struct lex_token *tok = NULL;
+	struct bshell_lex_token *tok = NULL;
 
 	switch (sym->id) {
-	case SYM_DQUOTE:
+	case BSHELL_SYM_DQUOTE:
 		return BSHELL_SUCCESS;
-	case SYM_DOLLAR_LEFT_PAREN:
+	case BSHELL_SYM_DOLLAR_LEFT_PAREN:
 		return push_symbol(ctx, sym->id);
-	case SYM_DOLLAR:
+	case BSHELL_SYM_DOLLAR:
-		status = read_var(ctx, TOK_VAR, &tok);
+		status = read_var(ctx, BSHELL_TOK_VAR, &tok);
 		if (status != BSHELL_SUCCESS) {
 			return status;
 		}
 
 		enqueue_token(ctx, tok);
 		return status;
-	case SYM_AT:
+	case BSHELL_SYM_AT:
-		status = read_var(ctx, TOK_VAR_SPLAT, &tok);
+		status = read_var(ctx, BSHELL_TOK_VAR_SPLAT, &tok);
 		if (status != BSHELL_SUCCESS) {
 			return status;
 		}
 
 		enqueue_token(ctx, tok);
 		return status;
-	case SYM_DOLLAR_LEFT_BRACE:
+	case BSHELL_SYM_DOLLAR_LEFT_BRACE:
-		status = read_braced_var(ctx, TOK_VAR, &tok);
+		status = read_braced_var(ctx, BSHELL_TOK_VAR, &tok);
 		if (status != BSHELL_SUCCESS) {
 			return status;
 		}
@@ -49,7 +49,7 @@ static enum bshell_status string_symbol(struct lex_ctx *ctx)
 	return BSHELL_ERR_BAD_SYNTAX;
 }
 
-static enum bshell_status string_content(struct lex_ctx *ctx)
+static enum bshell_status string_content(struct bshell_lex_ctx *ctx)
 {
 	fx_wchar c = FX_WCHAR_INVALID;
 	fx_string *temp = lex_state_get_tempstr(ctx);
@@ -76,17 +76,17 @@ static enum bshell_status string_content(struct lex_ctx *ctx)
 		return BSHELL_SUCCESS;
 	}
 
-	struct lex_token *tok = lex_token_create_with_string(
+	struct bshell_lex_token *tok = bshell_lex_token_create_with_string(
-		TOK_STRING,
+		BSHELL_TOK_STRING,
 		fx_string_get_cstr(temp));
 	enqueue_token(ctx, tok);
 
 	return BSHELL_SUCCESS;
 }
 
-static enum bshell_status string_begin(struct lex_ctx *ctx)
+static enum bshell_status string_begin(struct bshell_lex_ctx *ctx)
 {
-	struct lex_token *tok = lex_token_create(TOK_STR_START);
+	struct bshell_lex_token *tok = bshell_lex_token_create(BSHELL_TOK_STR_START);
 	if (!tok) {
 		return BSHELL_ERR_NO_MEMORY;
 	}
@@ -95,9 +95,9 @@ static enum bshell_status string_begin(struct lex_ctx *ctx)
 	return BSHELL_SUCCESS;
 }
 
-static enum bshell_status string_end(struct lex_ctx *ctx)
+static enum bshell_status string_end(struct bshell_lex_ctx *ctx)
 {
-	struct lex_token *tok = lex_token_create(TOK_STR_END);
+	struct bshell_lex_token *tok = bshell_lex_token_create(BSHELL_TOK_STR_END);
 	if (!tok) {
 		return BSHELL_ERR_NO_MEMORY;
 	}
@@ -106,7 +106,7 @@ static enum bshell_status string_end(struct lex_ctx *ctx)
 	return BSHELL_SUCCESS;
 }
 
-static enum bshell_status string_pump_token(struct lex_ctx *ctx)
+static enum bshell_status string_pump_token(struct bshell_lex_ctx *ctx)
 {
 	fx_wchar c = peek_char(ctx);
 
@@ -117,22 +117,22 @@ static enum bshell_status string_pump_token(struct lex_ctx *ctx)
 	return string_content(ctx);
 }
 
-static const struct lex_state_link links[] = {
+static const struct bshell_lex_state_link links[] = {
-	LINK_PUSH(SYM_DOLLAR_LEFT_PAREN, LEX_STATE_STATEMENT, 0),
+	LINK_PUSH(BSHELL_SYM_DOLLAR_LEFT_PAREN, BSHELL_LEX_STATE_STATEMENT, 0),
-	LINK_POP(SYM_DQUOTE),
+	LINK_POP(BSHELL_SYM_DQUOTE),
 	LINK_END,
 };
 
 static const unsigned int symbols[] = {
-	SYM_DOLLAR,
+	BSHELL_SYM_DOLLAR,
-	SYM_DOLLAR_LEFT_PAREN,
+	BSHELL_SYM_DOLLAR_LEFT_PAREN,
-	SYM_DOLLAR_LEFT_BRACE,
+	BSHELL_SYM_DOLLAR_LEFT_BRACE,
-	SYM_DQUOTE,
+	BSHELL_SYM_DQUOTE,
-	SYM_NONE,
+	BSHELL_SYM_NONE,
 };
 
-const struct lex_state_type lex_string_state = {
+const struct bshell_lex_state_type lex_string_state = {
-	.s_id = LEX_STATE_STRING,
+	.s_id = BSHELL_LEX_STATE_STRING,
 	.s_begin = string_begin,
 	.s_end = string_end,
 	.s_pump_token = string_pump_token,

bshell.runtime/parse/lex/word.c

@@ -1,26 +1,26 @@
 #include "lex-internal.h"
 
-static enum bshell_status word_symbol(struct lex_ctx *ctx)
+static enum bshell_status word_symbol(struct bshell_lex_ctx *ctx)
 {
-	const struct lex_token_def *sym = NULL;
+	const struct bshell_lex_token_definition *sym = NULL;
 	enum bshell_status status = read_symbol(ctx, &sym);
 
 	if (status != BSHELL_SUCCESS) {
 		return status;
 	}
 
-	struct lex_token *tok = NULL;
+	struct bshell_lex_token *tok = NULL;
 
 	switch (sym->id) {
-	case SYM_DOLLAR_LEFT_PAREN:
+	case BSHELL_SYM_DOLLAR_LEFT_PAREN:
 		status = push_symbol(ctx, sym->id);
 		if (status != BSHELL_SUCCESS) {
 			return status;
 		}
 
-		lex_state_push(ctx, LEX_STATE_STATEMENT, 0);
+		lex_state_push(ctx, BSHELL_LEX_STATE_STATEMENT, 0);
 		return BSHELL_SUCCESS;
-	case SYM_RIGHT_PAREN:
+	case BSHELL_SYM_RIGHT_PAREN:
 		lex_state_pop(ctx);
 
 		status = push_symbol(ctx, sym->id);
@@ -28,16 +28,16 @@ static enum bshell_status word_symbol(struct lex_ctx *ctx)
 			return status;
 		}
 		return BSHELL_SUCCESS;
-	case SYM_DOLLAR:
+	case BSHELL_SYM_DOLLAR:
-		status = read_var(ctx, TOK_VAR, &tok);
+		status = read_var(ctx, BSHELL_TOK_VAR, &tok);
 		if (status != BSHELL_SUCCESS) {
 			return status;
 		}
 
 		enqueue_token(ctx, tok);
 		return status;
-	case SYM_AT:
+	case BSHELL_SYM_AT:
-		status = read_var(ctx, TOK_VAR_SPLAT, &tok);
+		status = read_var(ctx, BSHELL_TOK_VAR_SPLAT, &tok);
 		if (status != BSHELL_SUCCESS) {
 			return status;
 		}
@@ -51,7 +51,7 @@ static enum bshell_status word_symbol(struct lex_ctx *ctx)
 	return BSHELL_ERR_BAD_SYNTAX;
 }
 
-static enum bshell_status word_content(struct lex_ctx *ctx)
+static enum bshell_status word_content(struct bshell_lex_ctx *ctx)
 {
 	fx_wchar c = FX_WCHAR_INVALID;
 	fx_string *temp = lex_state_get_tempstr(ctx);
@@ -82,17 +82,17 @@ static enum bshell_status word_content(struct lex_ctx *ctx)
 		return BSHELL_SUCCESS;
 	}
 
-	struct lex_token *tok = lex_token_create_with_string(
+	struct bshell_lex_token *tok = bshell_lex_token_create_with_string(
-		TOK_WORD,
+		BSHELL_TOK_WORD,
 		fx_string_get_cstr(temp));
 	enqueue_token(ctx, tok);
 
 	return BSHELL_SUCCESS;
 }
 
-static enum bshell_status word_begin(struct lex_ctx *ctx)
+static enum bshell_status word_begin(struct bshell_lex_ctx *ctx)
 {
-	struct lex_token *tok = lex_token_create(TOK_WORD_START);
+	struct bshell_lex_token *tok = bshell_lex_token_create(BSHELL_TOK_WORD_START);
 	if (!tok) {
 		return BSHELL_ERR_NO_MEMORY;
 	}
@@ -105,9 +105,9 @@ static enum bshell_status word_begin(struct lex_ctx *ctx)
 	return BSHELL_SUCCESS;
 }
 
-static enum bshell_status word_end(struct lex_ctx *ctx)
+static enum bshell_status word_end(struct bshell_lex_ctx *ctx)
 {
-	struct lex_token *tok = lex_token_create(TOK_WORD_END);
+	struct bshell_lex_token *tok = bshell_lex_token_create(BSHELL_TOK_WORD_END);
 	if (!tok) {
 		return BSHELL_ERR_NO_MEMORY;
 	}
@@ -116,7 +116,7 @@ static enum bshell_status word_end(struct lex_ctx *ctx)
 	return BSHELL_SUCCESS;
 }
 
-static enum bshell_status word_pump_token(struct lex_ctx *ctx)
+static enum bshell_status word_pump_token(struct bshell_lex_ctx *ctx)
 {
 	fx_wchar c = peek_char(ctx);
 
@@ -125,7 +125,7 @@ static enum bshell_status word_pump_token(struct lex_ctx *ctx)
 		return BSHELL_SUCCESS;
 	}
 
-	if (char_has_flags(ctx, c, LEX_TOKEN_TERMINATES_WORD)) {
+	if (char_has_flags(ctx, c, BSHELL_LEX_TOKEN_TERMINATES_WORD)) {
 		lex_state_pop(ctx);
 		return BSHELL_SUCCESS;
 	}
@@ -138,23 +138,23 @@ static enum bshell_status word_pump_token(struct lex_ctx *ctx)
 }
 
 static const unsigned int symbols[] = {
-	SYM_AMPERSAND,
+	BSHELL_SYM_AMPERSAND,
-	SYM_HASH,
+	BSHELL_SYM_HASH,
-	SYM_DOLLAR,
+	BSHELL_SYM_DOLLAR,
-	SYM_DOLLAR_LEFT_PAREN,
+	BSHELL_SYM_DOLLAR_LEFT_PAREN,
-	SYM_DOLLAR_LEFT_BRACE,
+	BSHELL_SYM_DOLLAR_LEFT_BRACE,
-	SYM_PIPE,
+	BSHELL_SYM_PIPE,
-	SYM_COMMA,
+	BSHELL_SYM_COMMA,
-	SYM_SEMICOLON,
+	BSHELL_SYM_SEMICOLON,
-	SYM_LEFT_BRACE,
+	BSHELL_SYM_LEFT_BRACE,
-	SYM_RIGHT_BRACE,
+	BSHELL_SYM_RIGHT_BRACE,
-	SYM_LEFT_PAREN,
+	BSHELL_SYM_LEFT_PAREN,
-	SYM_RIGHT_PAREN,
+	BSHELL_SYM_RIGHT_PAREN,
-	SYM_NONE,
+	BSHELL_SYM_NONE,
 };
 
-const struct lex_state_type lex_word_state = {
+const struct bshell_lex_state_type lex_word_state = {
-	.s_id = LEX_STATE_WORD,
+	.s_id = BSHELL_LEX_STATE_WORD,
 	.s_begin = word_begin,
 	.s_end = word_end,
 	.s_pump_token = word_pump_token,

bshell.runtime/parse/parse.c

@@ -0,0 +1,55 @@
+#include "syntax.h"
+
+#include <bshell/ast.h>
+#include <bshell/parse/lex.h>
+#include <bshell/parse/parse.h>
+#include <bshell/parse/token.h>
+#include <stdio.h>
+#include <string.h>
+
+enum bshell_status bshell_parse_ctx_init(struct bshell_parse_ctx *ctx, struct bshell_lex_ctx *src)
+{
+	memset(ctx, 0x0, sizeof *ctx);
+
+	ctx->p_src = src;
+
+	return BSHELL_SUCCESS;
+}
+
+void bshell_parse_ctx_cleanup(struct bshell_parse_ctx *ctx)
+{
+}
+
+struct bshell_ast_node *bshell_parse_ctx_read_node(struct bshell_parse_ctx *ctx)
+{
+	parse_symbol(ctx, BSHELL_SYM_SEMICOLON);
+	parse_linefeed(ctx);
+
+	struct bshell_ast_node *result = NULL;
+	bool ok = parse_statement(ctx, &result);
+
+	return ok ? result : NULL;
+}
+
+void report_error(struct bshell_parse_ctx *ctx, const char *format, ...)
+{
+	ctx->p_status = BSHELL_ERR_BAD_SYNTAX;
+	fprintf(stderr, "PARSE: ");
+
+	va_list arg;
+	va_start(arg, format);
+	vfprintf(stderr, format, arg);
+	va_end(arg);
+
+	fprintf(stderr, "\n");
+
+	struct bshell_lex_token *tok = peek_token(ctx);
+	fprintf(stderr, "  peek_token = ");
+#if 0
+	if (tok) {
+		print_bshell_lex_token(tok);
+	} else {
+		fprintf(stderr, " EOF\n");
+	}
+#endif
+}

bshell.runtime/parse/syntax.h

@@ -0,0 +1,73 @@
+#ifndef PARSE_SYNTAX_H_
+#define PARSE_SYNTAX_H_
+
+#include <bshell/ast.h>
+#include <bshell/parse/lex.h>
+#include <bshell/parse/parse.h>
+#include <bshell/parse/token.h>
+#include <bshell/runtime/operator.h>
+#include <stdbool.h>
+#include <stdio.h>
+
+extern void report_error(struct bshell_parse_ctx *ctx, const char *format, ...);
+
+extern struct bshell_lex_token *peek_token(struct bshell_parse_ctx *ctx);
+extern enum bshell_lex_token_type peek_token_type(struct bshell_parse_ctx *ctx);
+extern enum bshell_lex_keyword peek_unknown_keyword(struct bshell_parse_ctx *ctx);
+extern enum bshell_lex_symbol peek_unknown_symbol(struct bshell_parse_ctx *ctx);
+
+extern struct bshell_lex_token *claim_token(struct bshell_parse_ctx *ctx);
+extern void discard_token(struct bshell_parse_ctx *ctx);
+
+extern bool peek_linefeed(struct bshell_parse_ctx *ctx);
+extern bool peek_symbol(struct bshell_parse_ctx *ctx, enum bshell_lex_symbol sym);
+extern bool peek_word(struct bshell_parse_ctx *ctx, struct bshell_lex_token **out);
+extern bool peek_int(struct bshell_parse_ctx *ctx);
+
+extern bool parse_linefeed(struct bshell_parse_ctx *ctx);
+extern bool parse_symbol(struct bshell_parse_ctx *ctx, enum bshell_lex_symbol sym);
+extern bool parse_keyword(struct bshell_parse_ctx *ctx, enum bshell_lex_keyword kw);
+extern bool parse_word(struct bshell_parse_ctx *ctx, struct bshell_lex_token **out);
+extern bool parse_var(struct bshell_parse_ctx *ctx, struct bshell_lex_token **out);
+extern bool parse_flag(struct bshell_parse_ctx *ctx, struct bshell_lex_token **out);
+
+extern bool peek_arith_expr(struct bshell_parse_ctx *ctx);
+extern bool parse_arith_value(
+	struct bshell_parse_ctx *ctx,
+	struct bshell_ast_node **out);
+extern bool parse_arith_expr(
+	struct bshell_parse_ctx *ctx,
+	enum bshell_operator_precedence minimum_precedence,
+	struct bshell_ast_node **out);
+
+extern bool peek_keyword_expr(struct bshell_parse_ctx *ctx);
+extern bool parse_keyword_expr(
+	struct bshell_parse_ctx *ctx,
+	struct bshell_ast_node **out);
+
+extern bool parse_if(struct bshell_parse_ctx *ctx, struct bshell_ast_node **out);
+extern bool parse_func(struct bshell_parse_ctx *ctx, struct bshell_ast_node **out);
+
+extern bool parse_fstring(struct bshell_parse_ctx *ctx, struct bshell_ast_node **out);
+
+extern bool parse_block(struct bshell_parse_ctx *ctx, struct bshell_ast_node **out);
+
+extern bool peek_command(struct bshell_parse_ctx *ctx);
+extern bool parse_pipeline(
+	struct bshell_parse_ctx *ctx,
+	struct bshell_ast_node *first_item,
+	struct bshell_ast_node **out);
+extern bool parse_command(struct bshell_parse_ctx *ctx, struct bshell_ast_node **out);
+extern bool parse_cmdcall(struct bshell_parse_ctx *ctx, struct bshell_ast_node **out);
+extern bool parse_redirect(struct bshell_parse_ctx *ctx, struct bshell_ast_node **out);
+
+extern bool parse_expr(struct bshell_parse_ctx *ctx, struct bshell_ast_node **out);
+extern bool peek_statement(struct bshell_parse_ctx *ctx);
+extern bool parse_statement(
+	struct bshell_parse_ctx *ctx,
+	struct bshell_ast_node **out);
+extern bool parse_statement_list(
+	struct bshell_parse_ctx *ctx,
+	struct bshell_ast_node **out);
+
+#endif

bshell.runtime/parse/syntax/block.c

@@ -0,0 +1,53 @@
+#include "../syntax.h"
+
+bool parse_block(struct bshell_parse_ctx *ctx, struct bshell_ast_node **out)
+{
+	if (!parse_symbol(ctx, BSHELL_SYM_LEFT_BRACE)) {
+		return false;
+	}
+
+	parse_linefeed(ctx);
+
+	struct bshell_block_ast_node *block
+		= (struct bshell_block_ast_node *)bshell_ast_node_create(
+			BSHELL_AST_BLOCK);
+
+	bool ok = true;
+	while (1) {
+		if (parse_symbol(ctx, BSHELL_SYM_RIGHT_BRACE)) {
+			break;
+		}
+
+		parse_linefeed(ctx);
+
+		struct bshell_ast_node *stmt = NULL;
+		if (!parse_statement(ctx, &stmt)) {
+			ok = false;
+			break;
+		}
+
+		fx_queue_push_back(&block->n_statements, &stmt->n_entry);
+
+		if (parse_symbol(ctx, BSHELL_SYM_RIGHT_BRACE)) {
+			break;
+		}
+
+		if (!parse_linefeed(ctx)
+		    && !parse_symbol(ctx, BSHELL_SYM_SEMICOLON)) {
+			report_error(
+				ctx,
+				"expected `;`, `}`, or linefeed after "
+				"statement");
+			ok = false;
+			break;
+		}
+	}
+
+	if (!ok) {
+		bshell_ast_node_destroy((struct bshell_ast_node *)block);
+		block = NULL;
+	}
+
+	*out = (struct bshell_ast_node *)block;
+	return true;
+}

bshell.runtime/parse/syntax/command.c

@@ -1,18 +1,18 @@
-#include "../../debug.h"
 #include "../syntax.h"
 
 #include <fx/encoding.h>
 
-static bool parse_fword(struct parse_ctx *ctx, struct ast_node **out)
+static bool parse_fword(struct bshell_parse_ctx *ctx, struct bshell_ast_node **out)
 {
-	if (peek_token_type(ctx) != TOK_WORD_START) {
+	if (peek_token_type(ctx) != BSHELL_TOK_WORD_START) {
 		return false;
 	}
 
 	discard_token(ctx);
 
-	struct fstring_ast_node *fstring
+	struct bshell_fstring_ast_node *fstring
-		= (struct fstring_ast_node *)ast_node_create(AST_FSTRING);
+		= (struct bshell_fstring_ast_node *)bshell_ast_node_create(
+			BSHELL_AST_FSTRING);
 	if (!fstring) {
 		ctx->p_status = BSHELL_ERR_NO_MEMORY;
 		return false;
@@ -20,16 +20,16 @@ static bool parse_fword(struct parse_ctx *ctx, struct ast_node **out)
 
 	bool ok = true;
 	while (ok) {
-		if (peek_token_type(ctx) == TOK_WORD_END) {
+		if (peek_token_type(ctx) == BSHELL_TOK_WORD_END) {
 			discard_token(ctx);
 			break;
 		}
 
-		struct ast_node *item = NULL;
+		struct bshell_ast_node *item = NULL;
-		if (peek_token_type(ctx) == TOK_WORD) {
+		if (peek_token_type(ctx) == BSHELL_TOK_WORD) {
-			struct word_ast_node *n
+			struct bshell_word_ast_node *n
-				= (struct word_ast_node *)ast_node_create(
+				= (struct bshell_word_ast_node *)
-					AST_WORD);
+					bshell_ast_node_create(BSHELL_AST_WORD);
 			if (!n) {
 				ctx->p_status = BSHELL_ERR_NO_MEMORY;
 				ok = false;
@@ -37,7 +37,7 @@ static bool parse_fword(struct parse_ctx *ctx, struct ast_node **out)
 			}
 
 			n->n_value = claim_token(ctx);
-			item = (struct ast_node *)n;
+			item = (struct bshell_ast_node *)n;
 		} else {
 			if (!parse_arith_value(ctx, &item)) {
 				ok = false;
@@ -49,93 +49,98 @@ static bool parse_fword(struct parse_ctx *ctx, struct ast_node **out)
 	}
 
 	if (!ok) {
-		ast_node_destroy((struct ast_node *)fstring);
+		bshell_ast_node_destroy((struct bshell_ast_node *)fstring);
 		fstring = NULL;
 	}
 
-	*out = (struct ast_node *)fstring;
+	*out = (struct bshell_ast_node *)fstring;
 	return ok;
 	return false;
 }
 
-static bool parse_cmdcall_arg(struct parse_ctx *ctx, struct ast_node **out)
+static bool parse_cmdcall_arg(
+	struct bshell_parse_ctx *ctx,
+	struct bshell_ast_node **out)
 {
 	if (ctx->p_status != BSHELL_SUCCESS) {
 		return false;
 	}
 
-	struct lex_token *tok = peek_token(ctx);
+	struct bshell_lex_token *tok = peek_token(ctx);
 	if (!tok) {
 		return false;
 	}
 
-	struct ast_node *arg = NULL;
+	struct bshell_ast_node *arg = NULL;
 
 	switch (tok->tok_type) {
-	case TOK_WORD_START:
+	case BSHELL_TOK_WORD_START:
 		return parse_fword(ctx, out);
-	case TOK_STR_START:
+	case BSHELL_TOK_STR_START:
 		return parse_fstring(ctx, out);
-	case TOK_WORD: {
+	case BSHELL_TOK_WORD: {
-		struct word_ast_node *n
+		struct bshell_word_ast_node *n
-			= (struct word_ast_node *)ast_node_create(AST_WORD);
+			= (struct bshell_word_ast_node *)bshell_ast_node_create(
+				BSHELL_AST_WORD);
 		if (!n) {
 			ctx->p_status = BSHELL_ERR_NO_MEMORY;
 			return false;
 		}
 
 		n->n_value = claim_token(ctx);
-		*out = (struct ast_node *)n;
+		*out = (struct bshell_ast_node *)n;
 		return true;
 	}
 
-	case TOK_VAR: {
+	case BSHELL_TOK_VAR: {
-		struct var_ast_node *n
+		struct bshell_var_ast_node *n
-			= (struct var_ast_node *)ast_node_create(AST_VAR);
+			= (struct bshell_var_ast_node *)bshell_ast_node_create(
+				BSHELL_AST_VAR);
 		if (!n) {
 			ctx->p_status = BSHELL_ERR_NO_MEMORY;
 			return false;
 		}
 
 		n->n_ident = claim_token(ctx);
-		*out = (struct ast_node *)n;
+		*out = (struct bshell_ast_node *)n;
 		return true;
 	}
 
-	case TOK_VAR_SPLAT: {
+	case BSHELL_TOK_VAR_SPLAT: {
-		struct var_splat_ast_node *n
+		struct bshell_var_splat_ast_node *n
-			= (struct var_splat_ast_node *)ast_node_create(
+			= (struct bshell_var_splat_ast_node *)
-				AST_VAR_SPLAT);
+				bshell_ast_node_create(BSHELL_AST_VAR_SPLAT);
 		if (!n) {
 			ctx->p_status = BSHELL_ERR_NO_MEMORY;
 			return false;
 		}
 
 		n->n_ident = claim_token(ctx);
-		*out = (struct ast_node *)n;
+		*out = (struct bshell_ast_node *)n;
 		return true;
 	}
 
-	case TOK_STRING: {
+	case BSHELL_TOK_STRING: {
-		struct string_ast_node *n
+		struct bshell_string_ast_node *n
-			= (struct string_ast_node *)ast_node_create(AST_STRING);
+			= (struct bshell_string_ast_node *)
+				bshell_ast_node_create(BSHELL_AST_STRING);
 		if (!n) {
 			ctx->p_status = BSHELL_ERR_NO_MEMORY;
 			return false;
 		}
 
 		n->n_value = claim_token(ctx);
-		*out = (struct ast_node *)n;
+		*out = (struct bshell_ast_node *)n;
 		return true;
 	}
 
-	case TOK_SYMBOL:
+	case BSHELL_TOK_SYMBOL:
 		switch (tok->tok_symbol) {
-		case SYM_LEFT_PAREN:
+		case BSHELL_SYM_LEFT_PAREN:
-		case SYM_LEFT_BRACE:
+		case BSHELL_SYM_LEFT_BRACE:
-		case SYM_DOLLAR_LEFT_PAREN:
+		case BSHELL_SYM_DOLLAR_LEFT_PAREN:
-		case SYM_AT_LEFT_BRACE:
+		case BSHELL_SYM_AT_LEFT_BRACE:
-		case SYM_AT_LEFT_PAREN:
+		case BSHELL_SYM_AT_LEFT_PAREN:
 			return parse_arith_value(ctx, out);
 		default:
 			report_error(
@@ -153,29 +158,29 @@ static bool parse_cmdcall_arg(struct parse_ctx *ctx, struct ast_node **out)
 }
 
 static bool parse_redirect_to_fd(
-	struct parse_ctx *ctx,
+	struct bshell_parse_ctx *ctx,
 	unsigned int in_fd,
 	bool append,
-	struct ast_node **out)
+	struct bshell_ast_node **out)
 {
 	if (ctx->p_status != BSHELL_SUCCESS) {
 		return false;
 	}
 
-	struct redirection_ast_node *redirect
+	struct bshell_redirection_ast_node *redirect
-		= (struct redirection_ast_node *)ast_node_create(
+		= (struct bshell_redirection_ast_node *)bshell_ast_node_create(
-			AST_REDIRECTION);
+			BSHELL_AST_REDIRECTION);
 
 	redirect->n_in = in_fd;
 	redirect->n_append = append;
 
-	if (!parse_symbol(ctx, SYM_AMPERSAND)) {
+	if (!parse_symbol(ctx, BSHELL_SYM_AMPERSAND)) {
-		ast_node_destroy((struct ast_node *)redirect);
+		bshell_ast_node_destroy((struct bshell_ast_node *)redirect);
 		return false;
 	}
 
-	struct lex_token *out_tok = NULL;
+	struct bshell_lex_token *out_tok = NULL;
-	struct ast_node *out_expr = NULL;
+	struct bshell_ast_node *out_expr = NULL;
 	long long out_fd = -1;
 
 	if (peek_word(ctx, &out_tok)) {
@@ -201,29 +206,29 @@ static bool parse_redirect_to_fd(
 		redirect->n_out_path = out_tok->tok_str;
 	}
 
-	*out = (struct ast_node *)redirect;
+	*out = (struct bshell_ast_node *)redirect;
 	return true;
 }
 
 static bool parse_redirect_to_file_squashed(
-	struct parse_ctx *ctx,
+	struct bshell_parse_ctx *ctx,
 	unsigned int in_fd,
 	bool append,
 	const char *str,
-	struct ast_node **out)
+	struct bshell_ast_node **out)
 {
 	if (ctx->p_status != BSHELL_SUCCESS) {
 		return false;
 	}
 
-	struct lex_token *tok = peek_token(ctx);
+	struct bshell_lex_token *tok = peek_token(ctx);
 	if (*str == '\0') {
 		return false;
 	}
 
-	struct redirection_ast_node *redirect
+	struct bshell_redirection_ast_node *redirect
-		= (struct redirection_ast_node *)ast_node_create(
+		= (struct bshell_redirection_ast_node *)bshell_ast_node_create(
-			AST_REDIRECTION);
+			BSHELL_AST_REDIRECTION);
 
 	redirect->n_in = in_fd;
 	redirect->n_append = append;
@@ -233,29 +238,29 @@ static bool parse_redirect_to_file_squashed(
 
 	redirect->n_out_tok = claim_token(ctx);
 
-	*out = (struct ast_node *)redirect;
+	*out = (struct bshell_ast_node *)redirect;
 	return true;
 }
 
 static bool parse_redirect_to_file_separate(
-	struct parse_ctx *ctx,
+	struct bshell_parse_ctx *ctx,
 	unsigned int in_fd,
 	bool append,
-	struct ast_node **out)
+	struct bshell_ast_node **out)
 {
 	if (ctx->p_status != BSHELL_SUCCESS) {
 		return false;
 	}
 
-	struct ast_node *out_path = NULL;
+	struct bshell_ast_node *out_path = NULL;
 	if (!parse_cmdcall_arg(ctx, &out_path)) {
 		ctx->p_status = BSHELL_ERR_BAD_SYNTAX;
 		return false;
 	}
 
-	struct redirection_ast_node *redirect
+	struct bshell_redirection_ast_node *redirect
-		= (struct redirection_ast_node *)ast_node_create(
+		= (struct bshell_redirection_ast_node *)bshell_ast_node_create(
-			AST_REDIRECTION);
+			BSHELL_AST_REDIRECTION);
 
 	redirect->n_in = in_fd;
 	redirect->n_append = append;
@@ -263,14 +268,14 @@ static bool parse_redirect_to_file_separate(
 	redirect->n_out_is_expr = true;
 	redirect->n_out_path_expr = out_path;
 
-	*out = (struct ast_node *)redirect;
+	*out = (struct bshell_ast_node *)redirect;
 	return true;
 }
 
-bool parse_redirect(struct parse_ctx *ctx, struct ast_node **out)
+bool parse_redirect(struct bshell_parse_ctx *ctx, struct bshell_ast_node **out)
 {
-	struct lex_token *tok = peek_token(ctx);
+	struct bshell_lex_token *tok = peek_token(ctx);
-	if (!tok || tok->tok_type != TOK_WORD) {
+	if (!tok || tok->tok_type != BSHELL_TOK_WORD) {
 		return false;
 	}
 
@@ -319,7 +324,7 @@ bool parse_redirect(struct parse_ctx *ctx, struct ast_node **out)
 	return false;
 }
 
-static bool peek_cmdcall_item(struct parse_ctx *ctx, bool unrestricted)
+static bool peek_cmdcall_item(struct bshell_parse_ctx *ctx, bool unrestricted)
 {
 	/* each token type falls into one of three categories:
 	 * - cmdcall item: the token can be used as part of a command call. the
@@ -334,52 +339,53 @@ static bool peek_cmdcall_item(struct parse_ctx *ctx, bool unrestricted)
 	 *   used.
 	 */
 	switch (peek_token_type(ctx)) {
-	case TOK_KEYWORD:
+	case BSHELL_TOK_KEYWORD:
-	case TOK_INT:
+	case BSHELL_TOK_INT:
-	case TOK_DOUBLE:
+	case BSHELL_TOK_DOUBLE:
-	case TOK_VAR:
+	case BSHELL_TOK_VAR:
-	case TOK_VAR_SPLAT:
+	case BSHELL_TOK_VAR_SPLAT:
-	case TOK_STRING:
+	case BSHELL_TOK_STRING:
-	case TOK_WORD_START:
+	case BSHELL_TOK_WORD_START:
 		return unrestricted;
-	case TOK_SYMBOL:
+	case BSHELL_TOK_SYMBOL:
 		switch (peek_unknown_symbol(ctx)) {
-		case SYM_PLUS:
+		case BSHELL_SYM_PLUS:
-		case SYM_HYPHEN:
+		case BSHELL_SYM_HYPHEN:
 			return unrestricted;
-		case SYM_PIPE:
+		case BSHELL_SYM_PIPE:
-		case SYM_AMPERSAND:
+		case BSHELL_SYM_AMPERSAND:
-		case SYM_SEMICOLON:
+		case BSHELL_SYM_SEMICOLON:
-		case SYM_RIGHT_PAREN:
+		case BSHELL_SYM_RIGHT_PAREN:
-		case SYM_RIGHT_BRACE:
+		case BSHELL_SYM_RIGHT_BRACE:
-		case SYM_RIGHT_BRACKET:
+		case BSHELL_SYM_RIGHT_BRACKET:
 			return false;
 		default:
 			return true;
 		}
-	case TOK_NONE:
+	case BSHELL_TOK_NONE:
-	case TOK_LINEFEED:
+	case BSHELL_TOK_LINEFEED:
 		return false;
 	default:
 		return true;
 	}
 }
 
-bool parse_cmdcall(struct parse_ctx *ctx, struct ast_node **out)
+bool parse_cmdcall(struct bshell_parse_ctx *ctx, struct bshell_ast_node **out)
 {
-	struct cmdcall_ast_node *node
+	struct bshell_cmdcall_ast_node *node
-		= (struct cmdcall_ast_node *)ast_node_create(AST_CMDCALL);
+		= (struct bshell_cmdcall_ast_node *)bshell_ast_node_create(
+			BSHELL_AST_CMDCALL);
 	if (!node) {
 		ctx->p_status = BSHELL_ERR_NO_MEMORY;
 		return false;
 	}
 
-	struct ast_node *child = NULL;
+	struct bshell_ast_node *child = NULL;
 	bool unrestricted = false;
 	bool ok = true;
 	bool stop = false;
 
-	if (parse_symbol(ctx, SYM_AMPERSAND)) {
+	if (parse_symbol(ctx, BSHELL_SYM_AMPERSAND)) {
 		unrestricted = true;
 	}
 
@@ -387,7 +393,7 @@ bool parse_cmdcall(struct parse_ctx *ctx, struct ast_node **out)
 		return false;
 	}
 
-	struct lex_token *tok = peek_token(ctx);
+	struct bshell_lex_token *tok = peek_token(ctx);
 	if (!tok) {
 		return false;
 	}
@@ -403,7 +409,7 @@ bool parse_cmdcall(struct parse_ctx *ctx, struct ast_node **out)
 			break;
 		}
 
-		struct lex_token *tok = peek_token(ctx);
+		struct bshell_lex_token *tok = peek_token(ctx);
 		if (!tok) {
 			break;
 		}
@@ -420,47 +426,48 @@ bool parse_cmdcall(struct parse_ctx *ctx, struct ast_node **out)
 	}
 
 	if (!ok) {
-		ast_node_destroy((struct ast_node *)node);
+		bshell_ast_node_destroy((struct bshell_ast_node *)node);
 		node = NULL;
 	}
 
-	*out = (struct ast_node *)node;
+	*out = (struct bshell_ast_node *)node;
 	return ok;
 }
 
-bool peek_command(struct parse_ctx *ctx)
+bool peek_command(struct bshell_parse_ctx *ctx)
 {
-	if (peek_symbol(ctx, SYM_AMPERSAND)) {
+	if (peek_symbol(ctx, BSHELL_SYM_AMPERSAND)) {
 		return true;
 	}
 
 	return peek_cmdcall_item(ctx, false);
 }
 
-bool parse_command(struct parse_ctx *ctx, struct ast_node **out)
+bool parse_command(struct bshell_parse_ctx *ctx, struct bshell_ast_node **out)
 {
-	struct ast_node *cmdcall = NULL;
+	struct bshell_ast_node *cmdcall = NULL;
 	if (!parse_cmdcall(ctx, &cmdcall)) {
 		return false;
 	}
 
-	struct pipeline_ast_node *pipeline = NULL;
+	struct bshell_pipeline_ast_node *pipeline = NULL;
 
 	while (1) {
-		if (peek_symbol(ctx, SYM_SEMICOLON) || peek_linefeed(ctx)) {
+		if (peek_symbol(ctx, BSHELL_SYM_SEMICOLON)
+		    || peek_linefeed(ctx)) {
 			break;
 		}
 
-		if (!parse_symbol(ctx, SYM_PIPE)) {
+		if (!parse_symbol(ctx, BSHELL_SYM_PIPE)) {
 			break;
 		}
 
 		if (!pipeline) {
-			pipeline = (struct pipeline_ast_node *)ast_node_create(
+			pipeline = (struct bshell_pipeline_ast_node *)
-				AST_PIPELINE);
+				bshell_ast_node_create(BSHELL_AST_PIPELINE);
 			if (!pipeline) {
 				ctx->p_status = BSHELL_ERR_NO_MEMORY;
-				ast_node_destroy(cmdcall);
+				bshell_ast_node_destroy(cmdcall);
 				return false;
 			}
 
@@ -478,7 +485,7 @@ bool parse_command(struct parse_ctx *ctx, struct ast_node **out)
 	}
 
 	if (pipeline) {
-		*out = (struct ast_node *)pipeline;
+		*out = (struct bshell_ast_node *)pipeline;
 	} else {
 		*out = cmdcall;
 	}
@@ -487,21 +494,22 @@ bool parse_command(struct parse_ctx *ctx, struct ast_node **out)
 }
 
 bool parse_pipeline(
-	struct parse_ctx *ctx,
+	struct bshell_parse_ctx *ctx,
-	struct ast_node *first_item,
+	struct bshell_ast_node *first_item,
-	struct ast_node **out)
+	struct bshell_ast_node **out)
 {
-	struct pipeline_ast_node *pipeline
+	struct bshell_pipeline_ast_node *pipeline
-		= (struct pipeline_ast_node *)ast_node_create(AST_PIPELINE);
+		= (struct bshell_pipeline_ast_node *)bshell_ast_node_create(
+			BSHELL_AST_PIPELINE);
 
 	fx_queue_push_back(&pipeline->n_stages, &first_item->n_entry);
 
 	while (1) {
-		if (!parse_symbol(ctx, SYM_PIPE)) {
+		if (!parse_symbol(ctx, BSHELL_SYM_PIPE)) {
 			break;
 		}
 
-		struct ast_node *cmdcall = NULL;
+		struct bshell_ast_node *cmdcall = NULL;
 		if (!parse_cmdcall(ctx, &cmdcall)) {
 			ctx->p_status = BSHELL_ERR_BAD_SYNTAX;
 			return false;
@@ -510,6 +518,6 @@ bool parse_pipeline(
 		fx_queue_push_back(&pipeline->n_stages, &cmdcall->n_entry);
 	}
 
-	*out = (struct ast_node *)pipeline;
+	*out = (struct bshell_ast_node *)pipeline;
 	return true;
 }

bshell.runtime/parse/syntax/expr.c

@@ -1,10 +1,10 @@
 #include "../syntax.h"
 
-bool parse_expr(struct parse_ctx *ctx, struct ast_node **out)
+bool parse_expr(struct bshell_parse_ctx *ctx, struct bshell_ast_node **out)
 {
 	bool ok = false;
 	if (!ok && peek_arith_expr(ctx)) {
-		ok = parse_arith_expr(ctx, PRECEDENCE_MINIMUM, out);
+		ok = parse_arith_expr(ctx, BSHELL_PRECEDENCE_MINIMUM, out);
 	}
 
 	if (!ok && peek_command(ctx)) {

bshell.runtime/parse/syntax/func.c

@@ -1,41 +1,42 @@
 #include "../syntax.h"
 
-bool parse_func(struct parse_ctx *ctx, struct ast_node **out)
+bool parse_func(struct bshell_parse_ctx *ctx, struct bshell_ast_node **out)
 {
-	if (!parse_keyword(ctx, KW_FUNC)) {
+	if (!parse_keyword(ctx, BSHELL_KW_FUNC)) {
 		return false;
 	}
 
-	struct lex_token *name = NULL;
+	struct bshell_lex_token *name = NULL;
 	if (!parse_word(ctx, &name)) {
 		report_error(ctx, "expected function identifier");
 		return false;
 	}
 
-	struct func_ast_node *func
+	struct bshell_func_ast_node *func
-		= (struct func_ast_node *)ast_node_create(AST_FUNC);
+		= (struct bshell_func_ast_node *)bshell_ast_node_create(
+			BSHELL_AST_FUNC);
 	if (!func) {
 		ctx->p_status = BSHELL_ERR_NO_MEMORY;
-		lex_token_destroy(name);
+		bshell_lex_token_destroy(name);
 		return false;
 	}
 
 	func->n_name = name;
 
-	if (!parse_symbol(ctx, SYM_LEFT_PAREN)) {
+	if (!parse_symbol(ctx, BSHELL_SYM_LEFT_PAREN)) {
 		report_error(ctx, "expected `(` after function identifier");
-		ast_node_destroy((struct ast_node *)func);
+		bshell_ast_node_destroy((struct bshell_ast_node *)func);
 		return false;
 	}
 
 	size_t nr_args = 0;
 	bool ok = true;
 	while (1) {
-		if (parse_symbol(ctx, SYM_RIGHT_PAREN)) {
+		if (parse_symbol(ctx, BSHELL_SYM_RIGHT_PAREN)) {
 			break;
 		}
 
-		if (nr_args > 0 && !parse_symbol(ctx, SYM_COMMA)) {
+		if (nr_args > 0 && !parse_symbol(ctx, BSHELL_SYM_COMMA)) {
 			report_error(
 				ctx,
 				"expected `,` or `)` after parameter name");
@@ -43,19 +44,21 @@ bool parse_func(struct parse_ctx *ctx, struct ast_node **out)
 			break;
 		}
 
-		struct lex_token *param_token = NULL;
+		struct bshell_lex_token *param_token = NULL;
-		struct var_ast_node *param_node = NULL;
+		struct bshell_var_ast_node *param_node = NULL;
 		if (!parse_var(ctx, &param_token)) {
 			report_error(ctx, "expected parameter variable");
 			ok = false;
 			break;
 		}
 
-		param_node = (struct var_ast_node *)ast_node_create(AST_VAR);
+		param_node
+			= (struct bshell_var_ast_node *)bshell_ast_node_create(
+				BSHELL_AST_VAR);
 		if (!param_node) {
 			ok = false;
 			ctx->p_status = BSHELL_ERR_NO_MEMORY;
-			lex_token_destroy(param_token);
+			bshell_lex_token_destroy(param_token);
 			break;
 		}
 
@@ -70,16 +73,16 @@ bool parse_func(struct parse_ctx *ctx, struct ast_node **out)
 			ctx->p_status = BSHELL_ERR_BAD_SYNTAX;
 		}
 
-		ast_node_destroy((struct ast_node *)func);
+		bshell_ast_node_destroy((struct bshell_ast_node *)func);
 		return false;
 	}
 
 	if (!parse_block(ctx, &func->n_body)) {
 		report_error(ctx, "failed to parse function body");
-		ast_node_destroy((struct ast_node *)func);
+		bshell_ast_node_destroy((struct bshell_ast_node *)func);
 		return false;
 	}
 
-	*out = (struct ast_node *)func;
+	*out = (struct bshell_ast_node *)func;
 	return true;
 }

bshell.runtime/parse/syntax/generic.c

@@ -0,0 +1,158 @@
+#include "../syntax.h"
+
+#include <bshell/parse/lex.h>
+#include <bshell/parse/parse.h>
+#include <bshell/parse/token.h>
+
+struct bshell_lex_token *claim_token(struct bshell_parse_ctx *ctx)
+{
+	return bshell_lex_ctx_claim(ctx->p_src);
+}
+
+void discard_token(struct bshell_parse_ctx *ctx)
+{
+	return bshell_lex_ctx_discard(ctx->p_src);
+}
+
+struct bshell_lex_token *peek_token(struct bshell_parse_ctx *ctx)
+{
+	return bshell_lex_ctx_peek(ctx->p_src);
+}
+
+enum bshell_lex_token_type peek_token_type(struct bshell_parse_ctx *ctx)
+{
+	struct bshell_lex_token *tok = peek_token(ctx);
+	return tok ? tok->tok_type : BSHELL_TOK_NONE;
+}
+
+enum bshell_lex_symbol peek_unknown_symbol(struct bshell_parse_ctx *ctx)
+{
+	struct bshell_lex_token *tok = peek_token(ctx);
+	return (tok && tok->tok_type == BSHELL_TOK_SYMBOL) ? tok->tok_symbol
+	                                                   : BSHELL_SYM_NONE;
+}
+
+enum bshell_lex_keyword peek_unknown_keyword(struct bshell_parse_ctx *ctx)
+{
+	struct bshell_lex_token *tok = peek_token(ctx);
+	return (tok && tok->tok_type == BSHELL_TOK_KEYWORD) ? tok->tok_keyword
+	                                                    : BSHELL_KW_NONE;
+}
+
+bool peek_word(struct bshell_parse_ctx *ctx, struct bshell_lex_token **out)
+{
+	struct bshell_lex_token *tok = peek_token(ctx);
+	if (tok && tok->tok_type == BSHELL_TOK_WORD) {
+		*out = tok;
+		return true;
+	}
+
+	return false;
+}
+
+bool peek_linefeed(struct bshell_parse_ctx *ctx)
+{
+	struct bshell_lex_token *tok = peek_token(ctx);
+	if (tok && tok->tok_type == BSHELL_TOK_LINEFEED) {
+		return true;
+	}
+
+	return false;
+}
+
+bool peek_symbol(struct bshell_parse_ctx *ctx, enum bshell_lex_symbol sym)
+{
+	struct bshell_lex_token *tok = peek_token(ctx);
+	if (!tok) {
+		return false;
+	}
+
+	if (tok->tok_type != BSHELL_TOK_SYMBOL) {
+		return false;
+	}
+
+	if (tok->tok_symbol != sym) {
+		return false;
+	}
+
+	return true;
+}
+
+bool parse_linefeed(struct bshell_parse_ctx *ctx)
+{
+	struct bshell_lex_token *tok = peek_token(ctx);
+	if (tok && tok->tok_type == BSHELL_TOK_LINEFEED) {
+		discard_token(ctx);
+		return true;
+	}
+
+	return false;
+}
+
+bool parse_symbol(struct bshell_parse_ctx *ctx, enum bshell_lex_symbol sym)
+{
+	struct bshell_lex_token *tok = peek_token(ctx);
+	if (!tok) {
+		return false;
+	}
+
+	if (tok->tok_type != BSHELL_TOK_SYMBOL) {
+		return false;
+	}
+
+	if (tok->tok_symbol != sym) {
+		return false;
+	}
+
+	discard_token(ctx);
+	return true;
+}
+
+bool parse_keyword(struct bshell_parse_ctx *ctx, enum bshell_lex_keyword kw)
+{
+	struct bshell_lex_token *tok = peek_token(ctx);
+	if (!tok) {
+		return false;
+	}
+
+	if (tok->tok_type != BSHELL_TOK_KEYWORD) {
+		return false;
+	}
+
+	if (tok->tok_keyword != kw) {
+		return false;
+	}
+
+	discard_token(ctx);
+	return true;
+}
+
+bool parse_word(struct bshell_parse_ctx *ctx, struct bshell_lex_token **out)
+{
+	struct bshell_lex_token *tok = peek_token(ctx);
+	if (!tok) {
+		return false;
+	}
+
+	if (tok->tok_type != BSHELL_TOK_WORD) {
+		return false;
+	}
+
+	*out = claim_token(ctx);
+	return true;
+}
+
+bool parse_var(struct bshell_parse_ctx *ctx, struct bshell_lex_token **out)
+{
+	struct bshell_lex_token *tok = peek_token(ctx);
+	if (!tok) {
+		return false;
+	}
+
+	if (tok->tok_type != BSHELL_TOK_VAR) {
+		return false;
+	}
+
+	*out = claim_token(ctx);
+	return true;
+}

bshell.runtime/parse/syntax/if-else.c

@@ -0,0 +1,130 @@
+#include "../syntax.h"
+
+static bool add_branch(
+	struct bshell_if_ast_node *group,
+	struct bshell_ast_node *cond,
+	struct bshell_ast_node *body)
+{
+	struct bshell_if_branch_ast_node *branch
+		= (struct bshell_if_branch_ast_node *)bshell_ast_node_create(
+			BSHELL_AST_IF_BRANCH);
+	if (!branch) {
+		return false;
+	}
+
+	branch->n_cond = cond;
+	branch->n_body = body;
+	fx_queue_push_back(&group->n_branches, &branch->n_base.n_entry);
+
+	return true;
+}
+
+bool parse_if(struct bshell_parse_ctx *ctx, struct bshell_ast_node **out)
+{
+	if (!parse_keyword(ctx, BSHELL_KW_IF)) {
+		return false;
+	}
+
+	if (!parse_symbol(ctx, BSHELL_SYM_LEFT_PAREN)) {
+		report_error(ctx, "expected `(` after `if`");
+		return false;
+	}
+
+	struct bshell_ast_node *if_cond = NULL, *if_body = NULL;
+	if (!parse_expr(ctx, &if_cond)) {
+		report_error(ctx, "invalid if condition");
+		return false;
+	}
+
+	if (!parse_symbol(ctx, BSHELL_SYM_RIGHT_PAREN)) {
+		report_error(ctx, "expected `)` after if-condition");
+		bshell_ast_node_destroy(if_cond);
+		return false;
+	}
+
+	if (!parse_block(ctx, &if_body)) {
+		report_error(ctx, "invalid if body");
+		bshell_ast_node_destroy(if_cond);
+		return false;
+	}
+
+	struct bshell_if_ast_node *if_group
+		= (struct bshell_if_ast_node *)bshell_ast_node_create(
+			BSHELL_AST_IF);
+	if (!if_group) {
+		ctx->p_status = BSHELL_ERR_NO_MEMORY;
+		bshell_ast_node_destroy(if_cond);
+		bshell_ast_node_destroy(if_body);
+		return false;
+	}
+
+	if (!add_branch(if_group, if_cond, if_body)) {
+		ctx->p_status = BSHELL_ERR_NO_MEMORY;
+		bshell_ast_node_destroy(if_cond);
+		bshell_ast_node_destroy(if_body);
+		bshell_ast_node_destroy((struct bshell_ast_node *)if_group);
+		return false;
+	}
+
+	bool done = false;
+	while (!done) {
+		struct bshell_ast_node *cond = NULL, *body = NULL;
+		if (parse_keyword(ctx, BSHELL_KW_ELSE)) {
+			done = true;
+		} else if (parse_keyword(ctx, BSHELL_KW_ELSEIF)) {
+			if (!parse_symbol(ctx, BSHELL_SYM_LEFT_PAREN)) {
+				report_error(
+					ctx,
+					"expected `(` after `elseif`");
+				return false;
+			}
+
+			if (!parse_expr(ctx, &cond)) {
+				report_error(
+					ctx,
+					"invalid conditional expression");
+				bshell_ast_node_destroy(
+					(struct bshell_ast_node *)if_group);
+				return false;
+			}
+
+			if (!parse_symbol(ctx, BSHELL_SYM_RIGHT_PAREN)) {
+				report_error(
+					ctx,
+					"expected `)` after elseif-condition");
+				bshell_ast_node_destroy(if_cond);
+				return false;
+			}
+		} else {
+			done = true;
+			break;
+		}
+
+		if (!parse_block(ctx, &body)) {
+			report_error(ctx, "invalid conditional body");
+			if (cond) {
+				bshell_ast_node_destroy(cond);
+			}
+
+			bshell_ast_node_destroy(
+				(struct bshell_ast_node *)if_group);
+			return false;
+		}
+
+		if (!add_branch(if_group, cond, body)) {
+			report_error(ctx, "failed to add branch to if-group");
+			if (cond) {
+				bshell_ast_node_destroy(cond);
+			}
+
+			bshell_ast_node_destroy(body);
+			bshell_ast_node_destroy(
+				(struct bshell_ast_node *)if_group);
+			return false;
+		}
+	}
+
+	*out = (struct bshell_ast_node *)if_group;
+
+	return true;
+}

bshell.runtime/parse/syntax/keyword.c

@@ -0,0 +1,21 @@
+#include "../syntax.h"
+
+bool peek_keyword_expr(struct bshell_parse_ctx *ctx)
+{
+	return peek_unknown_keyword(ctx) != BSHELL_KW_NONE;
+}
+
+bool parse_keyword_expr(struct bshell_parse_ctx *ctx, struct bshell_ast_node **out)
+{
+	switch (peek_unknown_keyword(ctx)) {
+	case BSHELL_KW_NONE:
+		return false;
+	case BSHELL_KW_IF:
+		return parse_if(ctx, out);
+	case BSHELL_KW_FUNC:
+		return parse_func(ctx, out);
+	default:
+		ctx->p_status = BSHELL_ERR_BAD_SYNTAX;
+		return false;
+	}
+}