meta: replace bluelib references with fx

CMakeLists.txt

@@ -24,10 +24,10 @@ if (NOT MIE_STATIC)
 endif ()
 
 if (MIE_STATIC)
-	set(Bluelib_STATIC TRUE)
+	set(FX_STATIC TRUE)
 endif ()
 
-find_package(Bluelib REQUIRED)
+find_package(FX REQUIRED)
 
 add_subdirectory(mie)
 add_subdirectory(tool)

cmake/FindBluelib.cmake

@@ -1,189 +0,0 @@
-#[=======================================================================[.rst:
-FindBluelib
-------------
-
-Find the Bluelib library and header directories
-
-Imported Targets
-^^^^^^^^^^^^^^^^
-
-This module defines the following :prop_tgt:`IMPORTED` target:
-
-``Bluelib::Bluelib``
-The Bluelib library, if found
-
-Result Variables
-^^^^^^^^^^^^^^^^
-
-This module will set the following variables in your project:
-
-``Bluelib_FOUND``
-true if the Bluelib C headers and libraries were found
-``Bluelib_INCLUDE_DIR``
-directories containing the Bluelib C headers.
-
-``Bluelib_LIBRARY``
-the C library to link against
-
-Hints
-^^^^^
-
-The user may set the environment variable ``Bluelib_PREFIX`` to the root
-directory of a Bluelib library installation.
-#]=======================================================================]
-
-set (Bluelib_SEARCH_PATHS
-	~/Library/Frameworks
-	/Library/Frameworks
-	/usr/local
-	/usr/local/share
-	/usr
-	/sw # Fink
-	/opt/local # DarwinPorts
-	/opt/csw # Blastwave
-	/opt
-	${Bluelib_PREFIX}
-	$ENV{Bluelib_PREFIX})
-
-if (Bluelib_STATIC)
-	set(_lib_suffix "-s")
-endif ()
-
-set(supported_components Core Ds Term Cmd Io Serial Compress)
-set(components ${Bluelib_FIND_COMPONENTS})
-string(REPLACE ";" ", " supported_components_string_list "${supported_components}")
-
-if (NOT components)
-	set(components ${supported_components})
-endif ()
-
-set(required_vars)
-
-foreach (component ${components})
-	if (NOT "${component}" IN_LIST supported_components)
-		message(FATAL_ERROR "'${component}' is not a valid Bluelib module.\nSupported modules: ${supported_components_string_list}")
-	endif ()
-
-	string(TOLOWER ${component} header_name)
-	set(lib_name ${header_name}${_lib_suffix})
-
-	if (NOT Bluelib_${component}_INCLUDE_DIR)
-		find_path(Bluelib_${component}_INCLUDE_DIR
-			NAMES blue/${header_name}.h ${Bluelib_FIND_ARGS}
-			PATH_SUFFIXES include
-			PATHS ${Bluelib_SEARCH_PATHS})
-	endif ()
-
-	if (NOT Bluelib_${component}_LIBRARY)
-		find_library(Bluelib_${component}_LIBRARY
-			NAMES blue-${lib_name} ${Bluelib_FIND_ARGS}
-			PATH_SUFFIXES lib
-			PATHS ${Bluelib_SEARCH_PATHS})
-	else ()
-		# on Windows, ensure paths are in canonical format (forward slahes):
-		file(TO_CMAKE_PATH "${Bluelib_${component}_LIBRARY}" Bluelib_${component}_LIBRARY)
-	endif()
-
-	list(APPEND required_vars Bluelib_${component}_INCLUDE_DIR Bluelib_${component}_LIBRARY)
-endforeach (component)
-
-unset(Bluelib_FIND_ARGS)
-
-include(FindPackageHandleStandardArgs)
-
-find_package_handle_standard_args(Bluelib
-	REQUIRED_VARS ${required_vars})
-
-if (Bluelib_FOUND)
-	set(created_targets)
-	foreach (component ${components})
-		string(TOLOWER ${component} header_name)
-		set(lib_name ${header_name}${_lib_suffix})
-
-		if(NOT TARGET Bluelib::${component})
-			add_library(Bluelib::${component} UNKNOWN IMPORTED)
-			set_target_properties(Bluelib::${component} PROPERTIES
-				INTERFACE_INCLUDE_DIRECTORIES "${Bluelib_${component}_INCLUDE_DIR}")
-			target_compile_definitions(Bluelib::${component} INTERFACE _CRT_SECURE_NO_WARNINGS=1)
-
-			if (Bluelib_STATIC)
-				target_compile_definitions(Bluelib::${component} INTERFACE BLUELIB_STATIC=1)
-			endif ()
-
-			set_target_properties(Bluelib::${component} PROPERTIES
-				IMPORTED_LINK_INTERFACE_LANGUAGES "C"
-				IMPORTED_LOCATION "${Bluelib_${component}_LIBRARY}")
-			set(created_targets ${created_targets} ${component})
-		endif ()
-	endforeach (component)
-
-	foreach (component ${created_targets})
-		if ("${component}" STREQUAL "Ds")
-			if (NOT TARGET Bluelib::Core)
-				message(FATAL_ERROR "Bluelib: Module 'Ds' depends on 'Core', which was not specified in find_package()")
-			endif ()
-
-			target_link_libraries(Bluelib::Ds INTERFACE Bluelib::Core)
-		endif ()
-
-		if ("${component}" STREQUAL "Term")
-			if (NOT TARGET Bluelib::Core)
-				message(FATAL_ERROR "Bluelib: Module 'Term' depends on 'Core', which was not specified in find_package()")
-			endif ()
-
-			if (NOT TARGET Bluelib::Ds)
-				message(FATAL_ERROR "Bluelib: Module 'Term' depends on 'Ds', which was not specified in find_package()")
-			endif ()
-
-			target_link_libraries(Bluelib::Term INTERFACE Bluelib::Core Bluelib::Ds)
-		endif ()
-
-		if ("${component}" STREQUAL "Serial")
-			if (NOT TARGET Bluelib::Core)
-				message(FATAL_ERROR "Bluelib: Module 'Serial' depends on 'Core', which was not specified in find_package()")
-			endif ()
-
-			if (NOT TARGET Bluelib::Ds)
-				message(FATAL_ERROR "Bluelib: Module 'Serial' depends on 'Ds', which was not specified in find_package()")
-			endif ()
-
-			target_link_libraries(Bluelib::Serial INTERFACE Bluelib::Core Bluelib::Ds)
-		endif ()
-
-		if ("${component}" STREQUAL "Cmd")
-			if (NOT TARGET Bluelib::Core)
-				message(FATAL_ERROR "Bluelib: Module 'Cmd' depends on 'Core', which was not specified in find_package()")
-			endif ()
-
-			if (NOT TARGET Bluelib::Ds)
-				message(FATAL_ERROR "Bluelib: Module 'Cmd' depends on 'Ds', which was not specified in find_package()")
-			endif ()
-
-			if (NOT TARGET Bluelib::Term)
-				message(FATAL_ERROR "Bluelib: Module 'Cmd' depends on 'Term', which was not specified in find_package()")
-			endif ()
-
-			target_link_libraries(Bluelib::Cmd INTERFACE Bluelib::Core Bluelib::Ds Bluelib::Term)
-		endif ()
-
-		if ("${component}" STREQUAL "Io")
-			if (NOT TARGET Bluelib::Core)
-				message(FATAL_ERROR "Bluelib: Module 'Io' depends on 'Core', which was not specified in find_package()")
-			endif ()
-
-			if (NOT TARGET Bluelib::Ds)
-				message(FATAL_ERROR "Bluelib: Module 'Io' depends on 'Ds', which was not specified in find_package()")
-			endif ()
-
-			target_link_libraries(Bluelib::Io INTERFACE Bluelib::Core Bluelib::Ds)
-		endif ()
-
-		if ("${component}" STREQUAL "Compress")
-			if (NOT TARGET Bluelib::Core)
-				message(FATAL_ERROR "Bluelib: Module 'Compress' depends on 'Core', which was not specified in find_package()")
-			endif ()
-
-			target_link_libraries(Bluelib::Compress INTERFACE Bluelib::Core Bluelib::Ds)
-		endif ()
-	endforeach (component)
-endif()

cmake/FindFX.cmake

@@ -0,0 +1,189 @@
+#[=======================================================================[.rst:
+FindFX
+------------
+
+Find the FX library and header directories
+
+Imported Targets
+^^^^^^^^^^^^^^^^
+
+This module defines the following :prop_tgt:`IMPORTED` target:
+
+``FX::FX``
+The FX library, if found
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This module will set the following variables in your project:
+
+``FX_FOUND``
+true if the FX C headers and libraries were found
+``FX_INCLUDE_DIR``
+directories containing the FX C headers.
+
+``FX_LIBRARY``
+the C library to link against
+
+Hints
+^^^^^
+
+The user may set the environment variable ``FX_PREFIX`` to the root
+directory of a FX library installation.
+#]=======================================================================]
+
+set (FX_SEARCH_PATHS
+	~/Library/Frameworks
+	/Library/Frameworks
+	/usr/local
+	/usr/local/share
+	/usr
+	/sw # Fink
+	/opt/local # DarwinPorts
+	/opt/csw # Blastwave
+	/opt
+	${FX_PREFIX}
+	$ENV{FX_PREFIX})
+
+if (FX_STATIC)
+	set(_lib_suffix "-s")
+endif ()
+
+set(supported_components Core Ds Term Cmd Io Serial Compress)
+set(components ${FX_FIND_COMPONENTS})
+string(REPLACE ";" ", " supported_components_string_list "${supported_components}")
+
+if (NOT components)
+	set(components ${supported_components})
+endif ()
+
+set(required_vars)
+
+foreach (component ${components})
+	if (NOT "${component}" IN_LIST supported_components)
+		message(FATAL_ERROR "'${component}' is not a valid FX module.\nSupported modules: ${supported_components_string_list}")
+	endif ()
+
+	string(TOLOWER ${component} header_name)
+	set(lib_name ${header_name}${_lib_suffix})
+
+	if (NOT FX_${component}_INCLUDE_DIR)
+		find_path(FX_${component}_INCLUDE_DIR
+			NAMES fx/${header_name}.h ${FX_FIND_ARGS}
+			PATH_SUFFIXES include
+			PATHS ${FX_SEARCH_PATHS})
+	endif ()
+
+	if (NOT FX_${component}_LIBRARY)
+		find_library(FX_${component}_LIBRARY
+			NAMES fx-${lib_name} ${FX_FIND_ARGS}
+			PATH_SUFFIXES lib
+			PATHS ${FX_SEARCH_PATHS})
+	else ()
+		# on Windows, ensure paths are in canonical format (forward slahes):
+		file(TO_CMAKE_PATH "${FX_${component}_LIBRARY}" FX_${component}_LIBRARY)
+	endif()
+
+	list(APPEND required_vars FX_${component}_INCLUDE_DIR FX_${component}_LIBRARY)
+endforeach (component)
+
+unset(FX_FIND_ARGS)
+
+include(FindPackageHandleStandardArgs)
+
+find_package_handle_standard_args(FX
+	REQUIRED_VARS ${required_vars})
+
+if (FX_FOUND)
+	set(created_targets)
+	foreach (component ${components})
+		string(TOLOWER ${component} header_name)
+		set(lib_name ${header_name}${_lib_suffix})
+
+		if(NOT TARGET FX::${component})
+			add_library(FX::${component} UNKNOWN IMPORTED)
+			set_target_properties(FX::${component} PROPERTIES
+				INTERFACE_INCLUDE_DIRECTORIES "${FX_${component}_INCLUDE_DIR}")
+			target_compile_definitions(FX::${component} INTERFACE _CRT_SECURE_NO_WARNINGS=1)
+
+			if (FX_STATIC)
+				target_compile_definitions(FX::${component} INTERFACE FX_STATIC=1)
+			endif ()
+
+			set_target_properties(FX::${component} PROPERTIES
+				IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+				IMPORTED_LOCATION "${FX_${component}_LIBRARY}")
+			set(created_targets ${created_targets} ${component})
+		endif ()
+	endforeach (component)
+
+	foreach (component ${created_targets})
+		if ("${component}" STREQUAL "Ds")
+			if (NOT TARGET FX::Core)
+				message(FATAL_ERROR "FX: Module 'Ds' depends on 'Core', which was not specified in find_package()")
+			endif ()
+
+			target_link_libraries(FX::Ds INTERFACE FX::Core)
+		endif ()
+
+		if ("${component}" STREQUAL "Term")
+			if (NOT TARGET FX::Core)
+				message(FATAL_ERROR "FX: Module 'Term' depends on 'Core', which was not specified in find_package()")
+			endif ()
+
+			if (NOT TARGET FX::Ds)
+				message(FATAL_ERROR "FX: Module 'Term' depends on 'Ds', which was not specified in find_package()")
+			endif ()
+
+			target_link_libraries(FX::Term INTERFACE FX::Core FX::Ds)
+		endif ()
+
+		if ("${component}" STREQUAL "Serial")
+			if (NOT TARGET FX::Core)
+				message(FATAL_ERROR "FX: Module 'Serial' depends on 'Core', which was not specified in find_package()")
+			endif ()
+
+			if (NOT TARGET FX::Ds)
+				message(FATAL_ERROR "FX: Module 'Serial' depends on 'Ds', which was not specified in find_package()")
+			endif ()
+
+			target_link_libraries(FX::Serial INTERFACE FX::Core FX::Ds)
+		endif ()
+
+		if ("${component}" STREQUAL "Cmd")
+			if (NOT TARGET FX::Core)
+				message(FATAL_ERROR "FX: Module 'Cmd' depends on 'Core', which was not specified in find_package()")
+			endif ()
+
+			if (NOT TARGET FX::Ds)
+				message(FATAL_ERROR "FX: Module 'Cmd' depends on 'Ds', which was not specified in find_package()")
+			endif ()
+
+			if (NOT TARGET FX::Term)
+				message(FATAL_ERROR "FX: Module 'Cmd' depends on 'Term', which was not specified in find_package()")
+			endif ()
+
+			target_link_libraries(FX::Cmd INTERFACE FX::Core FX::Ds FX::Term)
+		endif ()
+
+		if ("${component}" STREQUAL "Io")
+			if (NOT TARGET FX::Core)
+				message(FATAL_ERROR "FX: Module 'Io' depends on 'Core', which was not specified in find_package()")
+			endif ()
+
+			if (NOT TARGET FX::Ds)
+				message(FATAL_ERROR "FX: Module 'Io' depends on 'Ds', which was not specified in find_package()")
+			endif ()
+
+			target_link_libraries(FX::Io INTERFACE FX::Core FX::Ds)
+		endif ()
+
+		if ("${component}" STREQUAL "Compress")
+			if (NOT TARGET FX::Core)
+				message(FATAL_ERROR "FX: Module 'Compress' depends on 'Core', which was not specified in find_package()")
+			endif ()
+
+			target_link_libraries(FX::Compress INTERFACE FX::Core FX::Ds)
+		endif ()
+	endforeach (component)
+endif()

doc/sample/ir/dominance-test.mie

@@ -0,0 +1,30 @@
+~func.func() ({
+^R:
+	%0 = ~arith.constant() {value = 0 : i32} : () -> i32
+	~cf.br-cond(%0) [ ^A, ^B, ^C ] : (i32) -> ()
+
+^A:
+	~cf.br() [ ^D ] : () -> ()
+^B:
+	~cf.br-cond(%0) [ ^D, ^A, ^E ] : (i32) -> ()
+^C:
+	~cf.br-cond(%0) [ ^G, ^F ] : (i32) -> ()
+^D:
+	~cf.br() [ ^L ] : () -> ()
+^E:
+	~cf.br() [ ^H ] : () -> ()
+^F:
+	~cf.br() [ ^I ] : () -> ()
+^G:
+	~cf.br-cond(%0) [ ^I, ^J ] : (i32) -> ()
+^H:
+	~cf.br-cond(%0) [ ^E, ^K ] : (i32) -> ()
+^I:
+	~cf.br() [ ^K ] : () -> ()
+^J:
+	~cf.br() [ ^I ] : () -> ()
+^K:
+	~cf.br-cond(%0) [ ^R, ^I ] : (i32) -> ()
+^L:
+	~cf.br() [ ^H ] : () -> ()
+}) {sym_name = "test", function_type = () -> () } : () -> ()

doc/sample/ir/for-loop-1.mie

@@ -1,15 +1,17 @@
 ; Comment
-func.func @reduce(%buffer: memref<1024*f32>, %lb: index, %ub: index, %step: index) -> f32 {
-	; Initial sum set to 0.
-	%sum.0 = f32.constant 0.0
-	; iter_args binds initial values to the loop's region arguments.
-	%sum = scf.for %iv = %lb to %ub step %step iter-args(%sum.iter = %sum.0) -> (f32) {
-		%t = memref.load %buffer[%iv] : memref<1024*f32>
-		%sum.next = arith.addf %sum.iter, %t : f32
-		; Yield current iteration sum to next iteration %sum.iter or to %sum
-		; if final iteration.
-		scf.yield %sum.next : f32
-	}
+module {
+	func.func @reduce(%buffer: memref<1024*f32>, %lb: index, %ub: index, %step: index) -> f32 {
+		; Initial sum set to 0.
+		%sum.0 = arith.constant 0.0 : f32
+		; iter_args binds initial values to the loop's region arguments.
+		%sum = scf.for %iv = %lb to %ub step %step iter-args(%sum.iter = %sum.0) -> f32 {
+			%t = memref.load %buffer[%iv] : memref<1024*f32>
+			%sum.next = arith.addf %sum.iter, %t : f32
+			; Yield current iteration sum to next iteration %sum.iter or to %sum
+			; if final iteration.
+			scf.yield %sum.next : f32
+		}
 
-	func.return %sum : f32
+		func.return %sum : f32
+	}
 }

doc/sample/ir/for-loop-4.mie

@@ -1,25 +1,16 @@
-~func.func() ({
-^entry(%buffer: memref<1024*f32>, %lb: index, %ub: index, %step: index):
-	; Initial sum set to 0.
-	%sum.0 = ~f32.constant() {value = 0.0 : f32} : () -> f32
-	; iter_args binds initial values to the loop's region arguments.
-	;%sum = "scf.for"(%lb, %ub, %step) -> (f32) {
-	~cf.br [ ^for.entry(%lb: index, %sum.0: f32) ] : () -> ()
-
-^for.entry(%iv: index, %sum.iter: f32):
-	%t = ~memref.load(%buffer, %iv) : (memref<1024*f32>, index) -> f32
-	%sum.next = ~arith.addf(%sum.iter, %t) : (f32, f32) -> f32
-
-	~cf.br [ ^for.cond:(%iv: index, %sum.next: f32) ] : () -> ()
-
-^for.cond(%iv: index, %sum.next: f32):
-	; Yield current iteration sum to next iteration %sum.iter or to %sum
-	; if final iteration.
-	%iv.next = ~arith.addi(%iv, %step) : (index, index) -> index
-	%stop = ~arith.cmpi(%iv.next, %ub) {predicate = 9 : i64} : (index, index) -> i1
-	~cf.br-cond(%stop) [ ^for.end, ^for.entry:(%iv.next: index, %sum.next: f32) ] : () -> ()
-
-^for.end(%sum: f32):
-	~func.return(%sum) : (f32) -> ()
-}) {sym_name = "reduce"} : (memref<1024*f32>, index, index, index) -> f32
-
+module {
+        func.func @_reduce(%buffer: memref<1024*f32>, %lb: index, %ub: index, %step: index) -> f32 {
+                %sum.0 = arith.constant 0 : f32
+                cf.br ^for.entry(%lb: index, %sum.0: f32)
+        ^for.entry(%iv: index, %sum.iter: f32):
+                %t = memref.load %buffer[%iv] : memref<1024*f32>
+                %sum.next = arith.addf %sum.iter, %t : f32
+                cf.br ^for.cond(%iv: index, %sum.next: f32)
+        ^for.cond(%iv.0: index, %sum.iter.0: index):
+                %iv.next = arith.addi %iv.0, %step : index
+                %stop = arith.cmpi uge %iv.next, %ub : index
+                cf.br-cond %stop, ^for.end(%sum.iter.0: index), ^for.entry(%iv.next: index, %sum.iter.0: index)
+        ^for.end(%sum: f32):
+                func.return %sum : f32
+        }
+}

doc/sample/ir/parse-test-2.mie

@@ -0,0 +1,26 @@
+~builtin.module() ({
+	~func.func() ({
+	^entry(%buffer: i32, %lb: index, %ub: index, %step: index):
+		; Initial sum set to 0.
+		%sum.0 = ~arith.constant() {value = 0.0 : f32} : () -> f32
+		; iter_args binds initial values to the loop's region arguments.
+		;%sum = "scf.for"(%lb, %ub, %step) -> (f32) {
+		~cf.br() [ ^for.entry:(%lb: index, %sum.0: f32) ] : () -> ()
+
+	^for.entry(%iv: index, %sum.iter: f32):
+		%t, %x, %z = ~memref.load(%buffer, %iv) : (i32, index) -> (f32, i1, i1)
+		%sum.next = ~arith.addf(%sum.iter, %t) : (f32, f32) -> f32
+
+		~cf.br() [ ^for.cond:(%iv: index, %sum.next: f32) ] : () -> ()
+
+	^for.cond(%iv2: index, %sum.next2: f32):
+		; Yield current iteration sum to next iteration %sum.iter or to %sum
+		; if final iteration.
+		%iv.next = ~arith.addi(%iv, %step) : (index, index) -> index
+		%stop = ~arith.cmpi(%iv.next, %ub) { predicate = 9 } : (index, index) -> i1
+		~cf.br-cond(%stop) [ ^for.end, ^for.entry:(%iv.next: index, %sum.next: f32) ] : (i1) -> ()
+
+	^for.end(%sum: f32):
+		~func.return(%sum) : (f32) -> ()
+	}) {sym_name = "reduce", function_type = (i32, index, index, index) -> f32 } : () -> ()
+}) : () -> ()

doc/sample/ir/parse-test.mie

@@ -1,26 +1,25 @@
-~builtin.module() ({
-	~func.func() ({
-	^entry(%buffer: i32, %lb: index, %ub: index, %step: index):
+module {
+	func.func @reduce(%buffer: memref<?*f32>, %lb: index, %ub: index, %step: index) -> f32 {
 		; Initial sum set to 0.
-		%sum.0 = ~arith.constant() {value = 0.0 : f32} : () -> f32
+		%sum.0 = arith.constant 0.0 : f32
 		; iter_args binds initial values to the loop's region arguments.
 		;%sum = "scf.for"(%lb, %ub, %step) -> (f32) {
-		~cf.br() [ ^for.entry:(%lb: index, %sum.0: f32) ] : () -> ()
+		cf.br ^for.entry(%lb: index, %sum.0: f32)
 
 	^for.entry(%iv: index, %sum.iter: f32):
-		%t, %x, %z = ~memref.load(%buffer, %iv) : (i32, index) -> (f32, i1, i1)
-		%sum.next = ~arith.addf(%sum.iter, %t) : (f32, f32) -> f32
+		%t = memref.load %buffer[%iv] : memref<?*f32>
+		%sum.next =  arith.addf %sum.iter, %t : f32
 
-		~cf.br() [ ^for.cond:(%iv: index, %sum.next: f32) ] : () -> ()
+		cf.br ^for.cond(%iv: index, %sum.next: f32)
 
 	^for.cond(%iv2: index, %sum.next2: f32):
 		; Yield current iteration sum to next iteration %sum.iter or to %sum
 		; if final iteration.
-		%iv.next = ~arith.addi(%iv, %step) : (index, index) -> index
-		%stop = ~arith.cmpi(%iv.next, %ub) { predicate = 9 } : (index, index) -> i1
-		~cf.br-cond(%stop) [ ^for.end, ^for.entry:(%iv.next: index, %sum.next: f32) ] : (i1) -> ()
+		%iv.next = arith.addi %iv, %step : index
+		%stop = arith.cmpi uge %iv.next, %ub : index
+		cf.br-cond %stop, ^for.end, ^for.entry(%iv.next: index, %sum.next: f32)
 
 	^for.end(%sum: f32):
-		~func.return(%sum) : (f32) -> ()
-	}) {sym_name = "reduce", function_type = (i32, index, index, index) -> f32 } : () -> ()
-}) : () -> ()
+		func.return %sum : f32
+	}
+}

mie/CMakeLists.txt

@@ -11,5 +11,5 @@ else ()
 endif ()
 
 target_include_directories(mie PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include/)
-target_link_libraries(mie Bluelib::Core Bluelib::Ds Bluelib::Io)
+target_link_libraries(mie FX::Core FX::Ds FX::Io)
 target_compile_definitions(mie PRIVATE MIE_EXPORT=1 MIE_STATIC=${MIE_STATIC})

mie/attribute/attribute-definition.c

@@ -1,4 +1,4 @@
-#include <blue/ds/string.h>
+#include <fx/ds/string.h>
 #include <mie/attribute/attribute-definition.h>
 #include <mie/dialect/dialect.h>
 
@@ -12,7 +12,7 @@ struct mie_attribute_definition *mie_attribute_definition_create(
 
 	memset(out, 0x0, sizeof *out);
 
-	out->a_name = b_strdup(name);
+	out->a_name = fx_strdup(name);
 	if (!out->a_name) {
 		free(out);
 		return NULL;
@@ -20,7 +20,7 @@ struct mie_attribute_definition *mie_attribute_definition_create(
 
 	out->a_parent = parent;
 
-	b_rope name_rope = B_ROPE_CSTR(name);
+	fx_rope name_rope = FX_ROPE_CSTR(name);
 	mie_id_map_put(&parent->d_attributes, &out->a_id, &name_rope);
 
 	return out;

mie/attribute/attribute-map.c

@@ -1,6 +1,6 @@
-#include <blue/core/hash.h>
-#include <blue/core/queue.h>
-#include <blue/ds/string.h>
+#include <fx/core/hash.h>
+#include <fx/core/queue.h>
+#include <fx/ds/string.h>
 #include <mie/attribute/attribute-map.h>
 
 enum attribute_map_entry_type {
@@ -13,14 +13,14 @@ struct attribute_map_entry {
 	enum attribute_map_entry_type e_type;
 	uint64_t e_hash;
 	union {
-		b_btree_node e_node;
-		b_queue_entry e_entry;
+		fx_bst_node e_node;
+		fx_queue_entry e_entry;
 	};
 };
 
 struct attribute_map_bucket {
 	struct attribute_map_entry b_base;
-	b_queue b_items;
+	fx_queue b_items;
 };
 
 struct attribute_map_item {
@@ -29,9 +29,9 @@ struct attribute_map_item {
 	const struct mie_attribute *i_value;
 };
 
-static B_BTREE_DEFINE_SIMPLE_INSERT(
+static FX_BST_DEFINE_SIMPLE_INSERT(
 	struct attribute_map_entry, e_node, e_hash, put_entry);
-static B_BTREE_DEFINE_SIMPLE_GET(
+static FX_BST_DEFINE_SIMPLE_GET(
 	struct attribute_map_entry, uint64_t, e_node, e_hash, get_entry);
 
 void mie_attribute_map_init(struct mie_attribute_map *map)
@@ -57,16 +57,16 @@ static const struct mie_attribute *get_attribute_from_item(
 static const struct mie_attribute *get_attribute_from_bucket(
 	const struct attribute_map_bucket *bucket, const char *name)
 {
-	b_queue_entry *cur = b_queue_first(&bucket->b_items);
+	fx_queue_entry *cur = fx_queue_first(&bucket->b_items);
 	while (cur) {
-		const struct attribute_map_item *item = b_unbox(
+		const struct attribute_map_item *item = fx_unbox(
 			const struct attribute_map_item, cur, i_base.e_entry);
 
 		if (!strcmp(item->i_name, name)) {
 			return item->i_value;
 		}
 
-		cur = b_queue_next(cur);
+		cur = fx_queue_next(cur);
 	}
 
 	return NULL;
@@ -90,7 +90,7 @@ static const struct mie_attribute *get_attribute_from_entry(
 const struct mie_attribute *mie_attribute_map_get(
 	const struct mie_attribute_map *map, const char *name)
 {
-	uint64_t name_hash = b_hash_cstr(name);
+	uint64_t name_hash = fx_hash_cstr(name);
 	struct attribute_map_entry *entry = get_entry(&map->m_entries, name_hash);
 	if (!entry) {
 		return NULL;
@@ -107,13 +107,13 @@ static struct attribute_map_bucket *convert_item_to_bucket(
 		return NULL;
 	}
 
-	b_btree_delete(&map->m_entries, &item->i_base.e_node);
+	fx_bst_delete(&map->m_entries, &item->i_base.e_node);
 	memset(bucket, 0x0, sizeof *bucket);
 
 	bucket->b_base.e_type = ATTRMAP_ENTRY_BUCKET;
 	bucket->b_base.e_hash = item->i_base.e_hash;
 
-	b_queue_push_back(&bucket->b_items, &item->i_base.e_entry);
+	fx_queue_push_back(&bucket->b_items, &item->i_base.e_entry);
 	put_entry(&map->m_entries, &bucket->b_base);
 
 	return bucket;
@@ -132,7 +132,7 @@ static struct attribute_map_item *create_item(
 	out->i_value = attrib;
 	out->i_base.e_type = ATTRMAP_ENTRY_ITEM;
 	out->i_base.e_hash = name_hash;
-	out->i_name = b_strdup(name);
+	out->i_name = fx_strdup(name);
 	if (!out->i_name) {
 		free(out);
 		return NULL;
@@ -145,7 +145,7 @@ enum mie_status mie_attribute_map_put(
 	struct mie_attribute_map *map, const char *name,
 	const struct mie_attribute *value, enum mie_attribute_map_flags flags)
 {
-	uint64_t name_hash = b_hash_cstr(name);
+	uint64_t name_hash = fx_hash_cstr(name);
 	struct attribute_map_entry *entry = get_entry(&map->m_entries, name_hash);
 	struct attribute_map_item *item = NULL;
 	struct attribute_map_bucket *bucket = NULL;
@@ -184,7 +184,7 @@ enum mie_status mie_attribute_map_put(
 		return MIE_ERR_NO_MEMORY;
 	}
 
-	b_queue_push_back(&bucket->b_items, &item->i_base.e_entry);
+	fx_queue_push_back(&bucket->b_items, &item->i_base.e_entry);
 	return MIE_SUCCESS;
 }
 
@@ -192,13 +192,13 @@ enum mie_status mie_attribute_map_iterator_begin(
 	struct mie_attribute_map_iterator *it, const struct mie_attribute_map *map)
 {
 	memset(it, 0x0, sizeof *it);
-	it->_n = b_btree_first(&map->m_entries);
+	it->_n = fx_bst_first(&map->m_entries);
 	if (!it->_n) {
 		return MIE_ERR_NO_DATA;
 	}
 
 	struct attribute_map_entry *entry
-		= b_unbox(struct attribute_map_entry, it->_n, e_node);
+		= fx_unbox(struct attribute_map_entry, it->_n, e_node);
 	struct attribute_map_item *item = NULL;
 	struct attribute_map_bucket *bucket = NULL;
 
@@ -210,8 +210,8 @@ enum mie_status mie_attribute_map_iterator_begin(
 		return MIE_SUCCESS;
 	case ATTRMAP_ENTRY_BUCKET:
 		bucket = (struct attribute_map_bucket *)entry;
-		it->_e = b_queue_first(&bucket->b_items);
-		item = b_unbox(struct attribute_map_item, it->_e, i_base.e_entry);
+		it->_e = fx_queue_first(&bucket->b_items);
+		item = fx_unbox(struct attribute_map_item, it->_e, i_base.e_entry);
 		it->it_name = item->i_name;
 		it->it_value = item->i_value;
 		return MIE_SUCCESS;
@@ -228,11 +228,11 @@ enum mie_status mie_attribute_map_iterator_move_next(
 	struct attribute_map_bucket *next_bucket = NULL;
 
 	if (it->_e) {
-		it->_e = b_queue_next(it->_e);
-		next_entry = b_unbox(struct attribute_map_entry, it->_e, e_entry);
+		it->_e = fx_queue_next(it->_e);
+		next_entry = fx_unbox(struct attribute_map_entry, it->_e, e_entry);
 	} else if (it->_n) {
-		it->_n = b_btree_next(it->_n);
-		next_entry = b_unbox(struct attribute_map_entry, it->_n, e_node);
+		it->_n = fx_bst_next(it->_n);
+		next_entry = fx_unbox(struct attribute_map_entry, it->_n, e_node);
 	} else {
 		memset(it, 0x0, sizeof *it);
 		return MIE_ERR_NO_DATA;
@@ -249,8 +249,8 @@ enum mie_status mie_attribute_map_iterator_move_next(
 		break;
 	case ATTRMAP_ENTRY_BUCKET:
 		next_bucket = (struct attribute_map_bucket *)next_item;
-		it->_e = b_queue_first(&next_bucket->b_items);
-		next_item = b_unbox(
+		it->_e = fx_queue_first(&next_bucket->b_items);
+		next_item = fx_unbox(
 			struct attribute_map_item, it->_e, i_base.e_entry);
 		break;
 	default:

mie/ctx.c

@@ -1,7 +1,7 @@
-#include <blue/core/bstr.h>
-#include <blue/ds/hashmap.h>
-#include <blue/ds/list.h>
-#include <blue/ds/string.h>
+#include <fx/core/bstr.h>
+#include <fx/ds/hashmap.h>
+#include <fx/ds/list.h>
+#include <fx/ds/string.h>
 #include <mie/attribute/attribute-definition.h>
 #include <mie/ctx.h>
 #include <mie/diag/class.h>
@@ -140,123 +140,123 @@ bool mie_ctx_resolve_op(const struct mie_ctx *ctx, struct mie_op *op)
 
 struct mie_dialect *mie_ctx_get_dialect(const struct mie_ctx *ctx, const char *name)
 {
-	b_rope name_rope = B_ROPE_CSTR(name);
+	fx_rope name_rope = FX_ROPE_CSTR(name);
 	mie_id id;
 	mie_id_init_ns(&id, mie_id_map_get_ns(&ctx->ctx_dialects), &name_rope);
 
 	mie_id *target = mie_id_map_get(&ctx->ctx_dialects, &id);
-	return b_unbox(struct mie_dialect, target, d_id);
+	return fx_unbox(struct mie_dialect, target, d_id);
 }
 
 const struct mie_op_definition *mie_ctx_get_op_definition(
 	const struct mie_ctx *ctx, const char *dialect_name, const char *op_name)
 {
-	b_rope dialect_name_rope = B_ROPE_CSTR(dialect_name);
+	fx_rope dialect_name_rope = FX_ROPE_CSTR(dialect_name);
 	mie_id id;
 	mie_id_init_ns(
 		&id, mie_id_map_get_ns(&ctx->ctx_dialects), &dialect_name_rope);
 
 	mie_id *target = mie_id_map_get(&ctx->ctx_dialects, &id);
-	struct mie_dialect *dialect = b_unbox(struct mie_dialect, target, d_id);
+	struct mie_dialect *dialect = fx_unbox(struct mie_dialect, target, d_id);
 	if (!dialect) {
 		return NULL;
 	}
 
-	b_rope op_name_rope = B_ROPE_CSTR(op_name);
+	fx_rope op_name_rope = FX_ROPE_CSTR(op_name);
 	mie_id_init_ns(&id, mie_id_map_get_ns(&dialect->d_ops), &op_name_rope);
 	target = mie_id_map_get(&dialect->d_ops, &id);
 
-	return b_unbox(struct mie_op_definition, target, op_id);
+	return fx_unbox(struct mie_op_definition, target, op_id);
 }
 
 struct mie_type_definition *mie_ctx_get_type_definition(
 	const struct mie_ctx *ctx, const char *dialect_name, const char *type_name)
 {
-	b_rope dialect_name_rope = B_ROPE_CSTR(dialect_name);
+	fx_rope dialect_name_rope = FX_ROPE_CSTR(dialect_name);
 	mie_id id;
 	mie_id_init_ns(
 		&id, mie_id_map_get_ns(&ctx->ctx_dialects), &dialect_name_rope);
 
 	mie_id *target = mie_id_map_get(&ctx->ctx_dialects, &id);
-	struct mie_dialect *dialect = b_unbox(struct mie_dialect, target, d_id);
+	struct mie_dialect *dialect = fx_unbox(struct mie_dialect, target, d_id);
 	if (!dialect) {
 		return NULL;
 	}
 
-	b_rope type_name_rope = B_ROPE_CSTR(type_name);
+	fx_rope type_name_rope = FX_ROPE_CSTR(type_name);
 	mie_id_init_ns(&id, mie_id_map_get_ns(&dialect->d_types), &type_name_rope);
 	target = mie_id_map_get(&dialect->d_types, &id);
 
-	return b_unbox(struct mie_type_definition, target, ty_id);
+	return fx_unbox(struct mie_type_definition, target, ty_id);
 }
 
 const struct mie_trait_definition *mie_ctx_get_trait_definition(
 	const struct mie_ctx *ctx, const char *dialect_name, const char *trait_name)
 {
-	b_rope dialect_name_rope = B_ROPE_CSTR(dialect_name);
+	fx_rope dialect_name_rope = FX_ROPE_CSTR(dialect_name);
 	mie_id id;
 	mie_id_init_ns(
 		&id, mie_id_map_get_ns(&ctx->ctx_dialects), &dialect_name_rope);
 
 	mie_id *target = mie_id_map_get(&ctx->ctx_dialects, &id);
-	struct mie_dialect *dialect = b_unbox(struct mie_dialect, target, d_id);
+	struct mie_dialect *dialect = fx_unbox(struct mie_dialect, target, d_id);
 	if (!dialect) {
 		return NULL;
 	}
 
-	b_rope trait_name_rope = B_ROPE_CSTR(trait_name);
+	fx_rope trait_name_rope = FX_ROPE_CSTR(trait_name);
 	mie_id_init_ns(&id, mie_id_map_get_ns(&dialect->d_traits), &trait_name_rope);
 	target = mie_id_map_get(&dialect->d_traits, &id);
 
-	return b_unbox(struct mie_trait_definition, target, tr_id);
+	return fx_unbox(struct mie_trait_definition, target, tr_id);
 }
 
 const struct mie_attribute_definition *mie_ctx_get_attribute_definition(
 	const struct mie_ctx *ctx, const char *dialect_name,
 	const char *attribute_name)
 {
-	b_rope dialect_name_rope = B_ROPE_CSTR(dialect_name);
+	fx_rope dialect_name_rope = FX_ROPE_CSTR(dialect_name);
 	mie_id id;
 	mie_id_init_ns(
 		&id, mie_id_map_get_ns(&ctx->ctx_dialects), &dialect_name_rope);
 
 	mie_id *target = mie_id_map_get(&ctx->ctx_dialects, &id);
-	struct mie_dialect *dialect = b_unbox(struct mie_dialect, target, d_id);
+	struct mie_dialect *dialect = fx_unbox(struct mie_dialect, target, d_id);
 	if (!dialect) {
 		return NULL;
 	}
 
-	b_rope attribute_name_rope = B_ROPE_CSTR(attribute_name);
+	fx_rope attribute_name_rope = FX_ROPE_CSTR(attribute_name);
 	mie_id_init_ns(
 		&id, mie_id_map_get_ns(&dialect->d_attributes),
 		&attribute_name_rope);
 	target = mie_id_map_get(&dialect->d_attributes, &id);
 
-	return b_unbox(struct mie_attribute_definition, target, a_id);
+	return fx_unbox(struct mie_attribute_definition, target, a_id);
 }
 
 const struct mie_interface_definition *mie_ctx_get_interface_definition(
 	const struct mie_ctx *ctx, const char *dialect_name,
 	const char *interface_name)
 {
-	b_rope dialect_name_rope = B_ROPE_CSTR(dialect_name);
+	fx_rope dialect_name_rope = FX_ROPE_CSTR(dialect_name);
 	mie_id id;
 	mie_id_init_ns(
 		&id, mie_id_map_get_ns(&ctx->ctx_dialects), &dialect_name_rope);
 
 	mie_id *target = mie_id_map_get(&ctx->ctx_dialects, &id);
-	struct mie_dialect *dialect = b_unbox(struct mie_dialect, target, d_id);
+	struct mie_dialect *dialect = fx_unbox(struct mie_dialect, target, d_id);
 	if (!dialect) {
 		return NULL;
 	}
 
-	b_rope interface_name_rope = B_ROPE_CSTR(interface_name);
+	fx_rope interface_name_rope = FX_ROPE_CSTR(interface_name);
 	mie_id_init_ns(
 		&id, mie_id_map_get_ns(&dialect->d_interfaces),
 		&interface_name_rope);
 	target = mie_id_map_get(&dialect->d_interfaces, &id);
 
-	return b_unbox(struct mie_interface_definition, target, if_id);
+	return fx_unbox(struct mie_interface_definition, target, if_id);
 }
 
 struct mie_type *mie_ctx_get_type(
@@ -264,13 +264,13 @@ struct mie_type *mie_ctx_get_type(
 {
 	char full_name[256];
 	snprintf(full_name, sizeof full_name, "%s.%s", dialect_name, type_name);
-	b_rope full_name_rope = B_ROPE_CSTR(full_name);
+	fx_rope full_name_rope = FX_ROPE_CSTR(full_name);
 
 	mie_id id;
 	mie_id_init_ns(&id, mie_id_map_get_ns(&ctx->ctx_types), &full_name_rope);
 
 	mie_id *target = mie_id_map_get(&ctx->ctx_types, &id);
-	struct mie_type *type = b_unbox(struct mie_type, target, ty_id);
+	struct mie_type *type = fx_unbox(struct mie_type, target, ty_id);
 	if (type) {
 		return type;
 	}
@@ -295,7 +295,7 @@ struct mie_type *mie_ctx_get_type(
 	memset(type, 0x0, sizeof *type);
 
 	type->ty_def = type_info;
-	type->ty_name = b_bstr_fmt(NULL, "%s.%s", dialect_name, type_name);
+	type->ty_name = fx_bstr_fmt(NULL, "%s.%s", dialect_name, type_name);
 
 	if (type_info->ty_init) {
 		type_info->ty_init(type_info, type);
@@ -311,13 +311,13 @@ const struct mie_trait *mie_ctx_get_trait(
 {
 	char full_name[256];
 	snprintf(full_name, sizeof full_name, "%s.%s", dialect_name, trait_name);
-	b_rope full_name_rope = B_ROPE_CSTR(full_name);
+	fx_rope full_name_rope = FX_ROPE_CSTR(full_name);
 
 	mie_id id;
 	mie_id_init_ns(&id, mie_id_map_get_ns(&ctx->ctx_traits), &full_name_rope);
 
 	mie_id *target = mie_id_map_get(&ctx->ctx_traits, &id);
-	struct mie_trait *trait = b_unbox(struct mie_trait, target, tr_id);
+	struct mie_trait *trait = fx_unbox(struct mie_trait, target, tr_id);
 	if (trait) {
 		return trait;
 	}
@@ -342,7 +342,7 @@ const struct mie_trait *mie_ctx_get_trait(
 	memset(trait, 0x0, sizeof trait_info->tr_data_size);
 
 	trait->tr_def = trait_info;
-	trait->tr_name = b_bstr_fmt(NULL, "%s.%s", dialect_name, trait_name);
+	trait->tr_name = fx_bstr_fmt(NULL, "%s.%s", dialect_name, trait_name);
 
 	if (trait_info->tr_init) {
 		trait_info->tr_init(trait_info, trait);
@@ -363,7 +363,7 @@ struct mie_type *mie_ctx_get_storage_type(
 	mie_id_builder_end(&id_builder, &id);
 
 	mie_id *target = mie_id_map_get(&ctx->ctx_types, &id);
-	struct mie_type *type = b_unbox(struct mie_type, target, ty_id);
+	struct mie_type *type = fx_unbox(struct mie_type, target, ty_id);
 	if (type) {
 		return type;
 	}
@@ -389,7 +389,7 @@ struct mie_type *mie_ctx_get_function_type(
 	mie_id_builder_end(&id_builder, &id);
 
 	mie_id *target = mie_id_map_get(&ctx->ctx_types, &id);
-	struct mie_type *type = b_unbox(struct mie_type, target, ty_id);
+	struct mie_type *type = fx_unbox(struct mie_type, target, ty_id);
 	if (type) {
 		return type;
 	}
@@ -456,7 +456,7 @@ enum mie_status mie_ctx_get_pass(
 	}
 
 	struct mie_pass_definition *pass_def
-		= b_unbox(struct mie_pass_definition, target, p_id);
+		= fx_unbox(struct mie_pass_definition, target, p_id);
 
 	if (pass_def->p_data_size < sizeof(struct mie_pass)) {
 		return MIE_ERR_BAD_STATE;
@@ -511,17 +511,17 @@ struct mie_diag *mie_ctx_push_diag(
 	diag->diag_parent = dialect;
 	diag->diag_class = &dialect->d_diag_classes[diag_class];
 
-	b_queue_push_back(&ctx->ctx_diag, &diag->diag_entry);
+	fx_queue_push_back(&ctx->ctx_diag, &diag->diag_entry);
 
 	return diag;
 }
 
 struct mie_diag *mie_ctx_pop_diag(struct mie_ctx *ctx)
 {
-	b_queue_entry *entry = b_queue_pop_front(&ctx->ctx_diag);
+	fx_queue_entry *entry = fx_queue_pop_front(&ctx->ctx_diag);
 	if (!entry) {
 		return NULL;
 	}
 
-	return b_unbox(struct mie_diag, entry, diag_entry);
+	return fx_unbox(struct mie_diag, entry, diag_entry);
 }

mie/diag/diag.c

@@ -1,4 +1,4 @@
-#include <blue/ds/string.h>
+#include <fx/ds/string.h>
 #include <mie/ctx.h>
 #include <mie/diag/amendment.h>
 #include <mie/diag/component.h>
@@ -19,7 +19,7 @@ struct mie_diag_c_msg *diag_msg_create(const struct mie_diag_msg *content)
 	memset(out, 0x0, sizeof *out);
 
 	out->msg_base.c_type = MIE_DIAG_COMPONENT_MSG;
-	out->msg_content = b_strdup(content->msg_content);
+	out->msg_content = fx_strdup(content->msg_content);
 
 	return out;
 }
@@ -76,7 +76,11 @@ void mie_diag_push_msg(
 		return;
 	}
 
-	if (msg >= dialect->d_nr_diag_msgs) {
+	if (msg >= dialect->d_nr_diag_msgs
+	    || !dialect->d_diag_msgs[msg].msg_content) {
+		fprintf(stderr, "FATAL: %lu is not a valid %s diag msg\n", msg,
+		        dialect_name);
+		abort();
 		return;
 	}
 
@@ -87,7 +91,21 @@ void mie_diag_push_msg(
 		return;
 	}
 
-	b_queue_push_back(&diag->diag_components, &c_msg->msg_base.c_entry);
+	fx_queue_push_back(&diag->diag_components, &c_msg->msg_base.c_entry);
+}
+
+void mie_diag_push_string(struct mie_diag *diag, const char *str)
+{
+	struct mie_diag_c_msg *c_msg = malloc(sizeof *c_msg);
+	if (!c_msg) {
+		return;
+	}
+
+	memset(c_msg, 0x0, sizeof *c_msg);
+	c_msg->msg_base.c_type = MIE_DIAG_COMPONENT_MSG;
+	c_msg->msg_content = fx_strdup(str);
+
+	fx_queue_push_back(&diag->diag_components, &c_msg->msg_base.c_entry);
 }
 
 void mie_diag_push_snippet(
@@ -102,5 +120,5 @@ void mie_diag_push_snippet(
 		return;
 	}
 
-	b_queue_push_back(&diag->diag_components, &c_snippet->s_base.c_entry);
+	fx_queue_push_back(&diag->diag_components, &c_snippet->s_base.c_entry);
 }

mie/diag/diag.h

@@ -1,6 +1,6 @@
 #ifndef _DIAG_DIAG_H_
 #define _DIAG_DIAG_H_
 
-#include <blue/core/queue.h>
+#include <fx/core/queue.h>
 
 #endif

mie/dialect/arith/arith.c

@@ -1,9 +1,16 @@
 #include <mie/ctx.h>
+#include <mie/diag/class.h>
+#include <mie/diag/msg.h>
 #include <mie/dialect/arith.h>
 #include <mie/dialect/dialect.h>
 #include <mie/macros.h>
 
+MIE_DIAG_CLASS_LIST_EXTERN(mie_arith_diag);
+MIE_DIAG_MSG_LIST_EXTERN(mie_arith_msg);
+
 MIE_DIALECT_BEGIN(mie_arith, struct mie_dialect, "arith")
+	MIE_DIALECT_DIAG_CLASS_LIST(mie_arith_diag);
+	MIE_DIALECT_DIAG_MSG_LIST(mie_arith_msg);
 	MIE_DIALECT_ADD_OP(mie_arith_addi);
 	MIE_DIALECT_ADD_OP(mie_arith_cmpi);
 	MIE_DIALECT_ADD_OP(mie_arith_addf);

mie/dialect/arith/diag.c

@@ -0,0 +1,29 @@
+#include <mie/diag/class.h>
+#include <mie/diag/msg.h>
+#include <mie/dialect/arith.h>
+#include <mie/macros.h>
+
+#define MIE_DIAG_CLASS_PREFIX MIE_ARITH_E
+#define MIE_DIAG_MSG_PREFIX   MIE_ARITH_MSG
+
+MIE_DIAG_CLASS_LIST_BEGIN(mie_arith_diag)
+	MIE_DIAG_CLASS(INVALID_INTEGER_TYPE, ERROR, "Invalid integer type")
+	MIE_DIAG_CLASS(INVALID_FLOAT_TYPE, ERROR, "Invalid floating-point type")
+	MIE_DIAG_CLASS(
+		INVALID_COMPARISON_PREDICATE, ERROR,
+		"Invalid comparison predicate")
+MIE_DIAG_CLASS_LIST_END(mie_arith_diag)
+
+MIE_DIAG_MSG_LIST_BEGIN(mie_arith_msg)
+	MIE_DIAG_MSG(EXPECTED_INTEGER_TYPE, "expected an integer or index type.")
+	MIE_DIAG_MSG(EXPECTED_FLOAT_TYPE, "expected a floating-point type.")
+	MIE_DIAG_MSG(
+		INVALID_COMPARISON_PREDICATE,
+		"this is not a valid comparison predicate.")
+	MIE_DIAG_MSG(
+		VALID_COMPARISON_PREDICATES,
+		"valid comparison predicates include: [blue]eq[reset], "
+	        "[blue]ne[reset], [blue]slt[reset], [blue]sle[reset], "
+	        "[blue]sgt[reset], [blue]sge[reset], [blue]ult[reset], "
+	        "[blue]ule[reset], [blue]ugt[reset], [blue]uge[reset]")
+MIE_DIAG_MSG_LIST_END(mie_arith_msg)

mie/dialect/arith/float-cache.c

@@ -1,4 +1,4 @@
-#include <blue/core/btree.h>
+#include <fx/core/bst.h>
 #include <mie/ctx.h>
 #include <mie/dialect/builtin.h>
 #include <stdlib.h>
@@ -10,19 +10,19 @@ typedef union float_key {
 } float_key;
 
 struct float_width_cache_entry {
-	b_btree_node e_node;
+	fx_bst_node e_node;
 	float_key e_key;
 	struct mie_float e_value;
 };
 
 struct float_width_cache {
-	b_btree_node c_node;
+	fx_bst_node c_node;
 	size_t c_width;
-	b_btree c_floats;
+	fx_bst c_floats;
 };
 
 struct mie_float_cache {
-	b_btree c_widths;
+	fx_bst c_widths;
 };
 
 static int float_key_compare(const float_key *a, const float_key *b)
@@ -30,38 +30,38 @@ static int float_key_compare(const float_key *a, const float_key *b)
 	return memcmp(a->i, b->i, sizeof a->i);
 }
 
-static B_BTREE_DEFINE_SIMPLE_INSERT(
+static FX_BST_DEFINE_SIMPLE_INSERT(
 	struct float_width_cache, c_node, c_width, put_width_cache);
-static B_BTREE_DEFINE_SIMPLE_GET(
+static FX_BST_DEFINE_SIMPLE_GET(
 	struct float_width_cache, size_t, c_node, c_width, get_width_cache);
 
-void put_float(b_btree *tree, struct float_width_cache_entry *node)
+void put_float(fx_bst *tree, struct float_width_cache_entry *node)
 {
-	if (!tree->b_root) {
-		tree->b_root = &node->e_node;
-		b_btree_insert_fixup(tree, &node->e_node);
+	if (!tree->bst_root) {
+		tree->bst_root = &node->e_node;
+		fx_bst_insert_fixup(tree, &node->e_node);
 		return;
 	}
 
-	b_btree_node *cur = tree->b_root;
+	fx_bst_node *cur = tree->bst_root;
 	while (1) {
 		struct float_width_cache_entry *cur_node
-			= b_unbox(struct float_width_cache_entry, cur, e_node);
-		b_btree_node *next = NULL;
+			= fx_unbox(struct float_width_cache_entry, cur, e_node);
+		fx_bst_node *next = NULL;
 		int cmp = float_key_compare(&node->e_key, &cur_node->e_key);
 
 		if (cmp >= 0) {
-			next = b_btree_right(cur);
+			next = fx_bst_right(cur);
 
 			if (!next) {
-				b_btree_put_right(cur, &node->e_node);
+				fx_bst_put_right(cur, &node->e_node);
 				break;
 			}
 		} else if (cmp < 0) {
-			next = b_btree_left(cur);
+			next = fx_bst_left(cur);
 
 			if (!next) {
-				b_btree_put_left(cur, &node->e_node);
+				fx_bst_put_left(cur, &node->e_node);
 				break;
 			}
 		} else {
@@ -71,20 +71,20 @@ void put_float(b_btree *tree, struct float_width_cache_entry *node)
 		cur = next;
 	}
 
-	b_btree_insert_fixup(tree, &node->e_node);
+	fx_bst_insert_fixup(tree, &node->e_node);
 }
 
-static struct float_width_cache_entry *get_float(const b_btree *tree, float_key key)
+static struct float_width_cache_entry *get_float(const fx_bst *tree, float_key key)
 {
-	b_btree_node *cur = tree->b_root;
+	fx_bst_node *cur = tree->bst_root;
 	while (cur) {
 		struct float_width_cache_entry *cur_node
-			= b_unbox(struct float_width_cache_entry, cur, e_node);
+			= fx_unbox(struct float_width_cache_entry, cur, e_node);
 		int cmp = float_key_compare(&key, &cur_node->e_key);
 		if (cmp > 0) {
-			cur = b_btree_right(cur);
+			cur = fx_bst_right(cur);
 		} else if (cmp < 0) {
-			cur = b_btree_left(cur);
+			cur = fx_bst_left(cur);
 		} else {
 			return cur_node;
 		}
@@ -109,13 +109,13 @@ static struct float_width_cache *float_width_cache_create(size_t width)
 
 static void float_width_cache_destroy(struct float_width_cache *cache)
 {
-	b_btree_node *cur = b_btree_first(&cache->c_floats);
+	fx_bst_node *cur = fx_bst_first(&cache->c_floats);
 	while (cur) {
-		b_btree_node *next = b_btree_next(cur);
-		b_btree_delete(&cache->c_floats, cur);
+		fx_bst_node *next = fx_bst_next(cur);
+		fx_bst_delete(&cache->c_floats, cur);
 
 		struct float_width_cache_entry *entry
-			= b_unbox(struct float_width_cache_entry, cur, e_node);
+			= fx_unbox(struct float_width_cache_entry, cur, e_node);
 		free(entry);
 
 		cur = next;
@@ -170,13 +170,13 @@ struct mie_float_cache *mie_float_cache_create(void)
 
 void mie_float_cache_destroy(struct mie_float_cache *cache)
 {
-	b_btree_node *cur = b_btree_first(&cache->c_widths);
+	fx_bst_node *cur = fx_bst_first(&cache->c_widths);
 	while (cur) {
-		b_btree_node *next = b_btree_next(cur);
-		b_btree_delete(&cache->c_widths, cur);
+		fx_bst_node *next = fx_bst_next(cur);
+		fx_bst_delete(&cache->c_widths, cur);
 
 		struct float_width_cache *width_cache
-			= b_unbox(struct float_width_cache, cur, c_node);
+			= fx_unbox(struct float_width_cache, cur, c_node);
 		float_width_cache_destroy(width_cache);
 
 		cur = next;

mie/dialect/arith/int-cache.c

@@ -1,32 +1,32 @@
-#include <blue/core/btree.h>
+#include <fx/core/bst.h>
 #include <mie/ctx.h>
 #include <mie/dialect/builtin.h>
 #include <stdlib.h>
 #include <string.h>
 
 struct int_width_cache_entry {
-	b_btree_node e_node;
+	fx_bst_node e_node;
 	struct mie_int e_value;
 };
 
 struct int_width_cache {
-	b_btree_node c_node;
+	fx_bst_node c_node;
 	size_t c_width;
-	b_btree c_ints;
+	fx_bst c_ints;
 };
 
 struct mie_int_cache {
-	b_btree c_widths;
+	fx_bst c_widths;
 };
 
-static B_BTREE_DEFINE_SIMPLE_INSERT(
+static FX_BST_DEFINE_SIMPLE_INSERT(
 	struct int_width_cache, c_node, c_width, put_width_cache);
-static B_BTREE_DEFINE_SIMPLE_GET(
+static FX_BST_DEFINE_SIMPLE_GET(
 	struct int_width_cache, size_t, c_node, c_width, get_width_cache);
 
-static B_BTREE_DEFINE_SIMPLE_INSERT(
+static FX_BST_DEFINE_SIMPLE_INSERT(
 	struct int_width_cache_entry, e_node, e_value.i_val.v_small, put_int);
-static B_BTREE_DEFINE_SIMPLE_GET(
+static FX_BST_DEFINE_SIMPLE_GET(
 	struct int_width_cache_entry, uint64_t, e_node, e_value.i_val.v_small,
 	get_int);
 
@@ -46,13 +46,13 @@ static struct int_width_cache *int_width_cache_create(size_t width)
 
 static void int_width_cache_destroy(struct int_width_cache *cache)
 {
-	b_btree_node *cur = b_btree_first(&cache->c_ints);
+	fx_bst_node *cur = fx_bst_first(&cache->c_ints);
 	while (cur) {
-		b_btree_node *next = b_btree_next(cur);
-		b_btree_delete(&cache->c_ints, cur);
+		fx_bst_node *next = fx_bst_next(cur);
+		fx_bst_delete(&cache->c_ints, cur);
 
 		struct int_width_cache_entry *entry
-			= b_unbox(struct int_width_cache_entry, cur, e_node);
+			= fx_unbox(struct int_width_cache_entry, cur, e_node);
 		free(entry);
 
 		cur = next;
@@ -96,13 +96,13 @@ struct mie_int_cache *mie_int_cache_create(void)
 
 void mie_int_cache_destroy(struct mie_int_cache *cache)
 {
-	b_btree_node *cur = b_btree_first(&cache->c_widths);
+	fx_bst_node *cur = fx_bst_first(&cache->c_widths);
 	while (cur) {
-		b_btree_node *next = b_btree_next(cur);
-		b_btree_delete(&cache->c_widths, cur);
+		fx_bst_node *next = fx_bst_next(cur);
+		fx_bst_delete(&cache->c_widths, cur);
 
 		struct int_width_cache *width_cache
-			= b_unbox(struct int_width_cache, cur, c_node);
+			= fx_unbox(struct int_width_cache, cur, c_node);
 		int_width_cache_destroy(width_cache);
 
 		cur = next;

mie/dialect/arith/op/addf.c

@@ -1,8 +1,12 @@
+#include <mie/dialect/arith.h>
+#include <mie/dialect/builtin.h>
 #include <mie/dialect/dialect.h>
 #include <mie/ir/op-definition.h>
 #include <mie/ir/op.h>
 #include <mie/macros.h>
+#include <mie/parse/parser.h>
 #include <mie/print/printer.h>
+#include <mie/type/type.h>
 
 static enum mie_status print(struct mie_printer *printer, const struct mie_op *op)
 {
@@ -13,18 +17,70 @@ static enum mie_status print(struct mie_printer *printer, const struct mie_op *o
 	const struct mie_op_arg *left = &op->op_args.items[0];
 	const struct mie_op_arg *right = &op->op_args.items[1];
 
-	b_stream_write_char(printer->p_stream, ' ');
+	fx_stream_write_char(printer->p_stream, ' ');
 	mie_printer_print_op_arg(printer, left, false);
-	b_stream_write_string(printer->p_stream, ", ", NULL);
+	fx_stream_write_string(printer->p_stream, ", ", NULL);
 	mie_printer_print_op_arg(printer, right, false);
-	b_stream_write_string(printer->p_stream, " : ", NULL);
+	fx_stream_write_string(printer->p_stream, " : ", NULL);
 	mie_printer_print_type(printer, mie_op_arg_get_type(left));
 
 	return MIE_SUCCESS;
 }
 
-static enum mie_status parse(struct mie_parser *parser, struct mie_op *out)
+static enum mie_status parse(
+	struct mie_parser *parser, struct mie_parser_scope *scope,
+	struct mie_op *out)
 {
+	struct mie_file_span span;
+	if (MIE_VECTOR_COUNT(out->op_result) != 1) {
+		mie_op_get_results_span(out, &span);
+		mie_parser_report_error_simple(
+			parser, "builtin",
+			MIE_BUILTIN_E_INCORRECT_NUMBER_OF_RESULTS,
+			MIE_BUILTIN_MSG_OP_INCORRECT_NUMBER_OF_RESULTS, &span);
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (!mie_parser_parse_parameter_list(
+		    parser, false, MIE_VECTOR_REF(out->op_args),
+		    "arithmetic operation arguments")) {
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (MIE_VECTOR_COUNT(out->op_args) != 2) {
+		mie_op_get_args_span(out, &span);
+		mie_parser_report_error_simple(
+			parser, "builtin",
+			MIE_BUILTIN_E_INCORRECT_NUMBER_OF_ARGUMENTS,
+			MIE_BUILTIN_MSG_OP_INCORRECT_NUMBER_OF_ARGS, &span);
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (!mie_parser_parse_symbol(parser, MIE_SYM_COLON)) {
+		mie_parser_report_unexpected_token(
+			parser, MIE_SYM_COLON, "arithmetic operation type");
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	const struct mie_type *type = NULL;
+	if (!mie_parser_parse_type(
+		    parser, "arithmetic operation type", &type, &span)) {
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (!mie_type_is(type, "builtin", "float")) {
+		mie_parser_report_error_simple(
+			parser, "arith", MIE_ARITH_E_INVALID_FLOAT_TYPE,
+			MIE_ARITH_MSG_EXPECTED_FLOAT_TYPE, &span);
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	for (size_t i = 0; i < MIE_VECTOR_COUNT(out->op_args); i++) {
+		out->op_args.items[i].arg_unresolved.reg_type = type;
+	}
+
+	out->op_result.items[0].reg_type = type;
+
 	return MIE_SUCCESS;
 }
 

mie/dialect/arith/op/addi.c

@@ -1,10 +1,12 @@
 #include <mie/ctx.h>
+#include <mie/dialect/arith.h>
 #include <mie/dialect/builtin.h>
 #include <mie/dialect/dialect.h>
 #include <mie/ir/emit.h>
 #include <mie/ir/op-definition.h>
 #include <mie/ir/op.h>
 #include <mie/macros.h>
+#include <mie/parse/parser.h>
 #include <mie/print/printer.h>
 #include <mie/type/type.h>
 
@@ -17,18 +19,73 @@ static enum mie_status print(struct mie_printer *printer, const struct mie_op *o
 	const struct mie_op_arg *left = &op->op_args.items[0];
 	const struct mie_op_arg *right = &op->op_args.items[1];
 
-	b_stream_write_char(printer->p_stream, ' ');
+	fx_stream_write_char(printer->p_stream, ' ');
 	mie_printer_print_op_arg(printer, left, false);
-	b_stream_write_string(printer->p_stream, ", ", NULL);
+	fx_stream_write_string(printer->p_stream, ", ", NULL);
 	mie_printer_print_op_arg(printer, right, false);
-	b_stream_write_string(printer->p_stream, " : ", NULL);
+	fx_stream_write_string(printer->p_stream, " : ", NULL);
 	mie_printer_print_type(printer, mie_op_arg_get_type(left));
 
 	return MIE_SUCCESS;
 }
 
-static enum mie_status parse(struct mie_parser *parser, struct mie_op *out)
+static enum mie_status parse(
+	struct mie_parser *parser, struct mie_parser_scope *scope,
+	struct mie_op *out)
 {
+	struct mie_file_span span;
+	if (MIE_VECTOR_COUNT(out->op_result) != 1) {
+		mie_op_get_results_span(out, &span);
+		mie_parser_report_error_simple(
+			parser, "builtin",
+			MIE_BUILTIN_E_INCORRECT_NUMBER_OF_RESULTS,
+			MIE_BUILTIN_MSG_OP_INCORRECT_NUMBER_OF_RESULTS, &span);
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (!mie_parser_parse_parameter_list(
+		    parser, false, MIE_VECTOR_REF(out->op_args),
+		    "arithmetic operation arguments")) {
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (MIE_VECTOR_COUNT(out->op_args) != 2) {
+		mie_op_get_args_span(out, &span);
+		mie_parser_report_error_simple(
+			parser, "builtin",
+			MIE_BUILTIN_E_INCORRECT_NUMBER_OF_ARGUMENTS,
+			MIE_BUILTIN_MSG_OP_INCORRECT_NUMBER_OF_ARGS, &span);
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (!mie_parser_parse_symbol(parser, MIE_SYM_COLON)) {
+		mie_parser_report_unexpected_token(
+			parser, MIE_SYM_COLON, "arithmetic operation type");
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	const struct mie_type *type = NULL;
+	if (!mie_parser_parse_type(
+		    parser, "arithmetic operation type", &type, &span)) {
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	bool is_int_type = mie_type_is(type, "builtin", "int")
+	                || mie_type_is(type, "builtin", "index");
+
+	if (!is_int_type) {
+		mie_parser_report_error_simple(
+			parser, "arith", MIE_ARITH_E_INVALID_INTEGER_TYPE,
+			MIE_ARITH_MSG_EXPECTED_INTEGER_TYPE, &span);
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	for (size_t i = 0; i < MIE_VECTOR_COUNT(out->op_args); i++) {
+		out->op_args.items[i].arg_unresolved.reg_type = type;
+	}
+
+	out->op_result.items[0].reg_type = type;
+
 	return MIE_SUCCESS;
 }
 

mie/dialect/arith/op/cmpi.c

@@ -1,9 +1,34 @@
+#include <mie/diag/diag.h>
+#include <mie/dialect/arith.h>
 #include <mie/dialect/builtin.h>
 #include <mie/dialect/dialect.h>
+#include <mie/ir/emit.h>
 #include <mie/ir/op-definition.h>
 #include <mie/ir/op.h>
 #include <mie/macros.h>
+#include <mie/parse/parser.h>
 #include <mie/print/printer.h>
+#include <mie/type/type.h>
+
+#define PREDICATE(id, str) [MIE_ARITH_CMPI_##id] = str
+static const char *predicates[] = {
+	PREDICATE(EQ, "eq"),   PREDICATE(NE, "ne"),   PREDICATE(SLT, "slt"),
+	PREDICATE(SLE, "sle"), PREDICATE(SGT, "sgt"), PREDICATE(SGE, "sge"),
+	PREDICATE(ULT, "ult"), PREDICATE(ULE, "ule"), PREDICATE(UGT, "ugt"),
+	PREDICATE(UGE, "uge"),
+};
+static const size_t nr_predicates = sizeof predicates / sizeof predicates[0];
+
+static int find_predicate(const char *pred)
+{
+	for (size_t i = 0; i < nr_predicates; i++) {
+		if (!strcmp(pred, predicates[i])) {
+			return i;
+		}
+	}
+
+	return -1;
+}
 
 static enum mie_status print(struct mie_printer *printer, const struct mie_op *op)
 {
@@ -22,58 +47,129 @@ static enum mie_status print(struct mie_printer *printer, const struct mie_op *o
 		return MIE_SUCCESS;
 	}
 
-	b_stream_write_char(printer->p_stream, ' ');
+	fx_stream_write_char(printer->p_stream, ' ');
 
-	switch (pred) {
-	case 0:
-		b_stream_write_string(printer->p_stream, "eq", NULL);
-		break;
-	case 1:
-		b_stream_write_string(printer->p_stream, "ne", NULL);
-		break;
-	case 2:
-		b_stream_write_string(printer->p_stream, "slt", NULL);
-		break;
-	case 3:
-		b_stream_write_string(printer->p_stream, "sle", NULL);
-		break;
-	case 4:
-		b_stream_write_string(printer->p_stream, "sgt", NULL);
-		break;
-	case 5:
-		b_stream_write_string(printer->p_stream, "sge", NULL);
-		break;
-	case 6:
-		b_stream_write_string(printer->p_stream, "ult", NULL);
-		break;
-	case 7:
-		b_stream_write_string(printer->p_stream, "ule", NULL);
-		break;
-	case 8:
-		b_stream_write_string(printer->p_stream, "ugt", NULL);
-		break;
-	case 9:
-		b_stream_write_string(printer->p_stream, "uge", NULL);
-		break;
-	default:
-		return MIE_SUCCESS;
+	if (pred < 0 || pred >= nr_predicates) {
+		return MIE_ERR_BAD_STATE;
 	}
 
-	b_stream_write_char(printer->p_stream, ' ');
+	fx_stream_write_string(printer->p_stream, predicates[pred], NULL);
+
+	fx_stream_write_char(printer->p_stream, ' ');
 	mie_printer_print_op_arg(printer, left, false);
-	b_stream_write_string(printer->p_stream, ", ", NULL);
+	fx_stream_write_string(printer->p_stream, ", ", NULL);
 	mie_printer_print_op_arg(printer, right, false);
-	b_stream_write_string(printer->p_stream, " : ", NULL);
+	fx_stream_write_string(printer->p_stream, " : ", NULL);
 	mie_printer_print_type(printer, mie_op_arg_get_type(left));
 
 	return MIE_SUCCESS;
 }
 
-static enum mie_status parse(struct mie_parser *parser, struct mie_op *out)
+static enum mie_status parse(
+	struct mie_parser *parser, struct mie_parser_scope *scope,
+	struct mie_op *out)
 {
+	struct mie_file_span span;
+	if (MIE_VECTOR_COUNT(out->op_result) != 1) {
+		mie_op_get_results_span(out, &span);
+		mie_parser_report_error_simple(
+			parser, "builtin",
+			MIE_BUILTIN_E_INCORRECT_NUMBER_OF_RESULTS,
+			MIE_BUILTIN_MSG_OP_INCORRECT_NUMBER_OF_RESULTS, &span);
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	fx_string *tmp = mie_parser_get_tempstr(parser);
+	if (!mie_parser_parse_word(parser, tmp, &span)) {
+		mie_parser_report_unexpected_token_s(
+			parser, "predicate word", "comparison operation");
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	int pred = find_predicate(fx_string_ptr(tmp));
+	if (pred == -1) {
+		struct mie_diag *diag = mie_parser_report_error_simple(
+			parser, "arith", MIE_ARITH_E_INVALID_COMPARISON_PREDICATE,
+			MIE_ARITH_MSG_INVALID_COMPARISON_PREDICATE, &span);
+		mie_diag_push_msg(
+			diag, mie_parser_get_mie_ctx(parser), "arith",
+			MIE_ARITH_MSG_VALID_COMPARISON_PREDICATES);
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (!mie_parser_parse_parameter_list(
+		    parser, false, MIE_VECTOR_REF(out->op_args),
+		    "comparison operands")) {
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (MIE_VECTOR_COUNT(out->op_args) != 2) {
+		mie_op_get_args_span(out, &span);
+		mie_parser_report_error_simple(
+			parser, "builtin",
+			MIE_BUILTIN_E_INCORRECT_NUMBER_OF_ARGUMENTS,
+			MIE_BUILTIN_MSG_OP_INCORRECT_NUMBER_OF_ARGS, &span);
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (!mie_parser_parse_symbol(parser, MIE_SYM_COLON)) {
+		mie_parser_report_unexpected_token(
+			parser, MIE_SYM_COLON, "comparison operand type");
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	const struct mie_type *type;
+	if (!mie_parser_parse_type(parser, "comparison operand type", &type, &span)) {
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	bool is_int_type = mie_type_is(type, "builtin", "int")
+	                || mie_type_is(type, "builtin", "index");
+
+	if (!is_int_type) {
+		mie_parser_report_error_simple(
+			parser, "arith", MIE_ARITH_E_INVALID_INTEGER_TYPE,
+			MIE_ARITH_MSG_EXPECTED_INTEGER_TYPE, &span);
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	for (size_t i = 0; i < MIE_VECTOR_COUNT(out->op_args); i++) {
+		out->op_args.items[i].arg_unresolved.reg_type = type;
+	}
+
+	out->op_result.items[0].reg_type
+		= mie_ctx_get_int_type(mie_parser_get_mie_ctx(parser), 1);
+
+	struct mie_attribute *pred_attribute
+		= mie_ctx_get_int(mie_parser_get_mie_ctx(parser), pred, 64);
+	mie_attribute_map_put(
+		&out->op_attrib, "predicate", pred_attribute,
+		MIE_ATTRMAP_F_REPLACE);
+
 	return MIE_SUCCESS;
 }
 
+struct mie_register *mie_arith_cmpi_put(
+	struct mie_emitter *e, enum mie_arith_cmpi_predicate pred,
+	struct mie_register *left, struct mie_register *right, const char *name)
+{
+	struct mie_register *args[] = {left, right};
+	const size_t nr_args = sizeof args / sizeof args[0];
+
+	struct mie_op *op = mie_emitter_put_op(e, "arith", "cmpi", args, nr_args);
+	const struct mie_type *ty = left->reg_type;
+
+	struct mie_register *result = mie_op_add_result(op, ty);
+	mie_emitter_put_name(e, &result->reg_name, name);
+
+	struct mie_attribute *pred_attribute
+		= mie_ctx_get_int(mie_emitter_get_ctx(e), pred, 64);
+	mie_attribute_map_put(
+		&op->op_attrib, "predicate", pred_attribute, MIE_ATTRMAP_F_REPLACE);
+
+	return result;
+}
+
 MIE_OP_DEFINITION_BEGIN(mie_arith_cmpi, "cmpi")
 	MIE_OP_DEFINITION_PRINT(print);
 	MIE_OP_DEFINITION_PARSE(parse);

mie/dialect/arith/op/constant.c

@@ -1,11 +1,14 @@
 #include <mie/attribute/attribute.h>
+#include <mie/dialect/arith.h>
 #include <mie/dialect/builtin.h>
 #include <mie/dialect/dialect.h>
 #include <mie/ir/emit.h>
 #include <mie/ir/op-definition.h>
 #include <mie/ir/op.h>
 #include <mie/macros.h>
+#include <mie/parse/parser.h>
 #include <mie/print/printer.h>
+#include <mie/type/type.h>
 
 static enum mie_status print(struct mie_printer *printer, const struct mie_op *op)
 {
@@ -18,14 +21,14 @@ static enum mie_status print(struct mie_printer *printer, const struct mie_op *o
 	const struct mie_type *type = NULL;
 	if (mie_attribute_check_name(value, "builtin", "int")) {
 		const struct mie_int *i = (const struct mie_int *)value;
-		b_stream_write_fmt(
+		fx_stream_write_fmt(
 			printer->p_stream, NULL, " %lld : ", i->i_val.v_small);
 		type = i->i_type;
 	} else if (mie_attribute_check_name(value, "builtin", "float")) {
 		const struct mie_float *f = (const struct mie_float *)value;
 		double d;
 		mie_float_get_value(value, &d);
-		b_stream_write_fmt(printer->p_stream, NULL, " %g : ", d);
+		fx_stream_write_fmt(printer->p_stream, NULL, " %g : ", d);
 		type = f->f_type;
 	} else {
 		return MIE_SUCCESS;
@@ -36,11 +39,126 @@ static enum mie_status print(struct mie_printer *printer, const struct mie_op *o
 	return MIE_SUCCESS;
 }
 
-static enum mie_status parse(struct mie_parser *parser, struct mie_op *out)
+static enum mie_status parse_int(
+	struct mie_parser *parser, long long i, struct mie_file_span *loc,
+	struct mie_op *out)
 {
+	if (!mie_parser_parse_symbol(parser, MIE_SYM_COLON)) {
+		mie_parser_report_unexpected_token(
+			parser, MIE_SYM_COLON, "arithmetic constant type");
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	const struct mie_type *type = NULL;
+	struct mie_file_span type_span;
+	if (!mie_parser_parse_type(
+		    parser, "arithmetic constant type", &type, &type_span)) {
+		mie_parser_report_unexpected_token(
+			parser, MIE_TOK_TYPENAME, "arithmetic constant type");
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	struct mie_attribute *value = NULL;
+
+	if (mie_type_is(type, "builtin", "int")) {
+		value = mie_ctx_get_int(
+			mie_parser_get_mie_ctx(parser), i,
+			mie_int_type_get_width(type));
+	} else if (mie_type_is(type, "builtin", "index")) {
+		value = mie_ctx_get_index(mie_parser_get_mie_ctx(parser), i);
+	} else {
+		mie_parser_report_error_simple(
+			parser, "arith", MIE_ARITH_E_INVALID_INTEGER_TYPE,
+			MIE_ARITH_MSG_EXPECTED_INTEGER_TYPE, &type_span);
+	}
+
+	if (MIE_VECTOR_COUNT(out->op_result) != 1) {
+		mie_parser_report_error_simple(
+			parser, "builtin",
+			MIE_BUILTIN_E_INCORRECT_NUMBER_OF_RESULTS,
+			MIE_BUILTIN_MSG_OP_EXPECTS_X_RESULTS, &type_span);
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	mie_attribute_map_put(
+		&out->op_attrib, "value", value, MIE_ATTRMAP_F_REPLACE);
+
+	out->op_result.items[0].reg_type = type;
+
 	return MIE_SUCCESS;
 }
 
+static enum mie_status parse_float(
+	struct mie_parser *parser, double d, struct mie_file_span *loc,
+	struct mie_op *out)
+{
+	if (!mie_parser_parse_symbol(parser, MIE_SYM_COLON)) {
+		mie_parser_report_unexpected_token(
+			parser, MIE_SYM_COLON, "arithmetic constant type");
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	const struct mie_type *type = NULL;
+	struct mie_file_span type_span;
+	if (!mie_parser_parse_type(
+		    parser, "arithmetic constant type", &type, &type_span)) {
+		mie_parser_report_unexpected_token(
+			parser, MIE_TOK_TYPENAME, "arithmetic constant type");
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	struct mie_attribute *value = NULL;
+
+	if (mie_type_is(type, "builtin", "float")) {
+		value = mie_ctx_get_float(
+			mie_parser_get_mie_ctx(parser), d,
+			mie_float_type_get_width(type));
+	} else {
+		mie_parser_report_error_simple(
+			parser, "arith", MIE_ARITH_E_INVALID_FLOAT_TYPE,
+			MIE_ARITH_MSG_EXPECTED_FLOAT_TYPE, &type_span);
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (MIE_VECTOR_COUNT(out->op_result) != 1) {
+		mie_parser_report_error_simple(
+			parser, "builtin",
+			MIE_BUILTIN_E_INCORRECT_NUMBER_OF_RESULTS,
+			MIE_BUILTIN_MSG_OP_EXPECTS_X_RESULTS, &type_span);
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	mie_attribute_map_put(
+		&out->op_attrib, "value", value, MIE_ATTRMAP_F_REPLACE);
+
+	out->op_result.items[0].reg_type = type;
+
+	return MIE_SUCCESS;
+}
+
+static enum mie_status parse(
+	struct mie_parser *parser, struct mie_parser_scope *scope,
+	struct mie_op *out)
+{
+	double d;
+	long long i;
+	struct mie_file_span span;
+	if (mie_parser_parse_int(parser, &i, &span)) {
+		return parse_int(parser, i, &span, out);
+	} else if (mie_parser_parse_float(parser, &d, &span)) {
+		return parse_float(parser, d, &span, out);
+	} else {
+		struct mie_parser_item required[] = {
+			MIE_PARSE_ITEM_TOKEN(MIE_TOK_INT),
+			MIE_PARSE_ITEM_TOKEN(MIE_TOK_FLOAT),
+			MIE_PARSE_ITEM_NONE,
+		};
+		mie_parser_report_unexpected_token_v(
+			parser, required, "arithmetic constant");
+		return MIE_ERR_BAD_SYNTAX;
+	}
+}
+
 struct mie_register *mie_arith_constant_i_put(
 	struct mie_emitter *e, long long value, const char *name)
 {

mie/dialect/builtin/attribute/array.c

@@ -13,27 +13,27 @@ static enum mie_status print(
 	const struct mie_array *array = (const struct mie_array *)value;
 
 	if (!(out->p_flags & MIE_PRINT_F_ABBREVIATED)) {
-		b_stream_write_string(out->p_stream, "#builtin.array<", NULL);
+		fx_stream_write_string(out->p_stream, "#builtin.array<", NULL);
 	}
 
-	b_stream_write_char(out->p_stream, '[');
+	fx_stream_write_char(out->p_stream, '[');
 
 	for (size_t i = 0; i < MIE_VECTOR_COUNT(array->a_items); i++) {
 		if (i > 0) {
-			b_stream_write_char(out->p_stream, ',');
+			fx_stream_write_char(out->p_stream, ',');
 		}
 
-		b_stream_write_char(out->p_stream, ' ');
+		fx_stream_write_char(out->p_stream, ' ');
 		mie_printer_print_attribute(out, array->a_items.items[i]);
 	}
 
 	if (MIE_VECTOR_COUNT(array->a_items) != 0) {
-		b_stream_write_char(out->p_stream, ' ');
+		fx_stream_write_char(out->p_stream, ' ');
 	}
-	b_stream_write_char(out->p_stream, ']');
+	fx_stream_write_char(out->p_stream, ']');
 
 	if (!(out->p_flags & MIE_PRINT_F_ABBREVIATED)) {
-		b_stream_write_char(out->p_stream, '>');
+		fx_stream_write_char(out->p_stream, '>');
 	}
 
 	return MIE_SUCCESS;

mie/dialect/builtin/attribute/float.c

@@ -1,6 +1,6 @@
 #include "../float.h"
 
-#include <blue/core/bstr.h>
+#include <fx/core/bstr.h>
 #include <mie/attribute/attribute-definition.h>
 #include <mie/attribute/attribute.h>
 #include <mie/ctx.h>
@@ -17,28 +17,28 @@ static enum mie_status print(
 	const struct float_type *float_ty
 		= (const struct float_type *)float_val->f_type;
 	if (!(out->p_flags & MIE_PRINT_F_ABBREVIATED)) {
-		b_stream_write_string(out->p_stream, "#builtin.float<", NULL);
+		fx_stream_write_string(out->p_stream, "#builtin.float<", NULL);
 	}
 
 	switch (float_ty->f_width) {
 	case MIE_FLOAT_32:
-		b_stream_write_fmt(
+		fx_stream_write_fmt(
 			out->p_stream, NULL, "%f : f%zu", float_val->f_val.v_32,
 			float_ty->f_width);
 		break;
 	case MIE_FLOAT_64:
-		b_stream_write_fmt(
+		fx_stream_write_fmt(
 			out->p_stream, NULL, "%lf : f%zu",
 			float_val->f_val.v_64, float_ty->f_width);
 		break;
 	default:
-		b_stream_write_fmt(
+		fx_stream_write_fmt(
 			out->p_stream, NULL, "NaN : f%zu", float_ty->f_width);
 		break;
 	}
 
 	if (!(out->p_flags & MIE_PRINT_F_ABBREVIATED)) {
-		b_stream_write_string(out->p_stream, ">", NULL);
+		fx_stream_write_string(out->p_stream, ">", NULL);
 	}
 
 	return MIE_SUCCESS;
@@ -59,7 +59,7 @@ static enum mie_status parse(
 	}
 
 	const struct mie_type *type = NULL;
-	if (!mie_parser_parse_type(ctx, &type)) {
+	if (!mie_parser_parse_type(ctx, NULL, &type, NULL)) {
 		return MIE_ERR_BAD_SYNTAX;
 	}
 

mie/dialect/builtin/attribute/int.c

@@ -1,6 +1,6 @@
 #include "../int.h"
 
-#include <blue/core/bstr.h>
+#include <fx/core/bstr.h>
 #include <mie/attribute/attribute-definition.h>
 #include <mie/attribute/attribute.h>
 #include <mie/ctx.h>
@@ -18,32 +18,32 @@ static enum mie_status print(
 	bool abbrev = ((out->p_flags & MIE_PRINT_F_ABBREVIATED) != 0);
 
 	if (!abbrev) {
-		b_stream_write_string(out->p_stream, "#builtin.int<", NULL);
+		fx_stream_write_string(out->p_stream, "#builtin.int<", NULL);
 	}
 
 	if (int_ty->i_width <= 64) {
-		b_stream_write_fmt(
+		fx_stream_write_fmt(
 			out->p_stream, NULL, "%zu", int_val->i_val.v_small,
 			int_ty->i_width);
 	} else {
-		b_stream_write_fmt(out->p_stream, NULL, "INF", int_ty->i_width);
+		fx_stream_write_fmt(out->p_stream, NULL, "INF", int_ty->i_width);
 	}
 
 	if (int_ty->i_width != 64 || !abbrev) {
-		b_stream_write_string(out->p_stream, " : ", NULL);
+		fx_stream_write_string(out->p_stream, " : ", NULL);
 
 		if (abbrev) {
-			b_stream_write_fmt(
+			fx_stream_write_fmt(
 				out->p_stream, NULL, "i%zu", int_ty->i_width);
 		} else {
-			b_stream_write_fmt(
+			fx_stream_write_fmt(
 				out->p_stream, NULL, "!builtin.int<%zu>",
 				int_ty->i_width);
 		}
 	}
 
 	if (!abbrev) {
-		b_stream_write_string(out->p_stream, ">", NULL);
+		fx_stream_write_string(out->p_stream, ">", NULL);
 	}
 
 	return MIE_SUCCESS;
@@ -64,7 +64,7 @@ static enum mie_status parse(
 
 	if (!mie_parser_parse_symbol(ctx, MIE_SYM_COLON)) {
 		width = 64;
-	} else if (!mie_parser_parse_type(ctx, &type)) {
+	} else if (!mie_parser_parse_type(ctx, NULL, &type, NULL)) {
 		return false;
 	} else {
 		width = mie_int_type_get_width(type);

mie/dialect/builtin/attribute/string.c

@@ -11,9 +11,9 @@ static enum mie_status print(
 {
 	const struct mie_string *str = (const struct mie_string *)value;
 	if (out->p_flags & MIE_PRINT_F_ABBREVIATED) {
-		b_stream_write_fmt(out->p_stream, NULL, "\"%s\"", str->str_val);
+		fx_stream_write_fmt(out->p_stream, NULL, "\"%s\"", str->str_val);
 	} else {
-		b_stream_write_fmt(
+		fx_stream_write_fmt(
 			out->p_stream, NULL, "#builtin.string<\"%s\">",
 			str->str_val);
 	}
@@ -23,14 +23,14 @@ static enum mie_status print(
 static enum mie_status parse(
 	struct mie_parser *ctx, const struct mie_attribute **out)
 {
-	b_string *str = mie_parser_get_tempstr(ctx);
+	fx_string *str = mie_parser_get_tempstr(ctx);
 	struct mie_file_span span;
 	if (!mie_parser_parse_string(ctx, str, &span)) {
 		return MIE_ERR_BAD_SYNTAX;
 	}
 
 	struct mie_attribute *v = mie_ctx_get_string(
-		mie_parser_get_mie_ctx(ctx), b_string_ptr(str));
+		mie_parser_get_mie_ctx(ctx), fx_string_ptr(str));
 
 	if (!v) {
 		return MIE_ERR_NO_MEMORY;

mie/dialect/builtin/attribute/type.c

@@ -30,13 +30,13 @@ static enum mie_status print(
 	const struct mie_type_attr *ty = (const struct mie_type_attr *)value;
 
 	if (!(out->p_flags & MIE_PRINT_F_ABBREVIATED)) {
-		b_stream_write_string(out->p_stream, "#builtin.type<", NULL);
+		fx_stream_write_string(out->p_stream, "#builtin.type<", NULL);
 	}
 
 	mie_printer_print_type(out, ty->ty_value);
 
 	if (!(out->p_flags & MIE_PRINT_F_ABBREVIATED)) {
-		b_stream_write_char(out->p_stream, '>');
+		fx_stream_write_char(out->p_stream, '>');
 	}
 
 	return MIE_SUCCESS;
@@ -53,7 +53,7 @@ static enum mie_status parse(
 
 	const struct mie_type *type = NULL;
 
-	if (!mie_parser_parse_type(ctx, &type)) {
+	if (!mie_parser_parse_type(ctx, NULL, &type, NULL)) {
 		free(ty);
 		return MIE_ERR_BAD_FORMAT;
 	}

mie/dialect/builtin/builtin.c

@@ -97,6 +97,7 @@ MIE_DIALECT_BEGIN(mie_builtin, struct builtin_dialect, "builtin")
 	MIE_DIALECT_ADD_TYPE(mie_builtin_float);
 	MIE_DIALECT_ADD_TYPE(mie_builtin_index);
 	MIE_DIALECT_ADD_TYPE(mie_builtin_string);
+	MIE_DIALECT_ADD_TYPE(mie_builtin_memref);
 	MIE_DIALECT_ADD_ATTRIBUTE(mie_builtin_int);
 	MIE_DIALECT_ADD_ATTRIBUTE(mie_builtin_float);
 	MIE_DIALECT_ADD_ATTRIBUTE(mie_builtin_type);

mie/dialect/builtin/diag.c

@@ -8,13 +8,37 @@
 
 MIE_DIAG_CLASS_LIST_BEGIN(mie_builtin_diag)
 	MIE_DIAG_CLASS(UNRECOGNISED_TOKEN, ERROR, "Unrecognised token")
+	MIE_DIAG_CLASS(UNEXPECTED_TOKEN, ERROR, "Unexpected token")
+	MIE_DIAG_CLASS(UNRESOLVED_TYPE, ERROR, "Unresolved type")
 	MIE_DIAG_CLASS(UNRESOLVED_VALUE, ERROR, "Unresolved value")
 	MIE_DIAG_CLASS(UNRESOLVED_SUCCESSOR, ERROR, "Unresolved successor")
+	MIE_DIAG_CLASS(UNKNOWN_OP, ERROR, "Unknown op")
+	MIE_DIAG_CLASS(
+		OP_REQUIRES_PARENT_SCOPE, ERROR, "Op requires parent scope")
+	MIE_DIAG_CLASS(
+		INCORRECT_NUMBER_OF_RESULTS, ERROR,
+		"Incorrect number of results")
+	MIE_DIAG_CLASS(
+		INCORRECT_NUMBER_OF_ARGUMENTS, ERROR,
+		"Incorrect number of arguments")
+	MIE_DIAG_CLASS(
+		INCORRECT_NUMBER_OF_TYPES, ERROR, "Incorrect number of types")
+	MIE_DIAG_CLASS(INCORRECT_TYPE, ERROR, "Incorrect type")
+	MIE_DIAG_CLASS(INVALID_TYPE, ERROR, "Invalid type")
+	MIE_DIAG_CLASS(NAME_ALREADY_IN_USE, ERROR, "Name already in use")
+	MIE_DIAG_CLASS(INTERNAL_ERROR, ERROR, "Internal error")
 MIE_DIAG_CLASS_LIST_END(mie_builtin_diag)
 
 MIE_DIAG_MSG_LIST_BEGIN(mie_builtin_msg)
 	MIE_DIAG_MSG(UNRECOGNISED_TOKEN, "encountered an unrecognised token.")
+	MIE_DIAG_MSG(UNEXPECTED_TOKEN, "encountered an unexpected token.")
 	MIE_DIAG_MSG(UNRESOLVED_VALUE, "cannot resolve this value reference.")
+	MIE_DIAG_MSG(
+		UNRESOLVED_BUILTIN_TYPE,
+		"cannot resolve this builtin type reference.")
+	MIE_DIAG_MSG(
+		UNRESOLVED_DIALECT_TYPE,
+		"cannot resolve this dialect type reference.")
 	MIE_DIAG_MSG(
 		CANNOT_FIND_BLOCK,
 		"cannot find a block with this name in this region.")
@@ -33,4 +57,43 @@ MIE_DIAG_MSG_LIST_BEGIN(mie_builtin_msg)
 		"outside of this region.")
 	MIE_DIAG_MSG(
 		VALUE_DEFINED_IN_BLOCK, "the value is defined in this block.")
+	MIE_DIAG_MSG(UNKNOWN_OP, "encountered an unknown operation.")
+	MIE_DIAG_MSG(
+		OP_REQUIRES_PARENT_SCOPE,
+		"this operation requires a parent scope.")
+	MIE_DIAG_MSG(
+		OP_PARENT_SCOPE_EXAMPLE,
+		"operations that require a parent scope cannot be used as a "
+		"top-level operation. try wrapping this operation in a "
+		"[blue]module[reset].")
+	MIE_DIAG_MSG(
+		USE_GENERIC_OP_SYNTAX,
+		"if this op belongs to an unknown dialect, you can use generic "
+		"op syntax to represent it.")
+	MIE_DIAG_MSG(
+		OP_HAS_NO_PARSER,
+		"this operation has no associated parser functionality.")
+	MIE_DIAG_MSG(
+		DIALECT_INTERNAL_ERROR,
+		"this error is caused by an internal problem with the relevant "
+		"dialect. please report the issue to the dialect vendor.")
+	MIE_DIAG_MSG(
+		COMPILER_INTERNAL_ERROR,
+		"this error is caused by an internal compiler issue. please "
+		"report the issue to the compiler vendor.")
+	MIE_DIAG_MSG(
+		NR_RESULT_NAME_OUTPUT_MISMATCH,
+		"the number of [red]output value names[reset] does not match "
+		"the number of results.")
+	MIE_DIAG_MSG(
+		OP_INCORRECT_NUMBER_OF_ARGS,
+		"this operation does not have the correct number of arguments.")
+	MIE_DIAG_MSG(
+		OP_NR_TYPES_DOESNT_MATCH_NR_ARGS,
+		"the number of types specified does not match the number of "
+		"arguments.")
+	MIE_DIAG_MSG(
+		OP_NR_TYPES_DOESNT_MATCH_NR_RESULTS,
+		"the number of types specified does not match the number of "
+		"results.")
 MIE_DIAG_MSG_LIST_END(mie_builtin_msg)

mie/dialect/builtin/index-cache.c

@@ -1,21 +1,21 @@
-#include <blue/core/btree.h>
+#include <fx/core/bst.h>
 #include <mie/ctx.h>
 #include <mie/dialect/builtin.h>
 #include <stdlib.h>
 #include <string.h>
 
 struct index_cache_entry {
-	b_btree_node e_node;
+	fx_bst_node e_node;
 	struct mie_index e_value;
 };
 
 struct mie_index_cache {
-	b_btree c_entries;
+	fx_bst c_entries;
 };
 
-static B_BTREE_DEFINE_SIMPLE_INSERT(
+static FX_BST_DEFINE_SIMPLE_INSERT(
 	struct index_cache_entry, e_node, e_value.i_value, put_index);
-static B_BTREE_DEFINE_SIMPLE_GET(
+static FX_BST_DEFINE_SIMPLE_GET(
 	struct index_cache_entry, size_t, e_node, e_value.i_value, get_index);
 
 static struct index_cache_entry *index_cache_entry_create(
@@ -48,13 +48,13 @@ struct mie_index_cache *mie_index_cache_create(void)
 
 void mie_index_cache_destroy(struct mie_index_cache *cache)
 {
-	b_btree_node *cur = b_btree_first(&cache->c_entries);
+	fx_bst_node *cur = fx_bst_first(&cache->c_entries);
 	while (cur) {
-		b_btree_node *next = b_btree_next(cur);
-		b_btree_delete(&cache->c_entries, cur);
+		fx_bst_node *next = fx_bst_next(cur);
+		fx_bst_delete(&cache->c_entries, cur);
 
 		struct index_cache_entry *entry
-			= b_unbox(struct index_cache_entry, cur, e_node);
+			= fx_unbox(struct index_cache_entry, cur, e_node);
 		free(entry);
 
 		cur = next;

mie/dialect/builtin/op/module.c

@@ -4,11 +4,12 @@
 #include <mie/ir/op.h>
 #include <mie/ir/region.h>
 #include <mie/macros.h>
+#include <mie/parse/parser.h>
 #include <mie/print/printer.h>
 
 static enum mie_status print(struct mie_printer *out, const struct mie_op *op)
 {
-	b_stream_write_char(out->p_stream, ' ');
+	fx_stream_write_char(out->p_stream, ' ');
 
 	struct mie_region *region = mie_op_get_first_region(op);
 	if (region) {
@@ -18,8 +19,21 @@ static enum mie_status print(struct mie_printer *out, const struct mie_op *op)
 	return MIE_SUCCESS;
 }
 
-static enum mie_status parse(struct mie_parser *parser, struct mie_op *out)
+static enum mie_status parse(
+	struct mie_parser *parser, struct mie_parser_scope *scope,
+	struct mie_op *out)
 {
+	struct mie_region *region = mie_op_add_region(out);
+	if (mie_parser_peek_symbol(parser) != MIE_SYM_LEFT_BRACE) {
+		mie_parser_report_unexpected_token_s(
+			parser, "region", "module body");
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (!mie_parser_parse_region(parser, out, region, NULL)) {
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
 	return MIE_SUCCESS;
 }
 

mie/dialect/builtin/string-cache.c

@@ -1,12 +1,12 @@
-#include <blue/core/btree.h>
-#include <blue/ds/hashmap.h>
+#include <fx/core/bst.h>
+#include <fx/ds/hashmap.h>
 #include <mie/ctx.h>
 #include <mie/dialect/builtin.h>
 #include <stdlib.h>
 #include <string.h>
 
 struct mie_string_cache {
-	b_hashmap *c_entries;
+	fx_hashmap *c_entries;
 };
 
 static struct mie_string *mie_string_create(
@@ -19,7 +19,7 @@ static struct mie_string *mie_string_create(
 
 	out->str_base.a_def
 		= mie_ctx_get_attribute_definition(ctx, "builtin", "string");
-	out->str_val = b_strdup(s);
+	out->str_val = fx_strdup(s);
 	if (!out->str_val) {
 		return NULL;
 	}
@@ -42,8 +42,8 @@ struct mie_string_cache *mie_string_cache_create(void)
 
 	memset(out, 0x0, sizeof *out);
 
-	out->c_entries = b_hashmap_create(
-		NULL, (b_hashmap_value_destructor)mie_string_destroy);
+	out->c_entries = fx_hashmap_create(
+		NULL, (fx_hashmap_value_destructor)mie_string_destroy);
 	if (!out->c_entries) {
 		free(out);
 		return NULL;
@@ -54,7 +54,7 @@ struct mie_string_cache *mie_string_cache_create(void)
 
 void mie_string_cache_destroy(struct mie_string_cache *cache)
 {
-	b_hashmap_unref(cache->c_entries);
+	fx_hashmap_unref(cache->c_entries);
 	free(cache);
 }
 
@@ -62,8 +62,8 @@ struct mie_string *mie_string_cache_get(
 	struct mie_string_cache *cache, struct mie_ctx *ctx, const char *s)
 {
 	size_t s_len = strlen(s);
-	b_hashmap_key key = {.key_data = s, .key_size = s_len};
-	const b_hashmap_value *value = b_hashmap_get(cache->c_entries, &key);
+	fx_hashmap_key key = {.key_data = s, .key_size = s_len};
+	const fx_hashmap_value *value = fx_hashmap_get(cache->c_entries, &key);
 	if (value) {
 		return value->value_data;
 	}
@@ -73,8 +73,8 @@ struct mie_string *mie_string_cache_get(
 		return NULL;
 	}
 
-	b_hashmap_value new_val = {.value_data = str, .value_size = sizeof *str};
-	b_hashmap_put(cache->c_entries, &key, &new_val);
+	fx_hashmap_value new_val = {.value_data = str, .value_size = sizeof *str};
+	fx_hashmap_put(cache->c_entries, &key, &new_val);
 
 	return str;
 }

mie/dialect/builtin/type/float.c

@@ -1,6 +1,6 @@
 #include "../float.h"
 
-#include <blue/core/bstr.h>
+#include <fx/core/bstr.h>
 #include <mie/ctx.h>
 #include <mie/dialect/builtin.h>
 #include <mie/dialect/dialect.h>
@@ -17,16 +17,16 @@ struct mie_type *mie_ctx_get_float_type(struct mie_ctx *ctx, size_t bit_width)
 		return NULL;
 	}
 
-	b_rope rope_i = B_ROPE_CHAR('f'), rope_width = B_ROPE_UINT(bit_width);
-	b_rope type_name;
-	b_rope_concat(&type_name, &rope_i, &rope_width);
+	fx_rope rope_i = FX_ROPE_CHAR('f'), rope_width = FX_ROPE_UINT(bit_width);
+	fx_rope type_name;
+	fx_rope_concat(&type_name, &rope_i, &rope_width);
 
 	mie_id id;
 	mie_id_init_ns(&id, mie_id_map_get_ns(&ctx->ctx_types), &type_name);
 
 	mie_id *target = mie_id_map_get(&ctx->ctx_types, &id);
 	if (target) {
-		return b_unbox(struct mie_type, target, ty_id);
+		return fx_unbox(struct mie_type, target, ty_id);
 	}
 
 	struct float_type *type = (struct float_type *)mie_type_create(type_info);
@@ -34,7 +34,7 @@ struct mie_type *mie_ctx_get_float_type(struct mie_ctx *ctx, size_t bit_width)
 		return NULL;
 	}
 
-	type->f_base.ty_name = b_bstr_fmt(NULL, "builtin.float<%zu>", bit_width);
+	type->f_base.ty_name = fx_bstr_fmt(NULL, "builtin.float<%zu>", bit_width);
 	type->f_base.ty_instance_size = sizeof(struct mie_float);
 	type->f_width = bit_width;
 
@@ -59,7 +59,7 @@ size_t mie_float_type_get_width(const struct mie_type *type)
 static enum mie_status print(const struct mie_type *ty, struct mie_printer *out)
 {
 	const struct float_type *float_type = (const struct float_type *)ty;
-	b_stream_write_fmt(
+	fx_stream_write_fmt(
 		out->p_stream, NULL,
 		(out->p_flags & MIE_PRINT_F_ABBREVIATED) ? "f%zu" : "!builtin.float<%zu>",
 		float_type->f_width);

mie/dialect/builtin/type/int.c

@@ -1,6 +1,6 @@
 #include "../int.h"
 
-#include <blue/core/bstr.h>
+#include <fx/core/bstr.h>
 #include <mie/ctx.h>
 #include <mie/dialect/builtin.h>
 #include <mie/dialect/dialect.h>
@@ -17,16 +17,16 @@ struct mie_type *mie_ctx_get_int_type(struct mie_ctx *ctx, size_t bit_width)
 		return NULL;
 	}
 
-	b_rope rope_i = B_ROPE_CHAR('i'), rope_width = B_ROPE_UINT(bit_width);
-	b_rope type_name;
-	b_rope_concat(&type_name, &rope_i, &rope_width);
+	fx_rope rope_i = FX_ROPE_CHAR('i'), rope_width = FX_ROPE_UINT(bit_width);
+	fx_rope type_name;
+	fx_rope_concat(&type_name, &rope_i, &rope_width);
 
 	mie_id id;
 	mie_id_init_ns(&id, mie_id_map_get_ns(&ctx->ctx_types), &type_name);
 
 	mie_id *target = mie_id_map_get(&ctx->ctx_types, &id);
 	if (target) {
-		return b_unbox(struct mie_type, target, ty_id);
+		return fx_unbox(struct mie_type, target, ty_id);
 	}
 
 	struct int_type *type = (struct int_type *)mie_type_create(type_info);
@@ -34,7 +34,7 @@ struct mie_type *mie_ctx_get_int_type(struct mie_ctx *ctx, size_t bit_width)
 		return NULL;
 	}
 
-	type->i_base.ty_name = b_bstr_fmt(NULL, "builtin.int<%zu>", bit_width);
+	type->i_base.ty_name = fx_bstr_fmt(NULL, "builtin.int<%zu>", bit_width);
 	type->i_base.ty_instance_size = sizeof(struct mie_int);
 	type->i_width = bit_width;
 
@@ -59,7 +59,7 @@ size_t mie_int_type_get_width(const struct mie_type *type)
 static enum mie_status print(const struct mie_type *ty, struct mie_printer *out)
 {
 	const struct int_type *int_type = (const struct int_type *)ty;
-	b_stream_write_fmt(
+	fx_stream_write_fmt(
 		out->p_stream, NULL,
 		(out->p_flags & MIE_PRINT_F_ABBREVIATED) ? "i%zu"
 							 : "!builtin.int<%zu>",

mie/dialect/builtin/type/memref.c

@@ -0,0 +1,290 @@
+#include <fx/core/bstr.h>
+#include <mie/ctx.h>
+#include <mie/dialect/builtin.h>
+#include <mie/dialect/dialect.h>
+#include <mie/dialect/memref.h>
+#include <mie/macros.h>
+#include <mie/parse/parser.h>
+#include <mie/print/printer.h>
+#include <mie/type/type-definition.h>
+#include <mie/type/type.h>
+
+struct memref_type {
+	struct mie_type m_base;
+	MIE_VECTOR_DECLARE(struct mie_memref_rank, m_rank);
+};
+
+struct mie_type *mie_ctx_get_memref_type(
+	struct mie_ctx *ctx, const struct mie_memref_rank *ranks, size_t nr_ranks)
+{
+	struct mie_type_definition *type_info
+		= mie_ctx_get_type_definition(ctx, "builtin", "memref");
+	if (!type_info) {
+		return NULL;
+	}
+
+	struct mie_id_builder id_ctx;
+	mie_id_builder_begin(&id_ctx, mie_id_map_get_ns(&ctx->ctx_types));
+	mie_id_builder_add_cstr(&id_ctx, "memref");
+
+	for (size_t i = 0; i < nr_ranks; i++) {
+		switch (ranks[i].r_ranktype) {
+		case MIE_MEMREF_RANK_UNKNOWN:
+			mie_id_builder_add_char(&id_ctx, '?');
+			break;
+		case MIE_MEMREF_RANK_TYPE:
+			mie_id_builder_add_id(&id_ctx, &ranks[i].r_type->ty_id);
+			break;
+		case MIE_MEMREF_RANK_STATIC:
+			mie_id_builder_add_int(&id_ctx, ranks[i].r_static);
+			break;
+		default:
+			return NULL;
+		}
+	}
+
+	mie_id id;
+	mie_id_builder_end(&id_ctx, &id);
+
+	mie_id *target = mie_id_map_get(&ctx->ctx_types, &id);
+	if (target) {
+		return fx_unbox(struct mie_type, target, ty_id);
+	}
+
+	struct memref_type *type
+		= (struct memref_type *)mie_type_create(type_info);
+	if (!type) {
+		return NULL;
+	}
+
+	fx_bstr type_name;
+	fx_bstr_begin_dynamic(&type_name);
+	fx_bstr_write_cstr(&type_name, "builtin.memref<", NULL);
+
+	struct mie_printer printer;
+	mie_printer_init(
+		&printer, ctx, (fx_stream *)&type_name, MIE_PRINT_F_ABBREVIATED);
+
+	for (size_t i = 0; i < nr_ranks; i++) {
+		mie_vector_push_back(type->m_rank, &ranks[i], NULL);
+
+		if (i > 0) {
+			fx_bstr_write_char(&type_name, '*');
+		}
+
+		switch (ranks[i].r_ranktype) {
+		case MIE_MEMREF_RANK_UNKNOWN:
+			fx_bstr_write_char(&type_name, '?');
+			break;
+		case MIE_MEMREF_RANK_TYPE:
+			mie_printer_print_type(&printer, ranks[i].r_type);
+			break;
+		case MIE_MEMREF_RANK_STATIC:
+			fx_bstr_write_fmt(&type_name, NULL, "%zu", ranks[i].r_static);
+			break;
+		default:
+			break;
+		}
+	}
+
+	fx_bstr_write_char(&type_name, '>');
+	type->m_base.ty_name = fx_bstr_end(&type_name);
+	type->m_base.ty_instance_size = 0;
+	fx_rope name_rope = FX_ROPE_CSTR(type->m_base.ty_name);
+
+	mie_id_map_put(&ctx->ctx_types, &type->m_base.ty_id, &name_rope);
+	return (struct mie_type *)type;
+}
+
+static void type_init(
+	const struct mie_type_definition *type_info, struct mie_type *type)
+{
+}
+
+static enum mie_status print(const struct mie_type *ty, struct mie_printer *out)
+{
+	const struct memref_type *memref_ty = (const struct memref_type *)ty;
+	fx_stream_write_string(
+		out->p_stream,
+		(out->p_flags & MIE_PRINT_F_ABBREVIATED) ? "memref"
+							 : "builtin.memref",
+		NULL);
+
+	fx_stream_write_char(out->p_stream, '<');
+	for (size_t i = 0; i < MIE_VECTOR_COUNT(memref_ty->m_rank); i++) {
+		const struct mie_memref_rank *rank = &memref_ty->m_rank.items[i];
+
+		if (i > 0) {
+			fx_stream_write_char(out->p_stream, '*');
+		}
+
+		switch (rank->r_ranktype) {
+		case MIE_MEMREF_RANK_UNKNOWN:
+			fx_stream_write_char(out->p_stream, '?');
+			break;
+		case MIE_MEMREF_RANK_TYPE:
+			mie_printer_print_type(out, rank->r_type);
+			break;
+		case MIE_MEMREF_RANK_STATIC:
+			fx_stream_write_fmt(
+				out->p_stream, NULL, "%zu", rank->r_static);
+			break;
+		default:
+			break;
+		}
+	}
+	fx_stream_write_char(out->p_stream, '>');
+
+	return MIE_SUCCESS;
+}
+
+static bool parse_rank(struct mie_parser *parser, struct mie_memref_rank *out)
+{
+	enum mie_token_type tok_type = mie_parser_peek_type(parser);
+	struct mie_parser_item expected_tokens[] = {
+		MIE_PARSE_ITEM_TOKEN(MIE_TOK_TYPENAME),
+		MIE_PARSE_ITEM_TOKEN(MIE_TOK_INT),
+		MIE_PARSE_ITEM_TOKEN(MIE_SYM_QUESTION),
+		MIE_PARSE_ITEM_NONE,
+	};
+
+	long long v;
+
+	switch (tok_type) {
+	case MIE_TOK_INT:
+		out->r_ranktype = MIE_MEMREF_RANK_STATIC;
+		out->r_type = mie_ctx_get_type(
+			mie_parser_get_mie_ctx(parser), "builtin", "index");
+		mie_parser_parse_int(parser, &v, &out->r_span);
+		out->r_static = v;
+		break;
+	case MIE_TOK_SYMBOL:
+		switch (mie_parser_peek_symbol(parser)) {
+		case MIE_SYM_QUESTION:
+			out->r_span = mie_parser_peek(parser)->tok_location;
+			mie_parser_parse_symbol(parser, MIE_SYM_QUESTION);
+			out->r_ranktype = MIE_MEMREF_RANK_UNKNOWN;
+			break;
+		case MIE_SYM_LEFT_PAREN:
+			out->r_ranktype = MIE_MEMREF_RANK_TYPE;
+			if (!mie_parser_parse_type(
+				    parser, "memref type rank", &out->r_type,
+				    &out->r_span)) {
+				return false;
+			}
+			break;
+		default:
+			mie_parser_report_unexpected_token_v(
+				parser, expected_tokens, "memref rank");
+			return false;
+		}
+		break;
+	case MIE_TOK_WORD:
+	case MIE_TOK_TYPENAME:
+		out->r_ranktype = MIE_MEMREF_RANK_TYPE;
+		if (!mie_parser_parse_type(
+			    parser, "memref type rank", &out->r_type, &out->r_span)) {
+			return false;
+		}
+		break;
+	default:
+		mie_parser_report_unexpected_token_v(
+			parser, expected_tokens, "memref rank");
+		return false;
+	}
+	return true;
+}
+
+static bool parse_ranks(
+	struct mie_parser *parser,
+	MIE_VECTOR_REF_PARAM(struct mie_memref_rank, ranks))
+{
+	struct mie_memref_rank rank;
+	if (!parse_rank(parser, &rank)) {
+		return false;
+	}
+
+	mie_vector_ref_push_back(ranks, &rank, NULL);
+
+	while (1) {
+		if (mie_parser_peek_symbol(parser) == MIE_SYM_RIGHT_ANGLE) {
+			break;
+		}
+
+		if (!mie_parser_parse_symbol(parser, MIE_SYM_ASTERISK)) {
+			mie_parser_report_unexpected_token(
+				parser, MIE_SYM_ASTERISK, "memref rank list");
+			return false;
+		}
+
+		if (!parse_rank(parser, &rank)) {
+			return false;
+		}
+
+		mie_vector_ref_push_back(ranks, &rank, NULL);
+	}
+
+	return true;
+}
+
+static enum mie_status parse(struct mie_parser *parser, const struct mie_type **out)
+{
+	if (!mie_parser_parse_symbol(parser, MIE_SYM_LEFT_ANGLE)) {
+		mie_parser_report_unexpected_token(
+			parser, MIE_SYM_LEFT_ANGLE, "memref type");
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	MIE_VECTOR_DEFINE(struct mie_memref_rank, ranks);
+	if (!parse_ranks(parser, MIE_VECTOR_REF(ranks))) {
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (!mie_parser_parse_symbol(parser, MIE_SYM_RIGHT_ANGLE)) {
+		mie_parser_report_unexpected_token(
+			parser, MIE_SYM_RIGHT_ANGLE, "memref type");
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	const struct mie_type *type = mie_ctx_get_memref_type(
+		mie_parser_get_mie_ctx(parser), ranks.items, ranks.count);
+	mie_vector_destroy(ranks, NULL);
+
+	*out = type;
+	return MIE_SUCCESS;
+}
+
+size_t mie_memref_type_get_nr_ranks(const struct mie_type *type)
+{
+	if (!mie_type_is(type, "builtin", "memref")) {
+		return 0;
+	}
+
+	const struct memref_type *memref = (const struct memref_type *)type;
+	return MIE_VECTOR_COUNT(memref->m_rank);
+}
+
+const struct mie_memref_rank *mie_memref_type_get_rank(
+	const struct mie_type *type, size_t i)
+{
+	if (!mie_type_is(type, "builtin", "memref")) {
+		return 0;
+	}
+
+	const struct memref_type *memref = (const struct memref_type *)type;
+	if (i >= MIE_VECTOR_COUNT(memref->m_rank)) {
+		return NULL;
+	}
+
+	return &memref->m_rank.items[i];
+}
+
+const struct mie_memref_rank *mie_memref_type_get_rank(
+	const struct mie_type *type, size_t i);
+
+MIE_TYPE_DEFINITION_BEGIN(mie_builtin_memref, "memref")
+	MIE_TYPE_DEFINITION_INIT(type_init);
+	MIE_TYPE_DEFINITION_STRUCT(struct memref_type);
+	MIE_TYPE_DEFINITION_PRINT(print);
+	MIE_TYPE_DEFINITION_PARSE(parse);
+MIE_TYPE_DEFINITION_END()

mie/dialect/builtin/type/string.c

@@ -1,4 +1,4 @@
-#include <blue/core/bstr.h>
+#include <fx/core/bstr.h>
 #include <mie/ctx.h>
 #include <mie/dialect/builtin.h>
 #include <mie/dialect/dialect.h>
@@ -15,7 +15,7 @@ static void type_init(
 
 static enum mie_status print(const struct mie_type *ty, struct mie_printer *out)
 {
-	b_stream_write_string(
+	fx_stream_write_string(
 		out->p_stream,
 		(out->p_flags & MIE_PRINT_F_ABBREVIATED) ? "str" : "!builtin.string",
 		NULL);

mie/dialect/cf/op/br-cond.c

@@ -1,8 +1,10 @@
+#include <mie/dialect/builtin.h>
 #include <mie/dialect/dialect.h>
 #include <mie/ir/emit.h>
 #include <mie/ir/op-definition.h>
 #include <mie/ir/op.h>
 #include <mie/macros.h>
+#include <mie/parse/parser.h>
 #include <mie/print/printer.h>
 
 static enum mie_status print(struct mie_printer *printer, const struct mie_op *op)
@@ -19,18 +21,114 @@ static enum mie_status print(struct mie_printer *printer, const struct mie_op *o
 	const struct mie_op_successor *if_true = &op->op_successors.items[0];
 	const struct mie_op_successor *if_false = &op->op_successors.items[1];
 
-	b_stream_write_char(printer->p_stream, ' ');
+	fx_stream_write_char(printer->p_stream, ' ');
 	mie_printer_print_op_arg(printer, cond, false);
-	b_stream_write_string(printer->p_stream, ", ", NULL);
+	fx_stream_write_string(printer->p_stream, ", ", NULL);
 	mie_printer_print_op_successor(printer, if_true, true);
-	b_stream_write_string(printer->p_stream, ", ", NULL);
+	fx_stream_write_string(printer->p_stream, ", ", NULL);
 	mie_printer_print_op_successor(printer, if_false, true);
 
 	return MIE_SUCCESS;
 }
 
-static enum mie_status parse(struct mie_parser *parser, struct mie_op *out)
+static bool parse_successor(struct mie_parser *ctx, struct mie_op_successor *out)
 {
+	memset(out, 0x0, sizeof *out);
+	fx_string *str = mie_parser_get_tempstr(ctx);
+	bool result = false;
+
+	if (!mie_parser_parse_blockname(ctx, str, &out->s_name_span)) {
+		mie_parser_report_unexpected_token(
+			ctx, MIE_TOK_BLOCKNAME, "branch destination");
+		return false;
+	}
+
+	out->s_block_name = fx_string_steal(str);
+
+	if (mie_parser_peek_type(ctx) == MIE_TOK_LINEFEED
+	    || mie_parser_peek_symbol(ctx) == MIE_SYM_COMMA) {
+		goto ok;
+	}
+
+	if (!mie_parser_parse_symbol(ctx, MIE_SYM_LEFT_PAREN)) {
+		struct mie_parser_item expected[] = {
+			MIE_PARSE_ITEM_TOKEN(MIE_SYM_COMMA),
+			MIE_PARSE_ITEM_TOKEN(MIE_SYM_LEFT_PAREN),
+			MIE_PARSE_ITEM_TOKEN(MIE_TOK_LINEFEED),
+			MIE_PARSE_ITEM_NONE,
+		};
+
+		mie_parser_report_unexpected_token_v(
+			ctx, expected, "branch destination/arguments");
+		goto fail;
+	}
+
+	if (!mie_parser_parse_parameter_list(
+		    ctx, true, MIE_VECTOR_REF(out->s_args),
+		    "branch successor arguments")) {
+		goto fail;
+	}
+
+	if (!mie_parser_parse_symbol(ctx, MIE_SYM_RIGHT_PAREN)) {
+		mie_parser_report_unexpected_token(
+			ctx, MIE_SYM_RIGHT_PAREN, "branch arguments");
+		goto fail;
+	}
+
+ok:
+	return true;
+
+fail:
+	if (out->s_block_name) {
+		free(out->s_block_name);
+		out->s_block_name = NULL;
+	}
+
+	if (MIE_VECTOR_MAX(out->s_args) > 0) {
+		mie_vector_destroy(out->s_args, NULL);
+	}
+
+	return false;
+}
+
+static enum mie_status parse(
+	struct mie_parser *parser, struct mie_parser_scope *scope,
+	struct mie_op *out)
+{
+	struct mie_op_arg *cond = mie_op_add_arg(out);
+	struct mie_file_span span;
+	if (!mie_parser_parse_parameter(
+		    parser, false, cond, "branch condition")) {
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (!mie_parser_parse_symbol(parser, MIE_SYM_COMMA)) {
+		mie_parser_report_unexpected_token(
+			parser, MIE_SYM_COMMA, "branch destination list");
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	struct mie_op_successor *true_branch
+		= mie_vector_emplace_back(out->op_successors, NULL);
+	if (!parse_successor(parser, true_branch)) {
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (!mie_parser_parse_symbol(parser, MIE_SYM_COMMA)) {
+		mie_parser_report_unexpected_token(
+			parser, MIE_SYM_COMMA, "branch destination list");
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	struct mie_op_successor *false_branch
+		= mie_vector_emplace_back(out->op_successors, NULL);
+	if (!parse_successor(parser, false_branch)) {
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	cond->arg_unresolved.reg_type
+		= mie_ctx_get_int_type(mie_parser_get_mie_ctx(parser), 1);
+
 	return MIE_SUCCESS;
 }
 

mie/dialect/cf/op/br.c

@@ -4,11 +4,12 @@
 #include <mie/ir/op-definition.h>
 #include <mie/ir/op.h>
 #include <mie/macros.h>
+#include <mie/parse/parser.h>
 #include <mie/print/printer.h>
 
 static enum mie_status print(struct mie_printer *printer, const struct mie_op *op)
 {
-	b_stream_write_char(printer->p_stream, ' ');
+	fx_stream_write_char(printer->p_stream, ' ');
 	const struct mie_op_successor *successor = &op->op_successors.items[0];
 
 	mie_printer_print_op_successor(printer, successor, true);
@@ -16,8 +17,78 @@ static enum mie_status print(struct mie_printer *printer, const struct mie_op *o
 	return MIE_SUCCESS;
 }
 
-static enum mie_status parse(struct mie_parser *parser, struct mie_op *out)
+static bool parse_successor(struct mie_parser *ctx, struct mie_op_successor *out)
 {
+	memset(out, 0x0, sizeof *out);
+	fx_string *str = mie_parser_get_tempstr(ctx);
+	bool result = false;
+
+	if (!mie_parser_parse_blockname(ctx, str, &out->s_name_span)) {
+		mie_parser_report_unexpected_token(
+			ctx, MIE_TOK_BLOCKNAME, "branch destination");
+		return false;
+	}
+
+	out->s_block_name = fx_string_steal(str);
+
+	if (mie_parser_peek_type(ctx) == MIE_TOK_LINEFEED) {
+		goto ok;
+	}
+
+	if (!mie_parser_parse_symbol(ctx, MIE_SYM_LEFT_PAREN)) {
+		struct mie_parser_item expected[] = {
+			MIE_PARSE_ITEM_TOKEN(MIE_TOK_LINEFEED),
+			MIE_PARSE_ITEM_TOKEN(MIE_SYM_LEFT_PAREN),
+			MIE_PARSE_ITEM_NONE,
+		};
+
+		mie_parser_report_unexpected_token_v(
+			ctx, expected, "branch destination/arguments");
+		goto fail;
+	}
+
+	if (!mie_parser_parse_parameter_list(
+		    ctx, true, MIE_VECTOR_REF(out->s_args),
+		    "branch successor arguments")) {
+		goto fail;
+	}
+
+	if (!mie_parser_parse_symbol(ctx, MIE_SYM_RIGHT_PAREN)) {
+		mie_parser_report_unexpected_token(
+			ctx, MIE_SYM_RIGHT_PAREN, "branch arguments");
+		goto fail;
+	}
+
+ok:
+	return true;
+
+fail:
+	if (out->s_block_name) {
+		free(out->s_block_name);
+		out->s_block_name = NULL;
+	}
+
+	if (MIE_VECTOR_MAX(out->s_args) > 0) {
+		mie_vector_destroy(out->s_args, NULL);
+	}
+
+	return false;
+}
+
+static enum mie_status parse(
+	struct mie_parser *parser, struct mie_parser_scope *scope,
+	struct mie_op *out)
+{
+	struct mie_op_successor *s
+		= mie_vector_emplace_back(out->op_successors, NULL);
+	if (!s) {
+		return MIE_ERR_NO_MEMORY;
+	}
+
+	if (!parse_successor(parser, s)) {
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
 	return MIE_SUCCESS;
 }
 

mie/dialect/dialect.c

@@ -1,4 +1,4 @@
-#include <blue/ds/string.h>
+#include <fx/ds/string.h>
 #include <mie/ctx.h>
 #include <mie/dialect/dialect.h>
 #include <mie/ir/op-definition.h>
@@ -37,7 +37,7 @@ struct mie_dialect *mie_dialect_create(
 
 	memset(out, 0x0, size);
 
-	out->d_name = b_strdup(name);
+	out->d_name = fx_strdup(name);
 	if (!out->d_name) {
 		free(out);
 		return NULL;
@@ -58,7 +58,7 @@ struct mie_dialect *mie_dialect_create(
 	mie_id interface_ns = INTERFACE_NS_ID;
 	mie_id_map_init(&out->d_interfaces, &interface_ns);
 
-	b_rope name_rope = B_ROPE_CSTR(name);
+	fx_rope name_rope = FX_ROPE_CSTR(name);
 	mie_id_map_put(&ctx->ctx_dialects, &out->d_id, &name_rope);
 
 	return out;
@@ -67,21 +67,21 @@ struct mie_dialect *mie_dialect_create(
 const struct mie_op_definition *mie_dialect_get_op(
 	const struct mie_dialect *dialect, const char *name)
 {
-	b_rope name_rope = B_ROPE_CSTR(name);
+	fx_rope name_rope = FX_ROPE_CSTR(name);
 	mie_id id;
 	mie_id_init_ns(&id, mie_id_map_get_ns(&dialect->d_ops), &name_rope);
 
 	mie_id *target = mie_id_map_get(&dialect->d_ops, &id);
-	return b_unbox(struct mie_op_definition, target, op_id);
+	return fx_unbox(struct mie_op_definition, target, op_id);
 }
 
 const struct mie_type_definition *mie_dialect_get_type(
 	const struct mie_dialect *dialect, const char *name)
 {
-	b_rope name_rope = B_ROPE_CSTR(name);
+	fx_rope name_rope = FX_ROPE_CSTR(name);
 	mie_id id;
 	mie_id_init_ns(&id, mie_id_map_get_ns(&dialect->d_types), &name_rope);
 
 	mie_id *target = mie_id_map_get(&dialect->d_types, &id);
-	return b_unbox(struct mie_type_definition, target, ty_id);
+	return fx_unbox(struct mie_type_definition, target, ty_id);
 }

mie/dialect/func/op/func.c

@@ -1,5 +1,6 @@
 #include <mie/attribute/attribute-map.h>
 #include <mie/ctx.h>
+#include <mie/diag/diag.h>
 #include <mie/dialect/builtin.h>
 #include <mie/dialect/dialect.h>
 #include <mie/dialect/func.h>
@@ -11,6 +12,7 @@
 #include <mie/ir/op.h>
 #include <mie/ir/region.h>
 #include <mie/macros.h>
+#include <mie/parse/parser.h>
 #include <mie/print/printer.h>
 #include <mie/type/function.h>
 
@@ -26,14 +28,14 @@ static enum mie_status print(struct mie_printer *printer, const struct mie_op *o
 	const struct mie_function_type *function_ty
 		= (const struct mie_function_type *)function_type_g;
 
-	b_stream_write_fmt(printer->p_stream, NULL, " @%s(", sym_name_cstr);
+	fx_stream_write_fmt(printer->p_stream, NULL, " @%s(", sym_name_cstr);
 
 	const struct mie_region *code = mie_op_get_first_region(op);
 	const struct mie_block *entry = mie_region_get_first_block(code);
 
 	for (size_t i = 0; i < MIE_VECTOR_COUNT(entry->b_params); i++) {
 		if (i > 0) {
-			b_stream_write_string(printer->p_stream, ", ", NULL);
+			fx_stream_write_string(printer->p_stream, ", ", NULL);
 		}
 
 		const struct mie_register *param = &entry->b_params.items[i];
@@ -41,15 +43,15 @@ static enum mie_status print(struct mie_printer *printer, const struct mie_op *o
 		mie_printer_print_register(printer, param, MIE_PRINT_F_INCLUDE_TYPE);
 	}
 
-	b_stream_write_string(printer->p_stream, ") -> ", NULL);
+	fx_stream_write_string(printer->p_stream, ") -> ", NULL);
 
 	if (MIE_VECTOR_COUNT(function_ty->func_out) != 1) {
-		b_stream_write_char(printer->p_stream, '(');
+		fx_stream_write_char(printer->p_stream, '(');
 	}
 
 	for (size_t i = 0; i < MIE_VECTOR_COUNT(function_ty->func_out); i++) {
 		if (i > 0) {
-			b_stream_write_string(printer->p_stream, ", ", NULL);
+			fx_stream_write_string(printer->p_stream, ", ", NULL);
 		}
 
 		const struct mie_type *ty = function_ty->func_out.items[i];
@@ -58,10 +60,10 @@ static enum mie_status print(struct mie_printer *printer, const struct mie_op *o
 	}
 
 	if (MIE_VECTOR_COUNT(function_ty->func_out) != 1) {
-		b_stream_write_char(printer->p_stream, ')');
+		fx_stream_write_char(printer->p_stream, ')');
 	}
 
-	b_stream_write_char(printer->p_stream, ' ');
+	fx_stream_write_char(printer->p_stream, ' ');
 
 	mie_printer_print_region(
 		printer, code, MIE_PRINT_F_EXCLUDE_FIRST_BLOCK_HEADER);
@@ -69,8 +71,126 @@ static enum mie_status print(struct mie_printer *printer, const struct mie_op *o
 	return MIE_SUCCESS;
 }
 
-static enum mie_status parse(struct mie_parser *parser, struct mie_op *out)
+static enum mie_status parse_return_type(
+	struct mie_parser *parser,
+	MIE_VECTOR_REF_PARAM(const struct mie_type *, out))
 {
+	bool ok = true;
+	if (mie_parser_peek_symbol(parser) == MIE_SYM_LEFT_PAREN) {
+		ok = mie_parser_parse_type_list(
+			parser, "function return type", MIE_VECTOR_REF2(out), NULL);
+	} else {
+		const struct mie_type *tmp;
+		ok = mie_parser_parse_type(
+			parser, "function return type", &tmp, NULL);
+
+		if (ok) {
+			mie_vector_ref_push_back(out, &tmp, NULL);
+		}
+	}
+
+	return ok ? MIE_SUCCESS : MIE_ERR_BAD_SYNTAX;
+}
+
+static enum mie_status parse(
+	struct mie_parser *parser, struct mie_parser_scope *scope,
+	struct mie_op *out)
+{
+	if (!scope) {
+		struct mie_diag *diag = mie_parser_report_error_simple(
+			parser, "builtin", MIE_BUILTIN_E_OP_REQUIRES_PARENT_SCOPE,
+			MIE_BUILTIN_MSG_OP_REQUIRES_PARENT_SCOPE,
+			&out->op_name_span);
+		mie_diag_push_msg(
+			diag, mie_parser_get_mie_ctx(parser), "builtin",
+			MIE_BUILTIN_MSG_OP_PARENT_SCOPE_EXAMPLE);
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	fx_string *temp = mie_parser_get_tempstr(parser);
+	if (!mie_parser_parse_symname(parser, temp, NULL)) {
+		mie_parser_report_unexpected_token(
+			parser, MIE_TOK_SYMNAME, "function signature");
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	struct mie_attribute *sym_name = mie_ctx_get_string(
+		mie_parser_get_mie_ctx(parser), fx_string_ptr(temp));
+
+	if (!mie_parser_parse_symbol(parser, MIE_SYM_LEFT_PAREN)) {
+		mie_parser_report_unexpected_token(
+			parser, MIE_SYM_LEFT_PAREN, "function parameter list");
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	MIE_VECTOR_DEFINE(struct mie_op_arg, block_params);
+	MIE_VECTOR_DEFINE(const struct mie_type *, in_types);
+	MIE_VECTOR_DEFINE(const struct mie_type *, out_types);
+
+	if (!mie_parser_parse_parameter_list(
+		    parser, true, MIE_VECTOR_REF(block_params),
+		    "function parameter list")) {
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (!mie_parser_parse_symbol(parser, MIE_SYM_RIGHT_PAREN)) {
+		mie_parser_report_unexpected_token(
+			parser, MIE_SYM_LEFT_PAREN, "function parameter list");
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	struct mie_region *body = mie_op_add_region(out);
+	struct mie_block *entry = mie_region_add_block(body);
+
+	for (size_t i = 0; i < MIE_VECTOR_COUNT(block_params); i++) {
+		struct mie_register *param_reg = mie_vector_emplace_back(
+			entry->b_params, &mie_register_vector_ops);
+
+		param_reg->reg_flags = block_params.items[i].arg_unresolved.reg_flags
+		                     | MIE_REGISTER_F_BLOCK_PARAM;
+		param_reg->reg_type = block_params.items[i].arg_unresolved.reg_type;
+		param_reg->reg_block = entry;
+		if (!mie_parser_scope_put_name(
+			    scope, &param_reg->reg_name,
+			    block_params.items[i].arg_unresolved.reg_name,
+			    MIE_NAME_MAP_F_STRICT)) {
+			return false;
+		}
+
+		mie_vector_push_back(in_types, &param_reg->reg_type, NULL);
+	}
+
+	if (!mie_parser_parse_symbol(parser, MIE_SYM_HYPHEN_RIGHT_ANGLE)) {
+		mie_parser_report_unexpected_token(
+			parser, MIE_SYM_HYPHEN_RIGHT_ANGLE,
+			"function signature");
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (parse_return_type(parser, MIE_VECTOR_REF(out_types)) != MIE_SUCCESS) {
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	const struct mie_type *func_type = mie_ctx_get_function_type(
+		mie_parser_get_mie_ctx(parser), in_types.items, in_types.count,
+		out_types.items, out_types.count);
+
+	mie_vector_destroy(in_types, NULL);
+	mie_vector_destroy(out_types, NULL);
+
+	struct mie_attribute *function_type
+		= mie_type_attr_create(mie_parser_get_mie_ctx(parser), func_type);
+
+	mie_attribute_map_put(
+		&out->op_attrib, "sym_name", sym_name, MIE_ATTRMAP_F_REPLACE);
+	mie_attribute_map_put(
+		&out->op_attrib, "function_type", function_type,
+		MIE_ATTRMAP_F_REPLACE);
+
+	if (!mie_parser_parse_region(parser, out, body, entry)) {
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
 	return MIE_SUCCESS;
 }
 

mie/dialect/func/op/return.c

@@ -9,26 +9,27 @@
 #include <mie/ir/op.h>
 #include <mie/ir/region.h>
 #include <mie/macros.h>
+#include <mie/parse/parser.h>
 #include <mie/print/printer.h>
 #include <mie/type/function.h>
 
 static enum mie_status print(struct mie_printer *printer, const struct mie_op *op)
 {
-	b_stream_write_char(printer->p_stream, ' ');
+	fx_stream_write_char(printer->p_stream, ' ');
 
 	for (size_t i = 0; i < MIE_VECTOR_COUNT(op->op_args); i++) {
 		if (i > 0) {
-			b_stream_write_string(printer->p_stream, ", ", NULL);
+			fx_stream_write_string(printer->p_stream, ", ", NULL);
 		}
 
 		mie_printer_print_op_arg(printer, &op->op_args.items[i], false);
 	}
 
-	b_stream_write_string(printer->p_stream, " : ", NULL);
+	fx_stream_write_string(printer->p_stream, " : ", NULL);
 
 	for (size_t i = 0; i < MIE_VECTOR_COUNT(op->op_args); i++) {
 		if (i > 0) {
-			b_stream_write_string(printer->p_stream, ", ", NULL);
+			fx_stream_write_string(printer->p_stream, ", ", NULL);
 		}
 
 		mie_printer_print_type(
@@ -38,8 +39,81 @@ static enum mie_status print(struct mie_printer *printer, const struct mie_op *o
 	return MIE_SUCCESS;
 }
 
-static enum mie_status parse(struct mie_parser *parser, struct mie_op *out)
+static enum mie_status parse(
+	struct mie_parser *parser, struct mie_parser_scope *scope,
+	struct mie_op *out)
 {
+	if (!mie_parser_parse_parameter_list(
+		    parser, false, MIE_VECTOR_REF(out->op_args),
+		    "function return values")) {
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (!mie_parser_parse_symbol(parser, MIE_SYM_COLON)) {
+		mie_parser_report_unexpected_token(
+			parser, MIE_SYM_COLON, "function return type");
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	MIE_VECTOR_DEFINE(const struct mie_type *, types);
+	const struct mie_type *tmp = NULL;
+	struct mie_file_span first_span, last_span;
+
+	if (!mie_parser_parse_type(
+		    parser, "function return type", &tmp, &first_span)) {
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	mie_vector_push_back(types, &tmp, NULL);
+	bool ok = true;
+
+	while (1) {
+		if (mie_parser_peek_type(parser) == MIE_TOK_LINEFEED) {
+			break;
+		}
+
+		if (!mie_parser_parse_symbol(parser, MIE_SYM_COMMA)) {
+			struct mie_parser_item expected[] = {
+				MIE_PARSE_ITEM_TOKEN(MIE_SYM_COMMA),
+				MIE_PARSE_ITEM_TOKEN(MIE_TOK_LINEFEED),
+				MIE_PARSE_ITEM_NONE,
+			};
+
+			mie_parser_report_unexpected_token_v(
+				parser, expected, "function return type list");
+			ok = false;
+			break;
+		}
+
+		if (!mie_parser_parse_type(
+			    parser, "function return type", &tmp, &last_span)) {
+			ok = false;
+			break;
+		}
+
+		mie_vector_push_back(types, &tmp, NULL);
+	}
+
+	if (!ok) {
+		mie_vector_destroy(types, NULL);
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (MIE_VECTOR_COUNT(types) != MIE_VECTOR_COUNT(out->op_args)) {
+		struct mie_file_span span = {
+			.s_start = first_span.s_start,
+			.s_end = last_span.s_end,
+		};
+		mie_parser_report_error_simple(
+			parser, "builtin", MIE_BUILTIN_E_INCORRECT_NUMBER_OF_TYPES,
+			MIE_BUILTIN_MSG_OP_NR_TYPES_DOESNT_MATCH_NR_ARGS, &span);
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	for (size_t i = 0; i < MIE_VECTOR_COUNT(types); i++) {
+		out->op_args.items[i].arg_unresolved.reg_type = types.items[i];
+	}
+
 	return MIE_SUCCESS;
 }
 

mie/dialect/memref/diag.c

@@ -0,0 +1,27 @@
+#include <mie/diag/class.h>
+#include <mie/diag/msg.h>
+#include <mie/dialect/memref.h>
+#include <mie/macros.h>
+
+#define MIE_DIAG_CLASS_PREFIX MIE_MEMREF_E
+#define MIE_DIAG_MSG_PREFIX   MIE_MEMREF_MSG
+
+MIE_DIAG_CLASS_LIST_BEGIN(mie_memref_diag)
+MIE_DIAG_CLASS_LIST_END(mie_memref_diag)
+
+MIE_DIAG_MSG_LIST_BEGIN(mie_memref_msg)
+	MIE_DIAG_MSG(
+		OP_EXPECTS_MEMREF_ARGUMENT,
+		"this operation requires a memref parameter.")
+	MIE_DIAG_MSG(
+		LAST_MEMREF_RANK_MUST_BE_TYPE,
+		"the last rank of a memref type must be a type.")
+	MIE_DIAG_MSG(
+		MEMREF_MUST_HAVE_AT_LEAST_ONE_RANK,
+		"memref type must have at least one rank.")
+	MIE_DIAG_MSG(
+		OP_RESULT_DETERMINED_BY_LAST_MEMREF_RANK,
+		"the number and type of operation results is determined by "
+	        "[blue]the "
+		"type of the last memref rank[reset].")
+MIE_DIAG_MSG_LIST_END(mie_memref_msg)

mie/dialect/memref/memref.c

@@ -1,3 +1,5 @@
+#include <mie/diag/class.h>
+#include <mie/diag/msg.h>
 #include <mie/dialect/dialect.h>
 #include <mie/dialect/memref.h>
 #include <mie/macros.h>
@@ -5,7 +7,11 @@
 #include <mie/type/type-definition.h>
 #include <mie/type/type.h>
 
+MIE_DIAG_CLASS_LIST_EXTERN(mie_memref_diag);
+MIE_DIAG_MSG_LIST_EXTERN(mie_memref_msg);
+
 MIE_DIALECT_BEGIN(mie_memref, struct mie_dialect, "memref")
-	MIE_DIALECT_ADD_TYPE(mie_memref_memref);
+	MIE_DIALECT_DIAG_CLASS_LIST(mie_memref_diag);
+	MIE_DIALECT_DIAG_MSG_LIST(mie_memref_msg);
 	MIE_DIALECT_ADD_OP(mie_memref_load);
 MIE_DIALECT_END()

mie/dialect/memref/op/load.c

@@ -1,14 +1,210 @@
 #include <mie/ctx.h>
+#include <mie/diag/diag.h>
+#include <mie/diag/highlight.h>
+#include <mie/dialect/builtin.h>
+#include <mie/dialect/memref.h>
 #include <mie/ir/op-definition.h>
+#include <mie/ir/op.h>
 #include <mie/macros.h>
+#include <mie/parse/parser.h>
+#include <mie/print/printer.h>
+#include <mie/type/storage.h>
+#include <mie/type/type.h>
 
 static enum mie_status print(struct mie_printer *printer, const struct mie_op *op)
 {
+	fx_stream_write_char(printer->p_stream, ' ');
+	const struct mie_type *memref_type = NULL;
+	if (MIE_VECTOR_COUNT(op->op_args) > 0) {
+		mie_printer_print_op_arg(printer, &op->op_args.items[0], false);
+		memref_type = mie_op_arg_get_type(&op->op_args.items[0]);
+	}
+
+	fx_stream_write_char(printer->p_stream, '[');
+
+	for (size_t i = 1; i < MIE_VECTOR_COUNT(op->op_args); i++) {
+		if (i > 1) {
+			fx_stream_write_string(printer->p_stream, ", ", NULL);
+		}
+
+		mie_printer_print_op_arg(printer, &op->op_args.items[i], false);
+	}
+	fx_stream_write_char(printer->p_stream, ']');
+
+	if (memref_type) {
+		fx_stream_write_string(printer->p_stream, " : ", NULL);
+		mie_printer_print_type(printer, memref_type);
+	}
+
 	return MIE_SUCCESS;
 }
 
-static enum mie_status parse(struct mie_parser *parser, struct mie_op *out)
+static bool parse_param_name(
+	struct mie_parser *ctx, struct mie_op_arg *out, const char *context)
 {
+	memset(out, 0x0, sizeof *out);
+	fx_string *str = mie_parser_get_tempstr(ctx);
+
+	struct mie_file_span loc;
+	if (mie_parser_parse_vregname(ctx, str, &loc)) {
+		out->arg_unresolved.reg_name = fx_string_steal(str);
+		out->arg_unresolved.reg_flags = MIE_REGISTER_F_VIRTUAL;
+	} else if (mie_parser_parse_mregname(ctx, str, &loc)) {
+		out->arg_unresolved.reg_name = fx_string_steal(str);
+		out->arg_unresolved.reg_flags = MIE_REGISTER_F_MACHINE;
+	} else {
+		struct mie_parser_item required[] = {
+			MIE_PARSE_ITEM_TOKEN(MIE_TOK_VREGNAME),
+			MIE_PARSE_ITEM_TOKEN(MIE_TOK_MREGNAME),
+			MIE_PARSE_ITEM_NONE,
+		};
+		mie_parser_report_unexpected_token_v(ctx, required, context);
+		return false;
+	}
+
+	out->arg_span = loc;
+
+	return true;
+}
+
+static bool apply_op_result_types(
+	const struct mie_op *op, const struct mie_type *result_type)
+{
+	size_t nr_results = 0;
+	if (!mie_type_is_storage(result_type)) {
+		if (MIE_VECTOR_COUNT(op->op_result) != 1) {
+			return false;
+		}
+
+		op->op_result.items[0].reg_type = result_type;
+		return true;
+	}
+
+	const struct mie_storage_type *storage
+		= (const struct mie_storage_type *)result_type;
+	nr_results = mie_storage_type_get_nr_parts(storage);
+
+	if (MIE_VECTOR_COUNT(op->op_result) != nr_results) {
+		return false;
+	}
+
+	for (size_t i = 0; i < nr_results; i++) {
+		op->op_result.items[i].reg_type = storage->st_parts.items[i];
+	}
+
+	return true;
+}
+
+static enum mie_status parse(
+	struct mie_parser *parser, struct mie_parser_scope *scope,
+	struct mie_op *out)
+{
+	struct mie_op_arg *buf_arg = mie_op_add_arg(out);
+	if (!mie_parser_parse_parameter(
+		    parser, false, buf_arg, "memref load source")) {
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (!mie_parser_parse_symbol(parser, MIE_SYM_LEFT_BRACKET)) {
+		mie_parser_report_unexpected_token(
+			parser, MIE_SYM_LEFT_BRACKET, "memref load index list");
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (!mie_parser_parse_parameter_list(
+		    parser, false, MIE_VECTOR_REF(out->op_args),
+		    "memref load index")) {
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+#if 0
+	while (1) {
+		if (mie_parser_parse_symbol(parser, MIE_SYM_RIGHT_BRACKET)) {
+			break;
+		}
+
+		if (!mie_parser_parse_symbol(parser, MIE_SYM_COMMA)) {
+			unsigned int expected[] = {
+				MIE_SYM_COMMA,
+				MIE_SYM_RIGHT_BRACKET,
+				MIE_TOK_NONE,
+			};
+			mie_parser_report_unexpected_token_v(
+				parser, expected, "memref load index list");
+			return MIE_ERR_BAD_SYNTAX;
+		}
+
+		struct mie_op_arg *index_arg = mie_op_add_arg(out);
+		if (!parse_param_name(parser, index_arg, "memref load index")) {
+			return MIE_ERR_BAD_SYNTAX;
+		}
+	}
+#endif
+
+	if (!mie_parser_parse_symbol(parser, MIE_SYM_RIGHT_BRACKET)) {
+		mie_parser_report_unexpected_token(
+			parser, MIE_SYM_RIGHT_BRACKET, "memref load index list");
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (!mie_parser_parse_symbol(parser, MIE_SYM_COLON)) {
+		mie_parser_report_unexpected_token(
+			parser, MIE_SYM_COLON, "memref type");
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	const struct mie_type *type = NULL;
+	struct mie_file_span type_span;
+	if (!mie_parser_parse_type(parser, "memref type", &type, &type_span)) {
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (!mie_type_is(type, "builtin", "memref")) {
+		mie_parser_report_error_simple(
+			parser, "builtin", MIE_BUILTIN_E_INCORRECT_TYPE,
+			MIE_MEMREF_MSG_OP_EXPECTS_MEMREF_ARGUMENT, &type_span);
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	size_t nr_ranks = mie_memref_type_get_nr_ranks(type);
+	if (!nr_ranks) {
+		mie_parser_report_error_simple(
+			parser, "builtin", MIE_BUILTIN_E_INVALID_TYPE,
+			MIE_MEMREF_MSG_MEMREF_MUST_HAVE_AT_LEAST_ONE_RANK,
+			&type_span);
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	const struct mie_memref_rank *type_rank
+		= mie_memref_type_get_rank(type, nr_ranks - 1);
+	if (type_rank->r_ranktype != MIE_MEMREF_RANK_TYPE) {
+		mie_parser_report_error_simple(
+			parser, "builtin", MIE_BUILTIN_E_INVALID_TYPE,
+			MIE_MEMREF_MSG_LAST_MEMREF_RANK_MUST_BE_TYPE,
+			&type_rank->r_span);
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (!apply_op_result_types(out, type_rank->r_type)) {
+		struct mie_file_span results_span;
+		mie_op_get_results_span(out, &results_span);
+		struct mie_diag *diag = mie_parser_report_error_simple(
+			parser, "builtin",
+			MIE_BUILTIN_E_INCORRECT_NUMBER_OF_RESULTS,
+			MIE_BUILTIN_MSG_NR_RESULT_NAME_OUTPUT_MISMATCH,
+			&results_span);
+		mie_diag_push_msg(
+			diag, mie_parser_get_mie_ctx(parser), "memref",
+			MIE_MEMREF_MSG_OP_RESULT_DETERMINED_BY_LAST_MEMREF_RANK);
+		struct mie_diag_highlight hl[] = {
+			MIE_DIAG_HL(HINT, type_rank->r_span),
+		};
+		mie_diag_push_snippet(
+			diag, type_rank->r_span.s_start.c_row,
+			type_rank->r_span.s_end.c_row, NULL, 0, hl, 1);
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
 	return MIE_SUCCESS;
 }
 

mie/dialect/memref/type/memref.c

@@ -1,52 +0,0 @@
-#include <mie/dialect/dialect.h>
-#include <mie/dialect/memref.h>
-#include <mie/macros.h>
-#include <mie/print/printer.h>
-#include <mie/type/type-definition.h>
-#include <mie/type/type.h>
-
-enum memref_rank_type {
-	MEMREF_RANK_UNKNOWN = 0,
-	MEMREF_RANK_STATIC,
-	MEMREF_RANK_TYPE,
-};
-
-struct memref_rank {
-	enum memref_rank_type r_ranktype;
-	union {
-		size_t r_static;
-		const struct mie_type *r_type;
-	};
-};
-
-struct memref_type {
-	struct mie_type m_base;
-	MIE_VECTOR_DECLARE(struct memref_rank, m_rank);
-};
-
-static void type_init(
-	const struct mie_type_definition *type_info, struct mie_type *type)
-{
-}
-
-static enum mie_status print(const struct mie_type *ty, struct mie_printer *out)
-{
-	b_stream_write_string(
-		out->p_stream,
-		(out->p_flags & MIE_PRINT_F_ABBREVIATED) ? "memref" : "memref.memref",
-		NULL);
-	return MIE_SUCCESS;
-}
-
-static enum mie_status parse(struct mie_parser *parser, const struct mie_type **out)
-{
-	printf("Parse memref!\n");
-
-	return MIE_ERR_BAD_FORMAT;
-}
-
-MIE_TYPE_DEFINITION_BEGIN(mie_memref_memref, "memref")
-	MIE_TYPE_DEFINITION_INIT(type_init);
-	MIE_TYPE_DEFINITION_PRINT(print);
-	MIE_TYPE_DEFINITION_PARSE(parse);
-MIE_TYPE_DEFINITION_END()

mie/dialect/meta/op/source-filename.c

@@ -7,7 +7,9 @@ static enum mie_status print(struct mie_printer *printer, const struct mie_op *o
 	return MIE_SUCCESS;
 }
 
-static enum mie_status parse(struct mie_parser *parser, struct mie_op *out)
+static enum mie_status parse(
+	struct mie_parser *parser, struct mie_parser_scope *scope,
+	struct mie_op *out)
 {
 	return MIE_SUCCESS;
 }

mie/dialect/ptr/op/load.c

@@ -7,7 +7,9 @@ static enum mie_status print(struct mie_printer *printer, const struct mie_op *o
 	return MIE_SUCCESS;
 }
 
-static enum mie_status parse(struct mie_parser *parser, struct mie_op *out)
+static enum mie_status parse(
+	struct mie_parser *parser, struct mie_parser_scope *scope,
+	struct mie_op *out)
 {
 	return MIE_SUCCESS;
 }

mie/dialect/ptr/op/store.c

@@ -7,7 +7,9 @@ static enum mie_status print(struct mie_printer *printer, const struct mie_op *o
 	return MIE_SUCCESS;
 }
 
-static enum mie_status parse(struct mie_parser *parser, struct mie_op *out)
+static enum mie_status parse(
+	struct mie_parser *parser, struct mie_parser_scope *names,
+	struct mie_op *out)
 {
 	return MIE_SUCCESS;
 }

mie/dialect/scf/op/for.c

@@ -1,14 +1,281 @@
+#include <mie/ctx.h>
+#include <mie/dialect/builtin.h>
 #include <mie/dialect/dialect.h>
+#include <mie/ir/block.h>
 #include <mie/ir/op-definition.h>
+#include <mie/ir/op.h>
+#include <mie/ir/region.h>
 #include <mie/macros.h>
+#include <mie/parse/parser.h>
+#include <mie/print/printer.h>
+#include <mie/type/function.h>
+#include <mie/type/storage.h>
 
 static enum mie_status print(struct mie_printer *printer, const struct mie_op *op)
 {
+	struct mie_region *body = mie_op_get_first_region(op);
+	struct mie_block *entry = NULL;
+	struct mie_register *iv = NULL;
+	struct mie_op_arg *lb = NULL, *ub = NULL, *step = NULL;
+
+	if (!body) {
+		return MIE_ERR_BAD_STATE;
+	}
+
+	entry = mie_region_get_first_block(body);
+	if (!entry) {
+		return MIE_ERR_BAD_STATE;
+	}
+
+	if (MIE_VECTOR_COUNT(op->op_args) < 3) {
+		return MIE_ERR_BAD_STATE;
+	}
+
+	if (MIE_VECTOR_COUNT(entry->b_params) < 1) {
+		return MIE_ERR_BAD_STATE;
+	}
+
+	iv = &entry->b_params.items[0];
+	lb = &op->op_args.items[0];
+	ub = &op->op_args.items[1];
+	step = &op->op_args.items[2];
+
+	fx_stream_write_char(printer->p_stream, ' ');
+	mie_printer_print_register(printer, iv, 0);
+	fx_stream_write_string(printer->p_stream, " = ", NULL);
+	mie_printer_print_op_arg(printer, lb, 0);
+	fx_stream_write_string(printer->p_stream, " to ", NULL);
+	mie_printer_print_op_arg(printer, ub, 0);
+	fx_stream_write_string(printer->p_stream, " step ", NULL);
+	mie_printer_print_op_arg(printer, step, 0);
+
+	if (MIE_VECTOR_COUNT(entry->b_params) > 1) {
+		fx_stream_write_string(printer->p_stream, " iter-args(", NULL);
+		for (size_t i = 1; i < MIE_VECTOR_COUNT(entry->b_params); i++) {
+			if (i > 1) {
+				fx_stream_write_string(printer->p_stream, ", ", NULL);
+			}
+
+			mie_printer_print_register(
+				printer, &entry->b_params.items[i], 0);
+			fx_stream_write_string(printer->p_stream, " = ", NULL);
+			mie_printer_print_op_arg(
+				printer, &op->op_args.items[i + 2], false);
+		}
+		fx_stream_write_char(printer->p_stream, ')');
+	}
+
+	if (MIE_VECTOR_COUNT(op->op_result) > 0) {
+		fx_stream_write_string(printer->p_stream, " -> ", NULL);
+		if (MIE_VECTOR_COUNT(op->op_result) > 1) {
+			fx_stream_write_char(printer->p_stream, '(');
+		}
+
+		for (size_t i = 0; i < MIE_VECTOR_COUNT(op->op_result); i++) {
+			mie_printer_print_type(
+				printer, op->op_result.items[i].reg_type);
+		}
+
+		if (MIE_VECTOR_COUNT(op->op_result) > 1) {
+			fx_stream_write_char(printer->p_stream, ')');
+		}
+	}
+
+	fx_stream_write_char(printer->p_stream, ' ');
+	mie_printer_print_region(
+		printer, body, MIE_PRINT_F_EXCLUDE_FIRST_BLOCK_HEADER);
+
 	return MIE_SUCCESS;
 }
 
-static enum mie_status parse(struct mie_parser *parser, struct mie_op *out)
+static bool parse_result_type(
+	struct mie_parser *parser, struct mie_parser_scope *scope,
+	struct mie_op *out, struct mie_block *entry)
 {
+	const struct mie_type *type = NULL;
+	struct mie_file_span span;
+	if (!mie_parser_parse_type(parser, "loop result type", &type, &span)) {
+		return false;
+	}
+
+	const struct mie_type **types;
+	size_t nr_types;
+
+	if (mie_type_is_storage(type)) {
+		const struct mie_storage_type *storage
+			= (const struct mie_storage_type *)type;
+
+		types = storage->st_parts.items;
+		nr_types = storage->st_parts.count;
+	} else if (!mie_type_is_function(type)) {
+		types = &type;
+		nr_types = 1;
+	} else {
+		mie_parser_report_error_simple(
+			parser, "builtin", MIE_BUILTIN_E_INVALID_TYPE,
+			MIE_BUILTIN_MSG_CANNOT_USE_FUNCTION_TYPE_HERE, &span);
+	}
+
+	if (MIE_VECTOR_COUNT(out->op_result) != nr_types) {
+		mie_parser_report_error_simple(
+			parser, "builtin", MIE_BUILTIN_E_INCORRECT_NUMBER_OF_TYPES,
+			MIE_BUILTIN_MSG_OP_NR_TYPES_DOESNT_MATCH_NR_RESULTS,
+			&span);
+		return false;
+	}
+
+	for (size_t i = 0; i < nr_types; i++) {
+		out->op_result.items[i].reg_type = types[i];
+	}
+
+	return true;
+}
+
+static bool parse_iter_arg(
+	struct mie_parser *parser, struct mie_parser_scope *scope,
+	struct mie_op *out, struct mie_block *entry)
+{
+	struct mie_register *reg = mie_block_add_param(entry);
+	struct mie_op_arg *arg = mie_op_add_arg(out);
+
+	if (!mie_parser_parse_register(
+		    parser, scope, "iterator parameter name", reg)) {
+		return false;
+	}
+
+	if (!mie_parser_parse_symbol(parser, MIE_SYM_EQUAL)) {
+		mie_parser_report_unexpected_token(
+			parser, MIE_SYM_EQUAL, "iterator parameter");
+		return false;
+	}
+
+	if (!mie_parser_parse_parameter(
+		    parser, false, arg, "iterator parameter value")) {
+		return false;
+	}
+
+	struct mie_register *value = mie_parser_scope_find_value(
+		scope, arg->arg_unresolved.reg_name);
+	if (value) {
+		reg->reg_type = value->reg_type;
+	}
+
+	return true;
+}
+
+static bool parse_iter_args(
+	struct mie_parser *parser, struct mie_parser_scope *scope,
+	struct mie_op *out, struct mie_block *entry)
+{
+	if (!mie_parser_parse_keyword(parser, "iter-args", NULL)) {
+		return true;
+	}
+
+	if (!mie_parser_parse_symbol(parser, MIE_SYM_LEFT_PAREN)) {
+		mie_parser_report_unexpected_token(
+			parser, MIE_SYM_LEFT_PAREN, "iterator parameter list");
+		return false;
+	}
+
+	if (!parse_iter_arg(parser, scope, out, entry)) {
+		return false;
+	}
+
+	while (1) {
+		if (mie_parser_parse_symbol(parser, MIE_SYM_RIGHT_PAREN)) {
+			break;
+		}
+
+		if (!mie_parser_parse_symbol(parser, MIE_SYM_COMMA)) {
+			struct mie_parser_item expected[] = {
+				MIE_PARSE_ITEM_TOKEN(MIE_SYM_COMMA),
+				MIE_PARSE_ITEM_TOKEN(MIE_SYM_RIGHT_PAREN),
+				MIE_PARSE_ITEM_NONE,
+			};
+			mie_parser_report_unexpected_token_v(
+				parser, expected, "iterator parameter list");
+			return false;
+		}
+
+		if (!parse_iter_arg(parser, scope, out, entry)) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+static enum mie_status parse(
+	struct mie_parser *parser, struct mie_parser_scope *scope,
+	struct mie_op *out)
+{
+	struct mie_region *body = mie_op_add_region(out);
+	struct mie_block *entry = mie_region_add_block(body);
+	struct mie_register *iv = mie_block_add_param(entry);
+
+	mie_parser_scope_put_name(scope, &entry->b_name, "for.entry", 0);
+
+	if (!mie_parser_parse_register(parser, scope, "induction variable", iv)) {
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	iv->reg_type = mie_ctx_get_type(
+		mie_parser_get_mie_ctx(parser), "builtin", "index");
+
+	if (!mie_parser_parse_symbol(parser, MIE_SYM_EQUAL)) {
+		mie_parser_report_unexpected_token(
+			parser, MIE_SYM_EQUAL, "for-loop");
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	struct mie_op_arg *lb = mie_op_add_arg(out);
+	if (!mie_parser_parse_parameter(parser, false, lb, "lower bound")) {
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (!mie_parser_parse_keyword(parser, "to", NULL)) {
+		mie_parser_report_unexpected_token_s(parser, "to", "for-loop");
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	struct mie_op_arg *ub = mie_op_add_arg(out);
+	if (!mie_parser_parse_parameter(parser, false, ub, "upper bound")) {
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (!mie_parser_parse_keyword(parser, "step", NULL)) {
+		mie_parser_report_unexpected_token_s(parser, "step", "for-loop");
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	struct mie_op_arg *step = mie_op_add_arg(out);
+	if (!mie_parser_parse_parameter(parser, false, step, "step")) {
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (!parse_iter_args(parser, scope, out, entry)) {
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (mie_parser_parse_symbol(parser, MIE_SYM_HYPHEN_RIGHT_ANGLE)) {
+		if (!parse_result_type(parser, scope, out, entry)) {
+			return MIE_ERR_BAD_SYNTAX;
+		}
+	} else if (MIE_VECTOR_COUNT(out->op_result) > 0) {
+		struct mie_file_span span;
+		mie_op_get_results_span(out, &span);
+		mie_parser_report_error_simple(
+			parser, "builtin",
+			MIE_BUILTIN_E_INCORRECT_NUMBER_OF_RESULTS,
+			MIE_BUILTIN_MSG_OP_NR_TYPES_DOESNT_MATCH_NR_RESULTS,
+			&span);
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (!mie_parser_parse_region(parser, out, body, entry)) {
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
 	return MIE_SUCCESS;
 }
 

mie/dialect/scf/op/if.c

@@ -8,30 +8,30 @@
 
 static enum mie_status print(struct mie_printer *printer, const struct mie_op *op)
 {
-	b_stream_write_char(printer->p_stream, ' ');
+	fx_stream_write_char(printer->p_stream, ' ');
 	mie_printer_print_op_arg(printer, &op->op_args.items[0], false);
 
 	if (MIE_VECTOR_COUNT(op->op_result) > 0) {
-		b_stream_write_string(printer->p_stream, " -> ", NULL);
+		fx_stream_write_string(printer->p_stream, " -> ", NULL);
 
 		if (MIE_VECTOR_COUNT(op->op_result) > 1) {
-			b_stream_write_char(printer->p_stream, '(');
+			fx_stream_write_char(printer->p_stream, '(');
 		}
 	}
 
 	for (size_t i = 0; i < MIE_VECTOR_COUNT(op->op_result); i++) {
 		if (i > 0) {
-			b_stream_write_string(printer->p_stream, ", ", NULL);
+			fx_stream_write_string(printer->p_stream, ", ", NULL);
 		}
 
 		mie_printer_print_type(printer, op->op_result.items[i].reg_type);
 	}
 
 	if (MIE_VECTOR_COUNT(op->op_result) > 1) {
-		b_stream_write_char(printer->p_stream, '(');
+		fx_stream_write_char(printer->p_stream, '(');
 	}
 
-	b_stream_write_char(printer->p_stream, ' ');
+	fx_stream_write_char(printer->p_stream, ' ');
 
 	struct mie_region *if_region = mie_op_get_first_region(op);
 	struct mie_region *else_region = mie_op_get_next_region(op, if_region);
@@ -39,14 +39,16 @@ static enum mie_status print(struct mie_printer *printer, const struct mie_op *o
 	mie_printer_print_region(printer, if_region, 0);
 
 	if (else_region) {
-		b_stream_write_string(printer->p_stream, " else ", NULL);
+		fx_stream_write_string(printer->p_stream, " else ", NULL);
 		mie_printer_print_region(printer, else_region, 0);
 	}
 
 	return MIE_SUCCESS;
 }
 
-static enum mie_status parse(struct mie_parser *parser, struct mie_op *out)
+static enum mie_status parse(
+	struct mie_parser *parser, struct mie_parser_scope *names,
+	struct mie_op *out)
 {
 	return MIE_SUCCESS;
 }

mie/dialect/scf/op/yield.c

@@ -1,26 +1,28 @@
+#include <mie/dialect/builtin.h>
 #include <mie/dialect/dialect.h>
 #include <mie/ir/emit.h>
 #include <mie/ir/op-definition.h>
 #include <mie/ir/op.h>
 #include <mie/macros.h>
+#include <mie/parse/parser.h>
 #include <mie/print/printer.h>
 
 static enum mie_status print(struct mie_printer *printer, const struct mie_op *op)
 {
-	b_stream_write_char(printer->p_stream, ' ');
+	fx_stream_write_char(printer->p_stream, ' ');
 	for (size_t i = 0; i < MIE_VECTOR_COUNT(op->op_args); i++) {
 		if (i > 0) {
-			b_stream_write_string(printer->p_stream, ", ", NULL);
+			fx_stream_write_string(printer->p_stream, ", ", NULL);
 		}
 
 		mie_printer_print_op_arg(printer, &op->op_args.items[i], false);
 	}
 
-	b_stream_write_string(printer->p_stream, " : ", NULL);
+	fx_stream_write_string(printer->p_stream, " : ", NULL);
 
 	for (size_t i = 0; i < MIE_VECTOR_COUNT(op->op_args); i++) {
 		if (i > 0) {
-			b_stream_write_string(printer->p_stream, ", ", NULL);
+			fx_stream_write_string(printer->p_stream, ", ", NULL);
 		}
 
 		mie_printer_print_type(
@@ -30,8 +32,81 @@ static enum mie_status print(struct mie_printer *printer, const struct mie_op *o
 	return MIE_SUCCESS;
 }
 
-static enum mie_status parse(struct mie_parser *parser, struct mie_op *out)
+static enum mie_status parse(
+	struct mie_parser *parser, struct mie_parser_scope *scope,
+	struct mie_op *out)
 {
+	if (!mie_parser_parse_parameter_list(
+		    parser, false, MIE_VECTOR_REF(out->op_args),
+		    "yield value(s)")) {
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (!mie_parser_parse_symbol(parser, MIE_SYM_COLON)) {
+		mie_parser_report_unexpected_token(
+			parser, MIE_SYM_COLON, "yield value type(s)");
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	MIE_VECTOR_DEFINE(const struct mie_type *, types);
+	const struct mie_type *tmp = NULL;
+	struct mie_file_span first_span, last_span;
+
+	if (!mie_parser_parse_type(
+		    parser, "yield value type(s)", &tmp, &first_span)) {
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	mie_vector_push_back(types, &tmp, NULL);
+	bool ok = true;
+
+	while (1) {
+		if (mie_parser_peek_type(parser) == MIE_TOK_LINEFEED) {
+			break;
+		}
+
+		if (!mie_parser_parse_symbol(parser, MIE_SYM_COMMA)) {
+			struct mie_parser_item expected[] = {
+				MIE_PARSE_ITEM_TOKEN(MIE_SYM_COMMA),
+				MIE_PARSE_ITEM_TOKEN(MIE_TOK_LINEFEED),
+				MIE_PARSE_ITEM_NONE,
+			};
+
+			mie_parser_report_unexpected_token_v(
+				parser, expected, "yield value type list");
+			ok = false;
+			break;
+		}
+
+		if (!mie_parser_parse_type(
+			    parser, "yield value type", &tmp, &last_span)) {
+			ok = false;
+			break;
+		}
+
+		mie_vector_push_back(types, &tmp, NULL);
+	}
+
+	if (!ok) {
+		mie_vector_destroy(types, NULL);
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	if (MIE_VECTOR_COUNT(types) != MIE_VECTOR_COUNT(out->op_args)) {
+		struct mie_file_span span = {
+			.s_start = first_span.s_start,
+			.s_end = last_span.s_end,
+		};
+		mie_parser_report_error_simple(
+			parser, "builtin", MIE_BUILTIN_E_INCORRECT_NUMBER_OF_TYPES,
+			MIE_BUILTIN_MSG_OP_NR_TYPES_DOESNT_MATCH_NR_ARGS, &span);
+		return MIE_ERR_BAD_SYNTAX;
+	}
+
+	for (size_t i = 0; i < MIE_VECTOR_COUNT(types); i++) {
+		out->op_args.items[i].arg_unresolved.reg_type = types.items[i];
+	}
+
 	return MIE_SUCCESS;
 }
 

mie/dialect/select/op/graph.c

@@ -9,7 +9,9 @@ static enum mie_status print(struct mie_printer *printer, const struct mie_op *o
 	return MIE_SUCCESS;
 }
 
-static enum mie_status parse(struct mie_parser *parser, struct mie_op *out)
+static enum mie_status parse(
+	struct mie_parser *parser, struct mie_parser_scope *scope,
+	struct mie_op *out)
 {
 	return MIE_SUCCESS;
 }

mie/id.c

@@ -1,7 +1,7 @@
-#include <blue/core/bstr.h>
-#include <blue/core/endian.h>
-#include <blue/core/hash.h>
-#include <blue/core/random.h>
+#include <fx/core/bstr.h>
+#include <fx/core/endian.h>
+#include <fx/core/hash.h>
+#include <fx/core/random.h>
 #include <mie/id.h>
 #include <string.h>
 
@@ -10,18 +10,18 @@ static inline int id_memcmp(const uint8_t *a, const uint8_t *b)
 	return memcmp(a, b, MIE_ID_NR_BYTES);
 }
 
-static mie_id *get_id(const b_btree *tree, mie_id *key)
+static mie_id *get_id(const fx_bst *tree, mie_id *key)
 {
-	b_btree_node *cur = tree->b_root;
+	fx_bst_node *cur = tree->bst_root;
 	while (cur) {
-		mie_id *cur_node = b_unbox(mie_id, cur, e_node);
+		mie_id *cur_node = fx_unbox(mie_id, cur, e_node);
 		int cmp = memcmp(
 			key->id_bytes, cur_node->id_bytes, sizeof key->id_bytes);
 
 		if (cmp > 0) {
-			cur = b_btree_right(cur);
+			cur = fx_bst_right(cur);
 		} else if (cmp < 0) {
-			cur = b_btree_left(cur);
+			cur = fx_bst_left(cur);
 		} else {
 			return cur_node;
 		}
@@ -30,33 +30,33 @@ static mie_id *get_id(const b_btree *tree, mie_id *key)
 	return NULL;
 }
 
-void put_id(b_btree *tree, mie_id *node)
+void put_id(fx_bst *tree, mie_id *node)
 {
-	if (!tree->b_root) {
-		tree->b_root = &node->e_node;
-		b_btree_insert_fixup(tree, &node->e_node);
+	if (!tree->bst_root) {
+		tree->bst_root = &node->e_node;
+		fx_bst_insert_fixup(tree, &node->e_node);
 		return;
 	}
 
-	b_btree_node *cur = tree->b_root;
+	fx_bst_node *cur = tree->bst_root;
 	while (1) {
-		mie_id *cur_node = b_unbox(mie_id, cur, e_node);
-		b_btree_node *next = NULL;
+		mie_id *cur_node = fx_unbox(mie_id, cur, e_node);
+		fx_bst_node *next = NULL;
 		int cmp = memcmp(
 			node->id_bytes, cur_node->id_bytes, sizeof node->id_bytes);
 
 		if (cmp > 0) {
-			next = b_btree_right(cur);
+			next = fx_bst_right(cur);
 
 			if (!next) {
-				b_btree_put_right(cur, &node->e_node);
+				fx_bst_put_right(cur, &node->e_node);
 				break;
 			}
 		} else if (cmp < 0) {
-			next = b_btree_left(cur);
+			next = fx_bst_left(cur);
 
 			if (!next) {
-				b_btree_put_left(cur, &node->e_node);
+				fx_bst_put_left(cur, &node->e_node);
 				break;
 			}
 		} else {
@@ -66,17 +66,17 @@ void put_id(b_btree *tree, mie_id *node)
 		cur = next;
 	}
 
-	b_btree_insert_fixup(tree, &node->e_node);
+	fx_bst_insert_fixup(tree, &node->e_node);
 }
 
 void mie_id_init(
 	mie_id *out, uint32_t a, uint16_t b, uint16_t c, uint16_t d, uint64_t e)
 {
-	b_i32 x_a = b_i32_htob(a);
-	b_i16 x_b = b_i16_htob(b);
-	b_i16 x_c = b_i16_htob(c);
-	b_i16 x_d = b_i16_htob(d);
-	b_i64 x_e = b_i64_htob(e);
+	fx_i32 x_a = fx_i32_htob(a);
+	fx_i16 x_b = fx_i16_htob(b);
+	fx_i16 x_c = fx_i16_htob(c);
+	fx_i16 x_d = fx_i16_htob(d);
+	fx_i64 x_e = fx_i64_htob(e);
 
 	memcpy(&out->id_bytes[0], x_a.i_bytes, sizeof x_a.i_bytes);
 	memcpy(&out->id_bytes[4], x_b.i_bytes, sizeof x_b.i_bytes);
@@ -92,12 +92,12 @@ void mie_id_init_zero(mie_id *out)
 
 void mie_id_init_random(mie_id *out)
 {
-	b_random_ctx *random = b_random_global_ctx();
-	b_random_next_bytes(
+	fx_random_ctx *random = fx_random_global_ctx();
+	fx_random_next_bytes(
 		random, (unsigned char *)out->id_bytes, sizeof out->id_bytes);
 }
 
-void mie_id_init_ns(mie_id *out, const mie_id *ns, const b_rope *name)
+void mie_id_init_ns(mie_id *out, const mie_id *ns, const fx_rope *name)
 {
 	struct mie_id_builder ctx;
 	mie_id_builder_begin(&ctx, ns);
@@ -107,45 +107,45 @@ void mie_id_init_ns(mie_id *out, const mie_id *ns, const b_rope *name)
 
 void mie_id_to_string(const mie_id *id, char *out, size_t max)
 {
-	b_bstr str;
-	b_bstr_begin(&str, out, max);
+	fx_bstr str;
+	fx_bstr_begin(&str, out, max);
 	for (size_t i = 0; i < sizeof id->id_bytes; i++) {
 		if (i == 4 || i == 6 || i == 8 || i == 10) {
-			b_bstr_write_char(&str, '-');
+			fx_bstr_write_char(&str, '-');
 		}
 
-		b_bstr_write_fmt(&str, NULL, "%02x", id->id_bytes[i]);
+		fx_bstr_write_fmt(&str, NULL, "%02x", id->id_bytes[i]);
 	}
 }
 
 void mie_id_builder_begin(struct mie_id_builder *builder, const mie_id *ns)
 {
 	memset(builder, 0x0, sizeof *builder);
-	b_hash_ctx_init(&builder->b_hash, B_HASH_SHA1);
-	b_hash_ctx_update(&builder->b_hash, ns->id_bytes, sizeof ns->id_bytes);
+	fx_hash_ctx_init(&builder->b_hash, FX_HASH_SHA1);
+	fx_hash_ctx_update(&builder->b_hash, ns->id_bytes, sizeof ns->id_bytes);
 }
 
 void mie_id_builder_add(struct mie_id_builder *builder, const void *p, size_t len)
 {
-	b_hash_ctx_update(&builder->b_hash, p, len);
+	fx_hash_ctx_update(&builder->b_hash, p, len);
 }
 
-void mie_id_builder_add_rope(struct mie_id_builder *builder, const b_rope *rope)
+void mie_id_builder_add_rope(struct mie_id_builder *builder, const fx_rope *rope)
 {
-	b_hash_ctx_update_rope(&builder->b_hash, rope);
+	fx_hash_ctx_update_rope(&builder->b_hash, rope);
 }
 
 void mie_id_builder_add_marker(
 	struct mie_id_builder *builder, enum mie_id_builder_marker marker)
 {
 	unsigned char c = marker;
-	b_hash_ctx_update(&builder->b_hash, &c, sizeof c);
+	fx_hash_ctx_update(&builder->b_hash, &c, sizeof c);
 }
 
 void mie_id_builder_end(struct mie_id_builder *builder, mie_id *out)
 {
 	memset(out, 0x0, sizeof *out);
-	b_hash_ctx_finish(&builder->b_hash, out->id_bytes, sizeof out->id_bytes);
+	fx_hash_ctx_finish(&builder->b_hash, out->id_bytes, sizeof out->id_bytes);
 
 	out->id_bytes[6] &= 0x0F;
 	out->id_bytes[6] |= 0x50;
@@ -166,7 +166,7 @@ const mie_id *mie_id_map_get_ns(const struct mie_id_map *map)
 	return &map->map_ns_id;
 }
 
-void mie_id_map_put(struct mie_id_map *map, mie_id *id, const b_rope *name)
+void mie_id_map_put(struct mie_id_map *map, mie_id *id, const fx_rope *name)
 {
 	mie_id_init_ns(id, &map->map_ns_id, name);
 	put_id(&map->map_entries, id);
@@ -187,13 +187,13 @@ enum mie_status mie_id_map_iterator_begin(
 {
 	memset(it, 0x0, sizeof *it);
 
-	it->_n = b_btree_first(&map->map_entries);
+	it->_n = fx_bst_first(&map->map_entries);
 
 	if (!it->_n) {
 		return MIE_ERR_NO_DATA;
 	}
 
-	it->it_id = b_unbox(mie_id, it->_n, e_node);
+	it->it_id = fx_unbox(mie_id, it->_n, e_node);
 
 	return MIE_SUCCESS;
 }
@@ -205,13 +205,13 @@ enum mie_status mie_id_map_iterator_move_next(struct mie_id_map_iterator *it)
 		return MIE_ERR_NO_DATA;
 	}
 
-	it->_n = b_btree_next(it->_n);
+	it->_n = fx_bst_next(it->_n);
 	if (!it->_n) {
 		it->it_id = NULL;
 		return MIE_ERR_NO_DATA;
 	}
 
-	it->it_id = b_unbox(mie_id, it->_n, e_node);
+	it->it_id = fx_unbox(mie_id, it->_n, e_node);
 
 	return MIE_SUCCESS;
 }

mie/include/mie/attribute/attribute-map.h

@@ -1,14 +1,14 @@
 #ifndef MIE_ATTRIBUTE_ATTRIBUTE_MAP_H_
 #define MIE_ATTRIBUTE_ATTRIBUTE_MAP_H_
 
-#include <blue/core/btree.h>
+#include <fx/core/bst.h>
 #include <mie/misc.h>
 #include <mie/status.h>
 
-struct b_queue_entry;
+struct fx_queue_entry;
 
 struct mie_attribute_map {
-	b_btree m_entries;
+	fx_bst m_entries;
 };
 
 enum mie_attribute_map_flags {
@@ -18,8 +18,8 @@ enum mie_attribute_map_flags {
 struct mie_attribute_map_iterator {
 	const char *it_name;
 	const struct mie_attribute *it_value;
-	b_btree_node *_n;
-	struct b_queue_entry *_e;
+	fx_bst_node *_n;
+	struct fx_queue_entry *_e;
 };
 
 MIE_API void mie_attribute_map_init(struct mie_attribute_map *map);
@@ -27,7 +27,7 @@ MIE_API void mie_attribute_map_cleanup(struct mie_attribute_map *map);
 
 static inline bool mie_attribute_map_empty(const struct mie_attribute_map *map)
 {
-	return b_btree_empty(&map->m_entries);
+	return fx_bst_empty(&map->m_entries);
 }
 
 MIE_API const struct mie_attribute *mie_attribute_map_get(

mie/include/mie/ctx.h

@@ -1,8 +1,8 @@
 #ifndef MIE_CTX_H_
 #define MIE_CTX_H_
 
-#include <blue/core/btree.h>
-#include <blue/ds/hashmap.h>
+#include <fx/core/bst.h>
+#include <fx/ds/hashmap.h>
 #include <mie/id.h>
 
 struct mie_op;
@@ -21,8 +21,8 @@ struct mie_ctx {
 	struct mie_const *ctx_true, *ctx_false;
 	struct mie_value *ctx_null;
 	struct mie_type *ctx_types[__MIE_TYPE_COUNT];
-	b_hashmap *ctx_sel_cache;
-	b_hashmap *ctx_string_cache;
+	fx_hashmap *ctx_sel_cache;
+	fx_hashmap *ctx_string_cache;
 #endif
 	/* map of struct mie_dialect */
 	struct mie_id_map ctx_dialects;
@@ -35,7 +35,7 @@ struct mie_ctx {
 	/* map of struct mie_pass_definition */
 	struct mie_id_map ctx_passes;
 	/* queue of struct mie_diag */
-	b_queue ctx_diag;
+	fx_queue ctx_diag;
 };
 
 MIE_API struct mie_ctx *mie_ctx_create(void);

mie/include/mie/diag/component.h

@@ -1,7 +1,7 @@
 #ifndef MIE_DIAG_COMPONENT_H_
 #define MIE_DIAG_COMPONENT_H_
 
-#include <blue/core/queue.h>
+#include <fx/core/queue.h>
 #include <stddef.h>
 
 enum mie_diag_component_type {
@@ -12,7 +12,7 @@ enum mie_diag_component_type {
 
 struct mie_diag_component {
 	enum mie_diag_component_type c_type;
-	b_queue_entry c_entry;
+	fx_queue_entry c_entry;
 };
 
 struct mie_diag_c_snippet {

mie/include/mie/diag/diag.h

@@ -1,9 +1,42 @@
 #ifndef MIE_DIAG_DIAG_H_
 #define MIE_DIAG_DIAG_H_
 
-#include <blue/core/queue.h>
+#include <fx/core/queue.h>
 #include <mie/parse/file-span.h>
 
+#define MIE_DIAG_HL(type, span)                                                \
+	{                                                                      \
+		.hl_type = MIE_DIAG_HIGHLIGHT_##type,                          \
+		.hl_span = (span),                                             \
+	}
+
+#define MIE_DIAG_ADD(str, loc)                                                 \
+	{                                                                      \
+		.a_type = MIE_DIAG_AMENDMENT_ADD, .__x = strlen(str),          \
+		.a_add = {                                                     \
+			.a_loc = (loc),                                        \
+				.a_str = (str), \
+		},                                                             \
+	}
+
+#define MIE_DIAG_REMOVE(len, llc)                                              \
+	{                                                                      \
+		.a_type = MIE_DIAG_AMENDMENT_REMOVE,                           \
+		.a_remove = {                                                  \
+			.a_loc = (loc),                                        \
+			.a_length = (len),                                     \
+		},                                                             \
+	}
+#define MIE_DIAG_REPLACE(len, str, loc)                                        \
+	{                                                                      \
+		.a_type = MIE_DIAG_AMENDMENT_REPLACE, .__x = strlen(str),      \
+		.a_replace = {                                                 \
+			.a_loc = (loc),                                        \
+			.a_length = (len),                                     \
+			.a_str = (str),                                        \
+		},                                                             \
+	}
+
 struct mie_ctx;
 struct mie_diag_class;
 struct mie_diag_amendment;
@@ -22,8 +55,8 @@ struct mie_diag {
 
 	struct mie_line_source *diag_src;
 	struct mie_file_cell diag_loc;
-	b_queue_entry diag_entry;
-	b_queue diag_components;
+	fx_queue_entry diag_entry;
+	fx_queue diag_components;
 };
 
 MIE_API void mie_diag_set_location(
@@ -31,6 +64,7 @@ MIE_API void mie_diag_set_location(
 MIE_API void mie_diag_push_msg(
 	struct mie_diag *diag, struct mie_ctx *ctx, const char *dialect,
 	unsigned long msg, ...);
+MIE_API void mie_diag_push_string(struct mie_diag *diag, const char *str);
 MIE_API void mie_diag_push_snippet(
 	struct mie_diag *diag, unsigned long first_line, unsigned long last_line,
 	const struct mie_diag_amendment *amendmends, size_t nr_amendments,

mie/include/mie/dialect/arith.h

@@ -10,6 +10,32 @@ struct mie_ctx;
 struct mie_dialect;
 struct mie_emitter;
 
+enum mie_arith_diag {
+	MIE_ARITH_E_INVALID_INTEGER_TYPE,
+	MIE_ARITH_E_INVALID_FLOAT_TYPE,
+	MIE_ARITH_E_INVALID_COMPARISON_PREDICATE,
+};
+
+enum mie_arith_msg {
+	MIE_ARITH_MSG_EXPECTED_INTEGER_TYPE,
+	MIE_ARITH_MSG_EXPECTED_FLOAT_TYPE,
+	MIE_ARITH_MSG_INVALID_COMPARISON_PREDICATE,
+	MIE_ARITH_MSG_VALID_COMPARISON_PREDICATES,
+};
+
+enum mie_arith_cmpi_predicate {
+	MIE_ARITH_CMPI_EQ = 0,
+	MIE_ARITH_CMPI_NE = 1,
+	MIE_ARITH_CMPI_SLT = 2,
+	MIE_ARITH_CMPI_SLE = 3,
+	MIE_ARITH_CMPI_SGT = 4,
+	MIE_ARITH_CMPI_SGE = 5,
+	MIE_ARITH_CMPI_ULT = 6,
+	MIE_ARITH_CMPI_ULE = 7,
+	MIE_ARITH_CMPI_UGT = 8,
+	MIE_ARITH_CMPI_UGE = 9,
+};
+
 MIE_API struct mie_dialect *mie_arith_dialect_create(struct mie_ctx *ctx);
 
 MIE_API struct mie_register *mie_arith_constant_i_put(
@@ -19,6 +45,9 @@ MIE_API struct mie_register *mie_arith_constant_f_put(
 MIE_API struct mie_register *mie_arith_addi_put(
 	struct mie_emitter *e, struct mie_register *left,
 	struct mie_register *right, const char *name);
+MIE_API struct mie_register *mie_arith_cmpi_put(
+	struct mie_emitter *e, enum mie_arith_cmpi_predicate pred,
+	struct mie_register *left, struct mie_register *right, const char *name);
 MIE_API struct mie_register *mie_arith_addf_put(
 	struct mie_emitter *e, struct mie_register *left,
 	struct mie_register *right, const char *name);

mie/include/mie/dialect/builtin.h

@@ -1,10 +1,11 @@
 #ifndef MIE_DIALECT_BUILTIN_H_
 #define MIE_DIALECT_BUILTIN_H_
 
-#include <blue/ds/string.h>
+#include <fx/ds/string.h>
 #include <mie/attribute/attribute.h>
 #include <mie/interface/interface.h>
 #include <mie/misc.h>
+#include <mie/parse/file-span.h>
 #include <mie/trait/trait.h>
 #include <mie/vector.h>
 
@@ -17,18 +18,51 @@ struct mie_float_type;
 
 enum mie_builtin_diag {
 	MIE_BUILTIN_E_UNRECOGNISED_TOKEN,
+	MIE_BUILTIN_E_UNEXPECTED_TOKEN,
+	MIE_BUILTIN_E_UNRESOLVED_TYPE,
 	MIE_BUILTIN_E_UNRESOLVED_VALUE,
 	MIE_BUILTIN_E_UNRESOLVED_SUCCESSOR,
+	MIE_BUILTIN_E_UNKNOWN_OP,
+	MIE_BUILTIN_E_OP_REQUIRES_PARENT_SCOPE,
+	MIE_BUILTIN_E_INCORRECT_NUMBER_OF_ARGUMENTS,
+	MIE_BUILTIN_E_INCORRECT_NUMBER_OF_RESULTS,
+	MIE_BUILTIN_E_INCORRECT_NUMBER_OF_TYPES,
+	MIE_BUILTIN_E_INCORRECT_TYPE,
+	MIE_BUILTIN_E_INVALID_TYPE,
+	MIE_BUILTIN_E_NAME_ALREADY_IN_USE,
+	MIE_BUILTIN_E_INTERNAL_ERROR,
 };
 
 enum mie_builtin_msg {
 	MIE_BUILTIN_MSG_UNRECOGNISED_TOKEN,
+	MIE_BUILTIN_MSG_UNEXPECTED_TOKEN,
 	MIE_BUILTIN_MSG_UNRESOLVED_VALUE,
+	MIE_BUILTIN_MSG_UNRESOLVED_BUILTIN_TYPE,
+	MIE_BUILTIN_MSG_UNRESOLVED_DIALECT_TYPE,
 	MIE_BUILTIN_MSG_CANNOT_FIND_BLOCK,
 	MIE_BUILTIN_MSG_VALUE_DEFINED_IN_NON_DOMINANT_BLOCK,
 	MIE_BUILTIN_MSG_VALUE_DEFINED_AFTER_USE,
 	MIE_BUILTIN_MSG_VALUE_DEFINED_OUTSIDE_ISOLATED_REGION,
 	MIE_BUILTIN_MSG_VALUE_DEFINED_IN_BLOCK,
+	MIE_BUILTIN_MSG_UNKNOWN_OP,
+	MIE_BUILTIN_MSG_OP_REQUIRES_PARENT_SCOPE,
+	MIE_BUILTIN_MSG_OP_PARENT_SCOPE_EXAMPLE,
+	MIE_BUILTIN_MSG_USE_GENERIC_OP_SYNTAX,
+	MIE_BUILTIN_MSG_OP_HAS_NO_PARSER,
+	MIE_BUILTIN_MSG_DIALECT_INTERNAL_ERROR,
+	MIE_BUILTIN_MSG_COMPILER_INTERNAL_ERROR,
+	MIE_BUILTIN_MSG_OP_INCORRECT_NUMBER_OF_ARGS,
+	MIE_BUILTIN_MSG_OP_INCORRECT_NUMBER_OF_RESULTS,
+	MIE_BUILTIN_MSG_OP_NR_TYPES_DOESNT_MATCH_NR_ARGS,
+	MIE_BUILTIN_MSG_OP_NR_TYPES_DOESNT_MATCH_NR_RESULTS,
+	MIE_BUILTIN_MSG_OP_EXPECTS_X_RESULTS,
+	MIE_BUILTIN_MSG_NR_RESULT_NAME_OUTPUT_MISMATCH,
+	MIE_BUILTIN_MSG_NAME_ALREADY_IN_USE,
+	MIE_BUILTIN_MSG_NAME_ALREADY_USED_HERE,
+	MIE_BUILTIN_MSG_CANNOT_USE_FUNCTION_TYPE_HERE,
+	MIE_BUILTIN_MSG_CANNOT_USE_STORAGE_TYPE_HERE,
+	MIE_BUILTIN_MSG_MUST_USE_FUNCTION_TYPE_HERE,
+	MIE_BUILTIN_MSG_MUST_USE_STORAGE_TYPE_HERE,
 };
 
 enum mie_float_width {
@@ -36,6 +70,12 @@ enum mie_float_width {
 	MIE_FLOAT_64 = 64,
 };
 
+enum mie_memref_rank_type {
+	MIE_MEMREF_RANK_UNKNOWN = 0,
+	MIE_MEMREF_RANK_STATIC,
+	MIE_MEMREF_RANK_TYPE,
+};
+
 struct mie_string {
 	struct mie_attribute str_base;
 	char *str_val;
@@ -90,6 +130,15 @@ struct mie_symbol_table {
 	struct mie_trait tab_base;
 };
 
+struct mie_memref_rank {
+	enum mie_memref_rank_type r_ranktype;
+	struct mie_file_span r_span;
+	union {
+		size_t r_static;
+		const struct mie_type *r_type;
+	};
+};
+
 struct mie_int_cache;
 struct mie_float_cache;
 struct mie_string_cache;
@@ -136,6 +185,8 @@ MIE_API bool mie_float_get_value(const struct mie_attribute *attrib, double *out
 MIE_API struct mie_type *mie_ctx_get_int_type(struct mie_ctx *ctx, size_t bit_width);
 MIE_API struct mie_type *mie_ctx_get_float_type(
 	struct mie_ctx *ctx, size_t bit_width);
+MIE_API struct mie_type *mie_ctx_get_memref_type(
+	struct mie_ctx *ctx, const struct mie_memref_rank *ranks, size_t nr_ranks);
 
 MIE_API struct mie_attribute *mie_type_attr_create(
 	struct mie_ctx *ctx, const struct mie_type *ty);
@@ -143,4 +194,8 @@ MIE_API struct mie_attribute *mie_type_attr_create(
 MIE_API size_t mie_int_type_get_width(const struct mie_type *type);
 MIE_API size_t mie_float_type_get_width(const struct mie_type *type);
 
+MIE_API size_t mie_memref_type_get_nr_ranks(const struct mie_type *type);
+MIE_API const struct mie_memref_rank *mie_memref_type_get_rank(
+	const struct mie_type *type, size_t i);
+
 #endif

mie/include/mie/dialect/dialect.h

@@ -1,8 +1,8 @@
 #ifndef MIE_DIALECT_DIALECT_H_
 #define MIE_DIALECT_DIALECT_H_
 
-#include <blue/core/btree.h>
-#include <blue/core/queue.h>
+#include <fx/core/bst.h>
+#include <fx/core/queue.h>
 #include <mie/id.h>
 #include <mie/misc.h>
 #include <mie/vector.h>

mie/include/mie/dialect/memref.h

@@ -8,6 +8,13 @@
 struct mie_ctx;
 struct mie_dialect;
 
+enum mie_memref_msg {
+	MIE_MEMREF_MSG_OP_EXPECTS_MEMREF_ARGUMENT,
+	MIE_MEMREF_MSG_LAST_MEMREF_RANK_MUST_BE_TYPE,
+	MIE_MEMREF_MSG_MEMREF_MUST_HAVE_AT_LEAST_ONE_RANK,
+	MIE_MEMREF_MSG_OP_RESULT_DETERMINED_BY_LAST_MEMREF_RANK,
+};
+
 MIE_API struct mie_dialect *mie_memref_dialect_create(struct mie_ctx *ctx);
 
 #endif

mie/include/mie/id.h

@@ -1,9 +1,9 @@
 #ifndef MIE_ID_H_
 #define MIE_ID_H_
 
-#include <blue/core/btree.h>
-#include <blue/core/queue.h>
-#include <blue/core/rope.h>
+#include <fx/core/bst.h>
+#include <fx/core/queue.h>
+#include <fx/core/rope.h>
 #include <mie/misc.h>
 #include <mie/status.h>
 #include <stddef.h>
@@ -42,30 +42,30 @@ typedef struct mie_id {
 	};
 
 	union {
-		b_btree_node e_node;
-		b_queue_entry e_entry;
+		fx_bst_node e_node;
+		fx_queue_entry e_entry;
 	};
 } mie_id;
 
 struct mie_id_builder {
-	b_hash_ctx b_hash;
+	fx_hash_ctx b_hash;
 };
 
 struct mie_id_map {
 	mie_id map_ns_id;
-	b_btree map_entries;
+	fx_bst map_entries;
 };
 
 struct mie_id_map_iterator {
 	mie_id *it_id;
-	b_btree_node *_n;
+	fx_bst_node *_n;
 };
 
 MIE_API void mie_id_init(
 	mie_id *out, uint32_t a, uint16_t b, uint16_t c, uint16_t d, uint64_t e);
 MIE_API void mie_id_init_zero(mie_id *out);
 MIE_API void mie_id_init_random(mie_id *out);
-MIE_API void mie_id_init_ns(mie_id *out, const mie_id *ns, const b_rope *name);
+MIE_API void mie_id_init_ns(mie_id *out, const mie_id *ns, const fx_rope *name);
 
 static inline int mie_id_compare(const mie_id *a, const mie_id *b)
 {
@@ -86,8 +86,20 @@ static inline void mie_id_builder_add_cstr(
 {
 	mie_id_builder_add(builder, s, strlen(s));
 }
+static inline void mie_id_builder_add_id(
+	struct mie_id_builder *builder, const mie_id *id)
+{
+	mie_id_builder_add(builder, id->id_bytes, sizeof id->id_bytes);
+}
+static inline void mie_id_builder_add_int(
+	struct mie_id_builder *builder, long long v)
+{
+	char s[32];
+	size_t len = snprintf(s, sizeof s, "%lld", v);
+	mie_id_builder_add(builder, s, len);
+}
 MIE_API void mie_id_builder_add_rope(
-	struct mie_id_builder *builder, const b_rope *rope);
+	struct mie_id_builder *builder, const fx_rope *rope);
 MIE_API void mie_id_builder_add_marker(
 	struct mie_id_builder *builder, enum mie_id_builder_marker marker);
 MIE_API void mie_id_builder_end(struct mie_id_builder *builder, mie_id *out);
@@ -95,12 +107,12 @@ MIE_API void mie_id_builder_end(struct mie_id_builder *builder, mie_id *out);
 MIE_API void mie_id_map_init(struct mie_id_map *map, const mie_id *ns);
 static inline bool mie_id_map_empty(const struct mie_id_map *map)
 {
-	return b_btree_empty(&map->map_entries);
+	return fx_bst_empty(&map->map_entries);
 }
 
 MIE_API const mie_id *mie_id_map_get_ns(const struct mie_id_map *map);
 MIE_API void mie_id_map_put(
-	struct mie_id_map *map, mie_id *node, const b_rope *name);
+	struct mie_id_map *map, mie_id *node, const fx_rope *name);
 MIE_API void mie_id_map_put_id(struct mie_id_map *map, mie_id *node);
 MIE_API mie_id *mie_id_map_get(const struct mie_id_map *map, mie_id *id);
 

mie/include/mie/ir/block.h

@@ -1,7 +1,7 @@
 #ifndef MIE_IR_BLOCK_H_
 #define MIE_IR_BLOCK_H_
 
-#include <blue/core/queue.h>
+#include <fx/core/queue.h>
 #include <mie/misc.h>
 #include <mie/name.h>
 #include <mie/vector.h>
@@ -26,11 +26,11 @@ struct mie_block {
 	unsigned int b_id;
 	struct mie_block *b_idom;
 	// struct mie_block *b_sdom, *b_dfs_parent;
-	b_queue_entry b_entry;
+	fx_queue_entry b_entry;
 
 	MIE_VECTOR_DECLARE(struct mie_register, b_params);
 	/* queue of struct mie_op */
-	b_queue b_ops;
+	fx_queue b_ops;
 };
 
 extern struct mie_vector_ops mie_block_vector_ops;

mie/include/mie/ir/op-definition.h

@@ -1,8 +1,8 @@
 #ifndef MIE_IR_OP_DEFINITION_H_
 #define MIE_IR_OP_DEFINITION_H_
 
-#include <blue/core/btree.h>
-#include <blue/core/stream.h>
+#include <fx/core/bst.h>
+#include <fx/core/stream.h>
 #include <mie/id.h>
 #include <mie/interface/interface-map.h>
 #include <mie/status.h>
@@ -15,6 +15,7 @@ struct mie_op;
 struct mie_printer;
 struct mie_parser;
 struct mie_dialect;
+struct mie_parser_scope;
 
 #if 0
 enum mie_op_trait {
@@ -103,7 +104,8 @@ struct mie_op_definition {
 	const struct mie_op_result op_results[MIE_OP_MAX_RESULTS];
 
 	enum mie_status (*op_print)(struct mie_printer *, const struct mie_op *);
-	enum mie_status (*op_parse)(struct mie_parser *, struct mie_op *);
+	enum mie_status (*op_parse)(
+		struct mie_parser *, struct mie_parser_scope *, struct mie_op *);
 };
 
 MIE_API struct mie_op_definition *mie_op_definition_create(

mie/include/mie/ir/op.h

@@ -52,7 +52,7 @@ struct mie_op_successor {
 struct mie_op {
 	enum mie_op_flags op_flags;
 	/* used by struct mie_block */
-	b_queue_entry op_entry;
+	fx_queue_entry op_entry;
 
 	struct mie_line_source *op_src;
 	/* this pointer is only valid if the F_OP_RESOLVED flag is set */
@@ -63,7 +63,7 @@ struct mie_op {
 	/* only valid if the F_RESOLVED flag is NOT set */
 	char *op_name;
 
-	b_queue op_regions;
+	fx_queue op_regions;
 
 	MIE_VECTOR_DECLARE(struct mie_op_successor, op_successors);
 	struct mie_attribute_map op_attrib;
@@ -79,10 +79,6 @@ MIE_API void mie_op_cleanup(struct mie_op *op);
 
 MIE_API size_t mie_op_get_name(const struct mie_op *op, char *out, size_t max);
 
-MIE_API bool mie_op_resolve_self(struct mie_op *op, struct mie_ctx *ctx);
-MIE_API bool mie_op_resolve_args(struct mie_op *op, struct mie_ctx *ctx);
-MIE_API bool mie_op_resolve_successors(struct mie_op *op, struct mie_ctx *ctx);
-
 MIE_API struct mie_op_arg *mie_op_add_arg(struct mie_op *op);
 MIE_API struct mie_register *mie_op_add_result(
 	struct mie_op *op, const struct mie_type *ty);
@@ -110,6 +106,11 @@ MIE_API struct mie_register *mie_op_get_arg(const struct mie_op *op, size_t inde
 MIE_API struct mie_register *mie_op_get_result_with_name(
 	const struct mie_op *op, const char *name);
 
+MIE_API void mie_op_get_args_span(
+	const struct mie_op *op, struct mie_file_span *result);
+MIE_API void mie_op_get_results_span(
+	const struct mie_op *op, struct mie_file_span *result);
+
 MIE_API struct mie_op *mie_op_get_first_child_op(const struct mie_op *op);
 MIE_API struct mie_op *mie_op_get_last_child_op(const struct mie_op *op);
 

mie/include/mie/ir/region.h

@@ -1,8 +1,8 @@
 #ifndef MIE_IR_REGION_H_
 #define MIE_IR_REGION_H_
 
-#include <blue/core/btree.h>
-#include <blue/core/queue.h>
+#include <fx/core/bst.h>
+#include <fx/core/queue.h>
 #include <mie/misc.h>
 #include <mie/vector.h>
 #include <stddef.h>
@@ -15,12 +15,12 @@ struct mie_region {
 	struct mie_name_map *r_names;
 	struct mie_op *r_parent;
 	/* used by struct mie_op */
-	b_queue_entry r_entry;
+	fx_queue_entry r_entry;
 	/* queue of struct mie_block */
-	b_queue r_blocks;
+	fx_queue r_blocks;
 	/* bst of struct mie_block, as numbered by a depth-first search.
 	 * this ordering is recalculated by mie_region_refresh_dominance */
-	b_btree r_blocks_s;
+	fx_bst r_blocks_s;
 };
 
 MIE_API struct mie_block *mie_region_get_first_block(
@@ -32,6 +32,8 @@ MIE_API struct mie_block *mie_region_get_next_block(
 MIE_API struct mie_block *mie_region_get_last_block(const struct mie_region *region);
 
 MIE_API struct mie_block *mie_region_add_block(struct mie_region *region);
+MIE_API struct mie_block *mie_region_add_block_before(
+	struct mie_region *region, struct mie_block *before);
 MIE_API struct mie_block *mie_region_add_block_after(
 	struct mie_region *region, struct mie_block *after);
 MIE_API struct mie_block *mie_region_find_block(
@@ -43,8 +45,8 @@ MIE_API struct mie_register *mie_region_find_register(
  * this function populates the following attributes of every block in the
  * region:
  *   b_id
- *   b_node
- *   b_parent
+ *   fx_node
+ *   fx_parent
  * as well as the following attributes of the region itself:
  *   r_blocks_s
  * only top-level blocks and ops are considered by this function. if an op

mie/include/mie/ir/register.h

@@ -30,7 +30,7 @@ struct mie_register_ref {
 
 /* represents a use of/resolved reference to a mie_register */
 struct mie_register_use {
-	b_queue_entry u_entry;
+	fx_queue_entry u_entry;
 	struct mie_op *u_user;
 	struct mie_register *u_reg;
 };
@@ -59,7 +59,7 @@ struct mie_register {
 	struct mie_op *reg_op;
 	/* list of struct mie_register_use, representing all the places
 	 * where this register is used. */
-	b_queue reg_use;
+	fx_queue reg_use;
 };
 
 extern struct mie_vector_ops mie_register_vector_ops;

mie/include/mie/ir/walk.h

@@ -1,7 +1,7 @@
 #ifndef MIE_IR_WALK_H_
 #define MIE_IR_WALK_H_
 
-#include <blue/core/queue.h>
+#include <fx/core/queue.h>
 #include <mie/misc.h>
 #include <mie/status.h>
 #include <stddef.h>
@@ -35,7 +35,7 @@ enum mie_walk_item_type {
 
 struct mie_walk_item {
 	int _f;
-	b_queue_entry _e;
+	fx_queue_entry _e;
 	enum mie_walk_item_type i_type;
 	// size_t i_index;
 	size_t i_depth;
@@ -50,7 +50,7 @@ struct mie_walker {
 	enum mie_walker_flags w_flags;
 	union {
 		/* used for recursive walks */
-		b_queue w_stack;
+		fx_queue w_stack;
 		/* used for non-recursive walks */
 		struct {
 			struct mie_walk_item w_region, w_block, w_op;

mie/include/mie/name.h

@@ -1,8 +1,8 @@
 #ifndef MIE_NAME_H_
 #define MIE_NAME_H_
 
-#include <blue/core/btree.h>
-#include <blue/core/queue.h>
+#include <fx/core/bst.h>
+#include <fx/core/queue.h>
 #include <mie/misc.h>
 #include <mie/parse/file-span.h>
 
@@ -30,14 +30,14 @@ struct mie_name_map_entry {
 	enum mie_name_map_entry_type e_type;
 	uint64_t e_hash;
 	union {
-		b_queue_entry e_entry;
-		b_btree_node e_node;
+		fx_queue_entry e_entry;
+		fx_bst_node e_node;
 	};
 };
 
 struct mie_name_bucket {
 	struct mie_name_map_entry b_base;
-	b_queue b_names;
+	fx_queue b_names;
 };
 
 /* stores a unique name, and forms a binary tree of similar entries.
@@ -64,7 +64,7 @@ struct mie_name {
 
 struct mie_name_map {
 	const struct mie_name_map *m_parent;
-	b_btree m_entries;
+	fx_bst m_entries;
 	size_t m_next_id;
 };
 

mie/include/mie/parse/lex.h

@@ -1,8 +1,8 @@
 #ifndef MIE_PARSE_LEX_H_
 #define MIE_PARSE_LEX_H_
 
-#include <blue/core/queue.h>
-#include <blue/core/stream.h>
+#include <fx/core/queue.h>
+#include <fx/core/stream.h>
 #include <mie/misc.h>
 #include <mie/status.h>
 
@@ -17,6 +17,7 @@ MIE_API void mie_lex_destroy(struct mie_lex *lex);
 
 MIE_API enum mie_status mie_lex_get_status(const struct mie_lex *lex);
 MIE_API struct mie_line_source *mie_lex_get_line_source(const struct mie_lex *lex);
+MIE_API const struct mie_file_cell *mie_lex_get_cursor(const struct mie_lex *lex);
 MIE_API struct mie_token *mie_lex_peek(struct mie_lex *lex);
 MIE_API void mie_lex_advance(struct mie_lex *lex);
 

mie/include/mie/parse/line-source.h

@@ -1,34 +1,34 @@
 #ifndef MIE_PARSE_LINE_SOURCE_H_
 #define MIE_PARSE_LINE_SOURCE_H_
 
-#include <blue/core/stream.h>
-#include <blue/ds/array.h>
-#include <blue/ds/string.h>
+#include <fx/core/stream.h>
+#include <fx/ds/array.h>
+#include <fx/ds/string.h>
 #include <mie/misc.h>
 #include <mie/parse/file-span.h>
 #include <mie/status.h>
 
 struct mie_line_source {
-	b_stream *s_stream;
+	fx_stream *s_stream;
 	const char *s_path;
-	b_string *s_linebuf;
-	b_iterator *s_linebuf_ptr;
-	b_array *s_lines;
+	fx_string *s_linebuf;
+	fx_iterator *s_linebuf_ptr;
+	fx_array *s_lines;
 
 	struct mie_file_cell s_cursor;
 };
 
 MIE_API enum mie_status mie_line_source_init(
-	struct mie_line_source *src, const char *path, b_stream *stream);
+	struct mie_line_source *src, const char *path, fx_stream *stream);
 MIE_API void mie_line_source_cleanup(struct mie_line_source *src);
 
 MIE_API const char *mie_line_source_get_path(const struct mie_line_source *src);
 MIE_API const struct mie_file_cell *mie_line_source_get_cursor(
 	const struct mie_line_source *src);
-MIE_API b_wchar mie_line_source_peekc(struct mie_line_source *src);
-MIE_API b_wchar mie_line_source_getc(struct mie_line_source *src);
+MIE_API fx_wchar mie_line_source_peekc(struct mie_line_source *src);
+MIE_API fx_wchar mie_line_source_getc(struct mie_line_source *src);
 MIE_API enum mie_status mie_line_source_get_row(
-	struct mie_line_source *src, size_t row, const b_string **out);
+	struct mie_line_source *src, size_t row, const fx_string **out);
 
 MIE_API bool mie_line_source_input_available(struct mie_line_source *src);
 

mie/include/mie/parse/parser.h

@@ -1,7 +1,7 @@
 #ifndef MIE_PARSE_PARSER_H_
 #define MIE_PARSE_PARSER_H_
 
-#include <blue/ds/string.h>
+#include <fx/ds/string.h>
 #include <mie/ir/register.h>
 #include <mie/misc.h>
 #include <mie/parse/token.h>
@@ -25,6 +25,30 @@ struct mie_register;
 struct mie_attribute_map;
 struct mie_attribute;
 
+#define MIE_PARSE_ITEM_NONE {.i_type = MIE_PARSER_ITEM_NONE}
+#define MIE_PARSE_ITEM_TOKEN(tok)                                              \
+	{.i_type = MIE_PARSER_ITEM_TOK, .i_tok = (tok)}
+#define MIE_PARSE_ITEM_CSTR(s) {.i_type = MIE_PARSER_ITEM_CSTR, .i_cstr = (s)}
+
+struct mie_parser_scope {
+	struct mie_region *s_region;
+	struct mie_name_map *s_names;
+};
+
+enum mie_parser_item_type {
+	MIE_PARSER_ITEM_NONE = 0,
+	MIE_PARSER_ITEM_TOK,
+	MIE_PARSER_ITEM_CSTR,
+};
+
+struct mie_parser_item {
+	enum mie_parser_item_type i_type;
+	union {
+		unsigned int i_tok;
+		const char *i_cstr;
+	};
+};
+
 MIE_API struct mie_parser *mie_parser_create(
 	struct mie_ctx *ctx, struct mie_lex *lex);
 MIE_API void mie_parser_destroy(struct mie_parser *ctx);
@@ -33,7 +57,7 @@ MIE_API struct mie_ctx *mie_parser_get_mie_ctx(struct mie_parser *ctx);
 MIE_API struct mie_lex *mie_parser_get_lexer(struct mie_parser *ctx);
 MIE_API enum mie_status mie_parser_get_status(const struct mie_parser *ctx);
 MIE_API void mie_parser_set_status(struct mie_parser *ctx, enum mie_status status);
-MIE_API b_string *mie_parser_get_tempstr(struct mie_parser *ctx);
+MIE_API fx_string *mie_parser_get_tempstr(struct mie_parser *ctx);
 
 MIE_API struct mie_token *mie_parser_peek(struct mie_parser *ctx);
 MIE_API enum mie_token_type mie_parser_peek_type(struct mie_parser *ctx);
@@ -50,38 +74,45 @@ MIE_API bool mie_parser_parse_int(
 MIE_API bool mie_parser_parse_float(
 	struct mie_parser *ctx, double *out, struct mie_file_span *loc);
 MIE_API bool mie_parser_parse_word(
-	struct mie_parser *ctx, b_string *out, struct mie_file_span *loc);
+	struct mie_parser *ctx, fx_string *out, struct mie_file_span *loc);
+MIE_API bool mie_parser_parse_name(
+	struct mie_parser *ctx, fx_string *out, struct mie_file_span *loc);
 MIE_API bool mie_parser_parse_instname(
-	struct mie_parser *ctx, b_string *out, struct mie_file_span *loc);
+	struct mie_parser *ctx, fx_string *out, struct mie_file_span *loc);
 MIE_API bool mie_parser_parse_graphname(
-	struct mie_parser *ctx, b_string *out, struct mie_file_span *loc);
+	struct mie_parser *ctx, fx_string *out, struct mie_file_span *loc);
 MIE_API bool mie_parser_parse_opname(
-	struct mie_parser *ctx, b_string *out, struct mie_file_span *loc);
+	struct mie_parser *ctx, fx_string *out, struct mie_file_span *loc);
 MIE_API bool mie_parser_parse_vregname(
-	struct mie_parser *ctx, b_string *out, struct mie_file_span *loc);
+	struct mie_parser *ctx, fx_string *out, struct mie_file_span *loc);
 MIE_API bool mie_parser_parse_mregname(
-	struct mie_parser *ctx, b_string *out, struct mie_file_span *loc);
+	struct mie_parser *ctx, fx_string *out, struct mie_file_span *loc);
 MIE_API bool mie_parser_parse_blockname(
-	struct mie_parser *ctx, b_string *out, struct mie_file_span *loc);
+	struct mie_parser *ctx, fx_string *out, struct mie_file_span *loc);
 MIE_API bool mie_parser_parse_attribname(
-	struct mie_parser *ctx, b_string *out, struct mie_file_span *loc);
+	struct mie_parser *ctx, fx_string *out, struct mie_file_span *loc);
 MIE_API bool mie_parser_parse_typename(
-	struct mie_parser *ctx, b_string *out, struct mie_file_span *loc);
+	struct mie_parser *ctx, fx_string *out, struct mie_file_span *loc);
 MIE_API bool mie_parser_parse_symname(
-	struct mie_parser *ctx, b_string *out, struct mie_file_span *loc);
+	struct mie_parser *ctx, fx_string *out, struct mie_file_span *loc);
 MIE_API bool mie_parser_parse_string(
-	struct mie_parser *ctx, b_string *out, struct mie_file_span *loc);
-MIE_API bool mie_parser_parse_keyword(struct mie_parser *ctx, const char *kw);
+	struct mie_parser *ctx, fx_string *out, struct mie_file_span *loc);
+MIE_API bool mie_parser_parse_keyword(
+	struct mie_parser *ctx, const char *kw, struct mie_file_span *loc);
 MIE_API bool mie_parser_parse_symbol(
 	struct mie_parser *ctx, enum mie_token_symbol sym);
 MIE_API bool mie_parser_parse_linefeed(struct mie_parser *ctx);
 
 MIE_API bool mie_parser_parse_type(
-	struct mie_parser *ctx, const struct mie_type **out);
+	struct mie_parser *ctx, const char *context,
+	const struct mie_type **out, struct mie_file_span *out_span);
 MIE_API bool mie_parser_parse_type_list(
-	struct mie_parser *ctx, MIE_VECTOR_REF_PARAM(const struct mie_type *, out));
+	struct mie_parser *ctx, const char *context,
+	MIE_VECTOR_REF_PARAM(const struct mie_type *, out),
+	struct mie_file_span *out_span);
 MIE_API bool mie_parser_parse_function_type(
-	struct mie_parser *ctx, struct mie_type **out);
+	struct mie_parser *ctx, const char *context, struct mie_type **out,
+	struct mie_file_span *out_span);
 
 MIE_API bool mie_parser_parse_operand(
 	struct mie_parser *ctx, struct mie_op_arg *out);
@@ -89,30 +120,33 @@ MIE_API bool mie_parser_parse_operand_list(
 	struct mie_parser *ctx, MIE_VECTOR_REF_PARAM(struct mie_op_arg, out));
 
 MIE_API bool mie_parser_parse_parameter(
-	struct mie_parser *ctx, struct mie_op_arg *out);
+	struct mie_parser *ctx, bool include_type, struct mie_op_arg *out,
+	const char *context);
 MIE_API bool mie_parser_parse_parameter_list(
-	struct mie_parser *ctx, MIE_VECTOR_REF_PARAM(struct mie_op_arg, out));
+	struct mie_parser *ctx, bool include_type,
+	MIE_VECTOR_REF_PARAM(struct mie_op_arg, out), const char *context);
 
-MIE_API bool mie_parser_parse_unknown_keyword(struct mie_parser *ctx, b_string *out);
+MIE_API bool mie_parser_parse_unknown_keyword(struct mie_parser *ctx, fx_string *out);
 MIE_API bool mie_parser_parse_unknown_symbol(
 	struct mie_parser *ctx, enum mie_token_symbol sym);
 
 MIE_API bool mie_parser_parse_register(
-	struct mie_parser *ctx, struct mie_name_map *names,
-	struct mie_register *out);
+	struct mie_parser *ctx, struct mie_parser_scope *scope,
+	const char *context, struct mie_register *out);
 MIE_API bool mie_parser_parse_register_list(
-	struct mie_parser *ctx, struct mie_name_map *names,
-	MIE_VECTOR_REF_PARAM(struct mie_register, out));
+	struct mie_parser *ctx, struct mie_parser_scope *scope,
+	const char *context, MIE_VECTOR_REF_PARAM(struct mie_register, out));
 
 MIE_API bool mie_parser_parse_region(
-	struct mie_parser *ctx, struct mie_op *parent, struct mie_region *region);
+	struct mie_parser *ctx, struct mie_op *parent,
+	struct mie_region *region, struct mie_block *first_block);
 MIE_API bool mie_parser_parse_region_list(
 	struct mie_parser *ctx, struct mie_op *parent);
 MIE_API bool mie_parser_parse_anonymous_block(
-	struct mie_parser *ctx, struct mie_name_map *names,
+	struct mie_parser *ctx, struct mie_parser_scope *scope,
 	struct mie_block *block);
 MIE_API bool mie_parser_parse_block(
-	struct mie_parser *ctx, struct mie_name_map *names,
+	struct mie_parser *ctx, struct mie_parser_scope *scope,
 	struct mie_block *block);
 
 MIE_API bool mie_parser_parse_successor(
@@ -122,11 +156,34 @@ MIE_API bool mie_parser_parse_successor_list(
 
 MIE_API bool mie_parser_parse_module(struct mie_parser *ctx, struct mie_module *mod);
 MIE_API bool mie_parser_parse_op(
-	struct mie_parser *ctx, struct mie_name_map *names, struct mie_op *dest);
+	struct mie_parser *ctx, struct mie_parser_scope *scope,
+	struct mie_op *dest);
 
 MIE_API bool mie_parser_parse_attribute(
 	struct mie_parser *ctx, const struct mie_attribute **dest);
 MIE_API bool mie_parser_parse_attribute_map(
 	struct mie_parser *ctx, struct mie_attribute_map *out);
 
+MIE_API struct mie_diag *mie_parser_report_error_simple(
+	struct mie_parser *parser, const char *dialect, unsigned int diag_class,
+	unsigned int msg, const struct mie_file_span *loc);
+MIE_API void mie_parser_report_unexpected_token_v(
+	struct mie_parser *parser,
+	const struct mie_parser_item expected_tokens[], const char *context);
+MIE_API void mie_parser_report_unexpected_token_s(
+	struct mie_parser *parser, const char *expected_token, const char *context);
+static inline void mie_parser_report_unexpected_token(
+	struct mie_parser *parser, unsigned int expected_token, const char *context)
+{
+	struct mie_parser_item t[]
+		= {MIE_PARSE_ITEM_TOKEN(expected_token), MIE_PARSE_ITEM_NONE};
+	mie_parser_report_unexpected_token_v(parser, t, context);
+}
+
+MIE_API struct mie_name *mie_parser_scope_put_name(
+	struct mie_parser_scope *scope, struct mie_name *entry,
+	const char *hint, enum mie_name_map_flags flags);
+MIE_API struct mie_register *mie_parser_scope_find_value(
+	struct mie_parser_scope *scope, const char *name);
+
 #endif

mie/include/mie/parse/token.h

@@ -1,7 +1,7 @@
 #ifndef MIE_PARSE_TOKEN_H_
 #define MIE_PARSE_TOKEN_H_
 
-#include <blue/core/queue.h>
+#include <fx/core/queue.h>
 #include <mie/misc.h>
 #include <mie/parse/file-span.h>
 
@@ -39,6 +39,7 @@ enum mie_token_type {
 	MIE_TOK_TYPENAME = 0x4000u,
 	/* word or name, prefixed with a # hash */
 	MIE_TOK_ATTRIBNAME = 0x8000u,
+	__MIE_TOK_UBOUND = 0x9000u,
 };
 
 enum mie_token_value_type {
@@ -51,7 +52,7 @@ enum mie_token_value_type {
 
 enum mie_token_symbol {
 	MIE_SYM_NONE = 0,
-	MIE_SYM_COLON,
+	MIE_SYM_COLON = __MIE_TOK_UBOUND,
 	MIE_SYM_EQUAL,
 	MIE_SYM_COMMA,
 	MIE_SYM_HYPHEN,
@@ -64,6 +65,7 @@ enum mie_token_symbol {
 	MIE_SYM_TILDE,
 	MIE_SYM_BANG,
 	MIE_SYM_ATSIGN,
+	MIE_SYM_QUESTION,
 	MIE_SYM_LEFT_BRACE,
 	MIE_SYM_RIGHT_BRACE,
 	MIE_SYM_LEFT_BRACKET,
@@ -80,7 +82,7 @@ struct mie_token {
 	struct mie_file_span tok_location;
 	enum mie_token_type tok_type;
 	enum mie_token_value_type tok_value_type;
-	b_queue_entry tok_entry;
+	fx_queue_entry tok_entry;
 
 	union {
 		char *tok_str;

mie/include/mie/print/printer.h

@@ -1,7 +1,7 @@
 #ifndef MIE_PRINT_PRINTER_H_
 #define MIE_PRINT_PRINTER_H_
 
-#include <blue/core/stream.h>
+#include <fx/core/stream.h>
 #include <mie/misc.h>
 #include <mie/status.h>
 
@@ -30,11 +30,11 @@ enum mie_print_flags {
 struct mie_printer {
 	enum mie_print_flags p_flags;
 	struct mie_ctx *p_mie;
-	b_stream *p_stream;
+	fx_stream *p_stream;
 };
 
 MIE_API enum mie_status mie_printer_init(
-	struct mie_printer *printer, struct mie_ctx *ctx, b_stream *out,
+	struct mie_printer *printer, struct mie_ctx *ctx, fx_stream *out,
 	enum mie_print_flags flags);
 
 MIE_API void mie_printer_print_module(

mie/include/mie/rewrite/rewriter.h

@@ -9,6 +9,7 @@
 
 struct mie_op;
 struct mie_ctx;
+struct mie_type;
 struct mie_region;
 struct mie_register;
 struct mie_op_successor;
@@ -41,6 +42,9 @@ MIE_API struct mie_block *mie_rewriter_split_block(
 	const char *name);
 MIE_API struct mie_block *mie_rewriter_create_block(
 	struct mie_rewriter *rw, struct mie_block *insert_before, const char *name);
+MIE_API struct mie_register *mie_rewriter_add_block_parameter(
+	struct mie_rewriter *rw, struct mie_block *block, const char *name,
+	const struct mie_type *type);
 
 MIE_API enum mie_status mie_rewriter_move_block_to_start(
 	struct mie_rewriter *rw, struct mie_block *block,
@@ -91,6 +95,11 @@ MIE_API struct mie_op *mie_rewriter_replace_op(
 MIE_API struct mie_op_successor *mie_rewriter_add_op_successor(
 	struct mie_rewriter *rw, struct mie_op *op, struct mie_block *dest,
 	struct mie_register **args, size_t nr_args);
+MIE_API struct mie_op_arg *mie_rewriter_add_op_successor_arg(
+	struct mie_rewriter *rw, struct mie_op *op, struct mie_op_successor *s,
+	struct mie_register *reg);
+MIE_API struct mie_op_arg *mie_rewriter_add_op_arg(
+	struct mie_rewriter *rw, struct mie_op *op, struct mie_register *reg);
 MIE_API enum mie_status mie_rewriter_erase_op(
 	struct mie_rewriter *rw, struct mie_op *op);
 MIE_API enum mie_status mie_rewriter_move_op_args_to_successor(

mie/include/mie/status.h

@@ -5,7 +5,7 @@
 
 #define MIE_ERROR_VENDOR (ivy_error_vendor())
 
-struct b_error_vendor;
+struct fx_error_vendor;
 
 enum mie_status {
 	MIE_SUCCESS = 0,
@@ -23,6 +23,6 @@ enum mie_status {
 	MIE_ERR_INTERNAL_FAILURE,
 };
 
-MIE_API const struct b_error_vendor *mie_error_vendor(void);
+MIE_API const struct fx_error_vendor *mie_error_vendor(void);
 
 #endif

mie/include/mie/trait/trait-definition.h

@@ -1,7 +1,7 @@
 #ifndef MIE_TRAIT_TRAIT_DEFINITION_H_
 #define MIE_TRAIT_TRAIT_DEFINITION_H_
 
-#include <blue/core/stream.h>
+#include <fx/core/stream.h>
 #include <mie/id.h>
 #include <mie/status.h>
 
@@ -50,7 +50,7 @@ struct mie_trait_definition {
 		struct mie_id_builder *);
 	enum mie_status (*tr_print)(
 		const struct mie_trait_definition *, const struct mie_trait *,
-		b_stream *);
+		fx_stream *);
 	enum mie_status (*tr_cleanup)(
 		const struct mie_trait_definition *, struct mie_trait *);
 	enum mie_status (*tr_validate)(

mie/include/mie/trait/trait-table.h

@@ -1,7 +1,7 @@
 #ifndef MIE_TRAIT_TRAIT_TABLE_H_
 #define MIE_TRAIT_TRAIT_TABLE_H_
 
-#include <blue/core/btree.h>
+#include <fx/core/bst.h>
 #include <mie/id.h>
 #include <mie/misc.h>
 #include <mie/status.h>
@@ -18,7 +18,7 @@ struct mie_trait_table_iterator {
 	int _f;
 	struct mie_id_map_iterator _n;
 	const struct mie_trait_table *_m;
-	b_queue_entry *_e;
+	fx_queue_entry *_e;
 };
 
 MIE_API void mie_trait_table_init(struct mie_trait_table *out);

mie/include/mie/trait/trait.h

@@ -15,6 +15,6 @@ struct mie_trait {
 	const struct mie_trait_definition *tr_def;
 };
 
-MIE_API void mie_trait_print(const struct mie_trait *type, b_stream *out);
+MIE_API void mie_trait_print(const struct mie_trait *type, fx_stream *out);
 
 #endif

mie/include/mie/type/function.h

@@ -1,7 +1,7 @@
 #ifndef MIE_TYPE_FUNCTION_H_
 #define MIE_TYPE_FUNCTION_H_
 
-#include <blue/core/stream.h>
+#include <fx/core/stream.h>
 #include <mie/type/type.h>
 #include <mie/vector.h>
 
@@ -23,4 +23,6 @@ MIE_API void mie_function_type_build_id(
 	size_t nr_in_types, const struct mie_type **out_types,
 	size_t nr_out_types);
 
+MIE_API bool mie_type_is_function(const struct mie_type *ty);
+
 #endif

mie/include/mie/type/storage.h

@@ -1,7 +1,7 @@
 #ifndef MIE_TYPE_STORAGE_H_
 #define MIE_TYPE_STORAGE_H_
 
-#include <blue/core/stream.h>
+#include <fx/core/stream.h>
 #include <mie/type/type.h>
 #include <mie/vector.h>
 
@@ -14,9 +14,12 @@ struct mie_storage_type {
 MIE_API struct mie_storage_type *mie_storage_type_create(void);
 MIE_API void mie_storage_type_add_part(
 	struct mie_storage_type *ty, const struct mie_type *part);
+MIE_API size_t mie_storage_type_get_nr_parts(const struct mie_storage_type *ty);
 
 MIE_API void mie_storage_type_build_id(
 	struct mie_id_builder *builder, const struct mie_type **parts,
 	size_t nr_parts);
 
+MIE_API bool mie_type_is_storage(const struct mie_type *ty);
+
 #endif

mie/include/mie/type/type.h

@@ -1,8 +1,8 @@
 #ifndef MIE_TYPE_TYPE_H_
 #define MIE_TYPE_TYPE_H_
 
-#include <blue/core/stream.h>
-#include <blue/core/stringstream.h>
+#include <fx/core/stream.h>
+#include <fx/core/stringstream.h>
 #include <mie/id.h>
 #include <mie/misc.h>
 #include <stddef.h>
@@ -47,4 +47,7 @@ MIE_API void mie_type_build_id(
 MIE_API void mie_type_generate_id(
 	const struct mie_type *type, const mie_id *ns, mie_id *out);
 
+MIE_API bool mie_type_is(
+	const struct mie_type *ty, const char *dialect_name, const char *type_name);
+
 #endif

mie/include/mie/vector.h

@@ -40,7 +40,7 @@ struct mie_vector_ops {
 /* use this macro to forward your reference to a vector (which you got via
  * MIE_VECTOR_REF_PARAM in your function prototype), to another function whose
  * prototype also uses MIE_VECTOR_REF_PARAM */
-#define MIE_VECTOR_REF2(name) &(name.items), &(name.count), &(name.max)
+#define MIE_VECTOR_REF2(name) name, name##_count, name##_max
 
 /* use these functions if you're accessing a vector directly. */
 #define mie_vector_push_back(vector, ptr, ops)                                 \

mie/interface/interface-definition.c

@@ -1,4 +1,4 @@
-#include <blue/ds/string.h>
+#include <fx/ds/string.h>
 #include <mie/dialect/dialect.h>
 #include <mie/interface/interface-definition.h>
 
@@ -12,7 +12,7 @@ struct mie_interface_definition *mie_interface_definition_create(
 
 	memset(out, 0x0, sizeof *out);
 
-	out->if_name = b_strdup(name);
+	out->if_name = fx_strdup(name);
 	if (!out->if_name) {
 		free(out);
 		return NULL;
@@ -21,7 +21,7 @@ struct mie_interface_definition *mie_interface_definition_create(
 	out->if_parent = parent;
 	out->if_size = 0;
 
-	b_rope name_rope = B_ROPE_CSTR(name);
+	fx_rope name_rope = FX_ROPE_CSTR(name);
 	mie_id_map_put(&parent->d_interfaces, &out->if_id, &name_rope);
 
 	return out;

mie/interface/interface-map.c

@@ -49,6 +49,6 @@ const struct mie_interface *mie_interface_map_get(
 
 	const mie_id *result = mie_id_map_get(&map->m_entries, &id);
 	const struct mie_interface *iface
-		= b_unbox(const struct mie_interface, result, if_id);
+		= fx_unbox(const struct mie_interface, result, if_id);
 	return iface;
 }

mie/ir/block.c

@@ -4,12 +4,12 @@
 
 struct mie_op *mie_block_get_first_op(const struct mie_block *block)
 {
-	b_queue_entry *entry = b_queue_first(&block->b_ops);
+	fx_queue_entry *entry = fx_queue_first(&block->b_ops);
 	if (!entry) {
 		return NULL;
 	}
 
-	return b_unbox(struct mie_op, entry, op_entry);
+	return fx_unbox(struct mie_op, entry, op_entry);
 }
 
 struct mie_op *mie_block_get_prev_op(
@@ -19,12 +19,12 @@ struct mie_op *mie_block_get_prev_op(
 		return NULL;
 	}
 
-	b_queue_entry *entry = b_queue_prev(&before->op_entry);
+	fx_queue_entry *entry = fx_queue_prev(&before->op_entry);
 	if (!entry) {
 		return NULL;
 	}
 
-	return b_unbox(struct mie_op, entry, op_entry);
+	return fx_unbox(struct mie_op, entry, op_entry);
 }
 
 struct mie_op *mie_block_get_next_op(
@@ -34,28 +34,28 @@ struct mie_op *mie_block_get_next_op(
 		return NULL;
 	}
 
-	b_queue_entry *entry = b_queue_next(&after->op_entry);
+	fx_queue_entry *entry = fx_queue_next(&after->op_entry);
 	if (!entry) {
 		return NULL;
 	}
 
-	return b_unbox(struct mie_op, entry, op_entry);
+	return fx_unbox(struct mie_op, entry, op_entry);
 }
 
 struct mie_op *mie_block_get_last_op(const struct mie_block *block)
 {
-	b_queue_entry *entry = b_queue_last(&block->b_ops);
+	fx_queue_entry *entry = fx_queue_last(&block->b_ops);
 	if (!entry) {
 		return NULL;
 	}
 
-	return b_unbox(struct mie_op, entry, op_entry);
+	return fx_unbox(struct mie_op, entry, op_entry);
 }
 
 struct mie_op *mie_block_get_terminator(const struct mie_block *block)
 {
-	b_queue_entry *op_entry = b_queue_last(&block->b_ops);
-	return b_unbox(struct mie_op, op_entry, op_entry);
+	fx_queue_entry *op_entry = fx_queue_last(&block->b_ops);
+	return fx_unbox(struct mie_op, op_entry, op_entry);
 }
 
 struct mie_op_successor *mie_block_get_first_successor(const struct mie_block *block)
@@ -200,7 +200,7 @@ struct mie_op *mie_block_add_op(struct mie_block *block)
 	mie_op_init(op);
 	op->op_container = block;
 
-	b_queue_push_back(&block->b_ops, &op->op_entry);
+	fx_queue_push_back(&block->b_ops, &op->op_entry);
 
 	return op;
 }
@@ -220,9 +220,9 @@ struct mie_op *mie_block_add_op_after(struct mie_block *block, struct mie_op *af
 	op->op_container = block;
 
 	if (after) {
-		b_queue_insert_after(&block->b_ops, &op->op_entry, &after->op_entry);
+		fx_queue_insert_after(&block->b_ops, &op->op_entry, &after->op_entry);
 	} else {
-		b_queue_push_back(&block->b_ops, &op->op_entry);
+		fx_queue_push_back(&block->b_ops, &op->op_entry);
 	}
 
 	return op;
@@ -243,7 +243,7 @@ struct mie_register *mie_block_find_register(
 	const struct mie_block *block, const char *name,
 	const struct mie_op *start_point)
 {
-	const b_queue_entry *entry = b_queue_last(&block->b_ops);
+	const fx_queue_entry *entry = fx_queue_last(&block->b_ops);
 	if (start_point) {
 		entry = &start_point->op_entry;
 	}
@@ -255,13 +255,13 @@ struct mie_register *mie_block_find_register(
 	}
 
 	while (entry) {
-		struct mie_op *op = b_unbox(struct mie_op, entry, op_entry);
+		struct mie_op *op = fx_unbox(struct mie_op, entry, op_entry);
 		struct mie_register *reg = mie_op_get_result_with_name(op, name);
 		if (reg) {
 			return reg;
 		}
 
-		entry = b_queue_prev(entry);
+		entry = fx_queue_prev(entry);
 	}
 
 	return NULL;

mie/ir/builder.c

@@ -7,7 +7,7 @@
 #include <mie/ir/region.h>
 
 struct builder_scope {
-	b_queue_entry s_entry;
+	fx_queue_entry s_entry;
 	struct mie_op *s_op;
 	struct mie_region *s_region;
 	struct mie_block *s_block;
@@ -16,7 +16,7 @@ struct builder_scope {
 struct mie_builder {
 	struct mie_emitter b_base;
 	struct mie_ctx *b_ctx;
-	b_queue b_scope_stack;
+	fx_queue b_scope_stack;
 	struct mie_op *b_root;
 	struct mie_op *b_prev_op;
 };
@@ -50,16 +50,16 @@ struct mie_ctx *mie_builder_get_ctx(struct mie_builder *builder)
 
 static struct mie_name_map *get_current_name_map(struct mie_builder *builder)
 {
-	b_queue_entry *cur = b_queue_last(&builder->b_scope_stack);
+	fx_queue_entry *cur = fx_queue_last(&builder->b_scope_stack);
 	while (cur) {
 		struct builder_scope *scope
-			= b_unbox(struct builder_scope, cur, s_entry);
+			= fx_unbox(struct builder_scope, cur, s_entry);
 
 		if (scope->s_region && scope->s_region->r_names) {
 			return scope->s_region->r_names;
 		}
 
-		cur = b_queue_prev(cur);
+		cur = fx_queue_prev(cur);
 	}
 
 	return NULL;
@@ -67,13 +67,13 @@ static struct mie_name_map *get_current_name_map(struct mie_builder *builder)
 
 struct mie_block *mie_builder_get_current_block(struct mie_builder *builder)
 {
-	b_queue_entry *entry = b_queue_last(&builder->b_scope_stack);
+	fx_queue_entry *entry = fx_queue_last(&builder->b_scope_stack);
 	if (!entry) {
 		return NULL;
 	}
 
 	struct builder_scope *scope
-		= b_unbox(struct builder_scope, entry, s_entry);
+		= fx_unbox(struct builder_scope, entry, s_entry);
 
 	return scope->s_block;
 }
@@ -114,19 +114,19 @@ void mie_builder_step_into_block(struct mie_builder *builder, struct mie_block *
 	scope->s_region = block->b_parent;
 	scope->s_op = scope->s_region->r_parent;
 
-	b_queue_push_back(&builder->b_scope_stack, &scope->s_entry);
+	fx_queue_push_back(&builder->b_scope_stack, &scope->s_entry);
 }
 
 void mie_builder_step_out(struct mie_builder *builder)
 {
-	b_queue_entry *entry = b_queue_last(&builder->b_scope_stack);
+	fx_queue_entry *entry = fx_queue_last(&builder->b_scope_stack);
 	if (!entry) {
 		return;
 	}
 
 	struct builder_scope *scope
-		= b_unbox(struct builder_scope, entry, s_entry);
-	b_queue_delete(&builder->b_scope_stack, entry);
+		= fx_unbox(struct builder_scope, entry, s_entry);
+	fx_queue_delete(&builder->b_scope_stack, entry);
 	free(scope);
 }
 
@@ -151,7 +151,7 @@ struct mie_op *mie_builder_put_op(
 		arg->arg_flags = MIE_OP_F_ARG_RESOLVED;
 		arg->arg_value.u_reg = args[i];
 		arg->arg_value.u_user = op;
-		b_queue_push_back(&args[i]->reg_use, &arg->arg_value.u_entry);
+		fx_queue_push_back(&args[i]->reg_use, &arg->arg_value.u_entry);
 	}
 
 	return op;

mie/ir/op-definition.c

@@ -1,4 +1,4 @@
-#include <blue/ds/string.h>
+#include <fx/ds/string.h>
 #include <mie/dialect/dialect.h>
 #include <mie/ir/op-definition.h>
 
@@ -10,7 +10,7 @@ struct mie_op_definition *mie_op_definition_create(
 		return NULL;
 	}
 
-	out->op_name = b_strdup(name);
+	out->op_name = fx_strdup(name);
 	if (!out->op_name) {
 		free(out);
 		return NULL;
@@ -20,7 +20,7 @@ struct mie_op_definition *mie_op_definition_create(
 	mie_trait_table_init(&out->op_traits);
 	mie_interface_map_init(&out->op_iface);
 
-	b_rope name_rope = B_ROPE_CSTR(name);
+	fx_rope name_rope = FX_ROPE_CSTR(name);
 	mie_id_map_put(&parent->d_ops, &out->op_id, &name_rope);
 
 	return out;

mie/ir/op.c

@@ -15,7 +15,7 @@ static enum mie_status op_arg_cleanup(void *p)
 	struct mie_op_arg *arg = p;
 
 	if (arg->arg_flags & MIE_OP_F_ARG_RESOLVED) {
-		b_queue_delete(
+		fx_queue_delete(
 			&arg->arg_value.u_reg->reg_use, &arg->arg_value.u_entry);
 	}
 
@@ -115,7 +115,7 @@ struct mie_op_successor *mie_op_add_successor(
 		arg->arg_flags = MIE_OP_F_ARG_RESOLVED;
 		arg->arg_value.u_reg = args[i];
 		arg->arg_value.u_user = op;
-		b_queue_push_back(&args[i]->reg_use, &arg->arg_value.u_entry);
+		fx_queue_push_back(&args[i]->reg_use, &arg->arg_value.u_entry);
 	}
 
 	return s;
@@ -147,7 +147,7 @@ struct mie_region *mie_op_add_region(struct mie_op *op)
 		region->r_names = mie_name_map_create(NULL);
 	}
 
-	b_queue_push_back(&op->op_regions, &region->r_entry);
+	fx_queue_push_back(&op->op_regions, &region->r_entry);
 
 	return region;
 }
@@ -202,12 +202,12 @@ bool mie_op_has_interface(
 
 struct mie_region *mie_op_get_first_region(const struct mie_op *op)
 {
-	b_queue_entry *entry = b_queue_first(&op->op_regions);
+	fx_queue_entry *entry = fx_queue_first(&op->op_regions);
 	if (!entry) {
 		return NULL;
 	}
 
-	return b_unbox(struct mie_region, entry, r_entry);
+	return fx_unbox(struct mie_region, entry, r_entry);
 }
 
 struct mie_region *mie_op_get_prev_region(
@@ -217,12 +217,12 @@ struct mie_region *mie_op_get_prev_region(
 		return NULL;
 	}
 
-	b_queue_entry *entry = b_queue_prev(&before->r_entry);
+	fx_queue_entry *entry = fx_queue_prev(&before->r_entry);
 	if (!entry) {
 		return NULL;
 	}
 
-	return b_unbox(struct mie_region, entry, r_entry);
+	return fx_unbox(struct mie_region, entry, r_entry);
 }
 
 struct mie_region *mie_op_get_next_region(
@@ -232,22 +232,22 @@ struct mie_region *mie_op_get_next_region(
 		return NULL;
 	}
 
-	b_queue_entry *entry = b_queue_next(&after->r_entry);
+	fx_queue_entry *entry = fx_queue_next(&after->r_entry);
 	if (!entry) {
 		return NULL;
 	}
 
-	return b_unbox(struct mie_region, entry, r_entry);
+	return fx_unbox(struct mie_region, entry, r_entry);
 }
 
 struct mie_region *mie_op_get_last_region(const struct mie_op *op)
 {
-	b_queue_entry *entry = b_queue_last(&op->op_regions);
+	fx_queue_entry *entry = fx_queue_last(&op->op_regions);
 	if (!entry) {
 		return NULL;
 	}
 
-	return b_unbox(struct mie_region, entry, r_entry);
+	return fx_unbox(struct mie_region, entry, r_entry);
 }
 
 struct mie_register *mie_op_get_arg(const struct mie_op *op, size_t index)
@@ -276,6 +276,38 @@ struct mie_register *mie_op_get_result_with_name(
 	return NULL;
 }
 
+void mie_op_get_args_span(const struct mie_op *op, struct mie_file_span *result)
+{
+	memset(result, 0x0, sizeof *result);
+
+	size_t nr = MIE_VECTOR_COUNT(op->op_args);
+	if (!nr) {
+		return;
+	}
+
+	const struct mie_op_arg *first = &op->op_args.items[0];
+	const struct mie_op_arg *last = &op->op_args.items[nr - 1];
+
+	result->s_start = first->arg_span.s_start;
+	result->s_end = last->arg_span.s_end;
+}
+
+void mie_op_get_results_span(const struct mie_op *op, struct mie_file_span *result)
+{
+	memset(result, 0x0, sizeof *result);
+
+	size_t nr = MIE_VECTOR_COUNT(op->op_result);
+	if (!nr) {
+		return;
+	}
+
+	const struct mie_register *first = &op->op_result.items[0];
+	const struct mie_register *last = &op->op_result.items[nr - 1];
+
+	result->s_start = first->reg_span.s_start;
+	result->s_end = last->reg_span.s_end;
+}
+
 struct mie_op *mie_op_get_first_child_op(const struct mie_op *op)
 {
 	struct mie_region *first_region = mie_op_get_first_region(op);

mie/ir/region.c

@@ -10,12 +10,12 @@
 
 struct mie_block *mie_region_get_first_block(const struct mie_region *region)
 {
-	b_queue_entry *entry = b_queue_first(&region->r_blocks);
+	fx_queue_entry *entry = fx_queue_first(&region->r_blocks);
 	if (!entry) {
 		return NULL;
 	}
 
-	return b_unbox(struct mie_block, entry, b_entry);
+	return fx_unbox(struct mie_block, entry, b_entry);
 }
 
 struct mie_block *mie_region_get_prev_block(
@@ -25,12 +25,12 @@ struct mie_block *mie_region_get_prev_block(
 		return NULL;
 	}
 
-	b_queue_entry *entry = b_queue_prev(&before->b_entry);
+	fx_queue_entry *entry = fx_queue_prev(&before->b_entry);
 	if (!entry) {
 		return NULL;
 	}
 
-	return b_unbox(struct mie_block, entry, b_entry);
+	return fx_unbox(struct mie_block, entry, b_entry);
 }
 
 struct mie_block *mie_region_get_next_block(
@@ -40,22 +40,22 @@ struct mie_block *mie_region_get_next_block(
 		return NULL;
 	}
 
-	b_queue_entry *entry = b_queue_next(&after->b_entry);
+	fx_queue_entry *entry = fx_queue_next(&after->b_entry);
 	if (!entry) {
 		return NULL;
 	}
 
-	return b_unbox(struct mie_block, entry, b_entry);
+	return fx_unbox(struct mie_block, entry, b_entry);
 }
 
 struct mie_block *mie_region_get_last_block(const struct mie_region *region)
 {
-	b_queue_entry *entry = b_queue_last(&region->r_blocks);
+	fx_queue_entry *entry = fx_queue_last(&region->r_blocks);
 	if (!entry) {
 		return NULL;
 	}
 
-	return b_unbox(struct mie_block, entry, b_entry);
+	return fx_unbox(struct mie_block, entry, b_entry);
 }
 
 struct mie_block *mie_region_add_block(struct mie_region *region)
@@ -70,7 +70,28 @@ struct mie_block *mie_region_add_block(struct mie_region *region)
 	block->b_parent = region;
 	block->b_id = MIE_BLOCK_ID_INVALID;
 
-	b_queue_push_back(&region->r_blocks, &block->b_entry);
+	fx_queue_push_back(&region->r_blocks, &block->b_entry);
+
+	return block;
+}
+
+struct mie_block *mie_region_add_block_before(
+	struct mie_region *region, struct mie_block *before)
+{
+	if (before->b_parent != region) {
+		return NULL;
+	}
+
+	struct mie_block *block = malloc(sizeof *block);
+
+	if (!block) {
+		return NULL;
+	}
+
+	memset(block, 0x0, sizeof *block);
+	block->b_parent = region;
+
+	fx_queue_insert_before(&region->r_blocks, &block->b_entry, &before->b_entry);
 
 	return block;
 }
@@ -91,7 +112,7 @@ struct mie_block *mie_region_add_block_after(
 	memset(block, 0x0, sizeof *block);
 	block->b_parent = region;
 
-	b_queue_insert_after(&region->r_blocks, &block->b_entry, &after->b_entry);
+	fx_queue_insert_after(&region->r_blocks, &block->b_entry, &after->b_entry);
 
 	return block;
 }
@@ -99,14 +120,15 @@ struct mie_block *mie_region_add_block_after(
 struct mie_block *mie_region_find_block(
 	const struct mie_region *region, const char *name)
 {
-	b_queue_entry *cur = b_queue_first(&region->r_blocks);
+	fx_queue_entry *cur = fx_queue_first(&region->r_blocks);
 	while (cur) {
-		struct mie_block *block = b_unbox(struct mie_block, cur, b_entry);
-		if (!strcmp(block->b_name.n_str, name)) {
+		struct mie_block *block = fx_unbox(struct mie_block, cur, b_entry);
+		const char *block_name = block->b_name.n_str;
+		if (block_name && !strcmp(block_name, name)) {
 			return block;
 		}
 
-		cur = b_queue_next(cur);
+		cur = fx_queue_next(cur);
 	}
 
 	return NULL;
@@ -115,17 +137,17 @@ struct mie_block *mie_region_find_block(
 struct mie_register *mie_region_find_register(
 	const struct mie_region *region, const char *name)
 {
-	b_queue_entry *cur = b_queue_first(&region->r_blocks);
+	fx_queue_entry *cur = fx_queue_first(&region->r_blocks);
 
 	while (cur) {
-		struct mie_block *block = b_unbox(struct mie_block, cur, b_entry);
+		struct mie_block *block = fx_unbox(struct mie_block, cur, b_entry);
 		struct mie_register *reg
 			= mie_block_find_register(block, name, NULL);
 		if (reg) {
 			return reg;
 		}
 
-		cur = b_queue_next(cur);
+		cur = fx_queue_next(cur);
 	}
 
 	return NULL;

mie/ir/register.c

@@ -1,5 +1,5 @@
 #include <assert.h>
-#include <blue/core/queue.h>
+#include <fx/core/queue.h>
 #include <mie/ir/register.h>
 
 static enum mie_status reg_cleanup(void *p)
@@ -57,13 +57,13 @@ void mie_register_use_move(
 	memmove(dest, src, sizeof *dest);
 
 	if (src->u_reg) {
-		b_queue_move(&src->u_reg->reg_use, &src->u_entry, &dest->u_entry);
+		fx_queue_move(&src->u_reg->reg_use, &src->u_entry, &dest->u_entry);
 	}
 }
 
 void mie_register_use_cleanup(struct mie_register_use *use)
 {
 	if (use->u_reg) {
-		b_queue_delete(&use->u_reg->reg_use, &use->u_entry);
+		fx_queue_delete(&use->u_reg->reg_use, &use->u_entry);
 	}
 }

mie/ir/resolve.c

@@ -15,7 +15,7 @@ enum register_find_result {
 	REG_FIND_ISOLATED,
 };
 
-bool mie_op_resolve_self(struct mie_op *op, struct mie_ctx *ctx)
+bool mie_resolve_op_self(struct mie_op *op, struct mie_ctx *ctx)
 {
 	if (op->op_flags & MIE_OP_F_OP_RESOLVED) {
 		return true;
@@ -101,6 +101,7 @@ static bool resolve_arg(
 	struct mie_block *block = op->op_container;
 	struct mie_op *search_start = op;
 	struct mie_register *reg = NULL;
+	bool cfg = (block->b_idom != NULL);
 
 	while (block) {
 		reg = mie_block_find_register(block, arg_name, search_start);
@@ -119,13 +120,25 @@ static bool resolve_arg(
 		memset(&arg->arg_value, 0x0, sizeof arg->arg_value);
 		arg->arg_value.u_reg = reg;
 		arg->arg_value.u_user = op;
-		b_queue_push_back(&reg->reg_use, &arg->arg_value.u_entry);
+		fx_queue_push_back(&reg->reg_use, &arg->arg_value.u_entry);
 		return true;
 	}
 
 	enum register_find_result find_result
 		= find_register_wide(op, arg_name, &reg);
 
+	if (!cfg && REG_FIND_UNDOMINATED) {
+		/* this isn't a cfg (yet), so ignore dominance-relaced resolution issues */
+		free(arg->arg_unresolved.reg_name);
+		arg->arg_flags |= MIE_OP_F_ARG_RESOLVED;
+
+		memset(&arg->arg_value, 0x0, sizeof arg->arg_value);
+		arg->arg_value.u_reg = reg;
+		arg->arg_value.u_user = op;
+		fx_queue_push_back(&reg->reg_use, &arg->arg_value.u_entry);
+		return true;
+	}
+
 	struct mie_diag *diag = mie_ctx_push_diag(
 		ctx, op->op_src, &arg->arg_span.s_start, "builtin",
 		MIE_BUILTIN_E_UNRESOLVED_VALUE);
@@ -228,7 +241,7 @@ static bool resolve_successor(
 	return true;
 }
 
-bool mie_op_resolve_args(struct mie_op *op, struct mie_ctx *ctx)
+bool mie_resolve_op_args(struct mie_op *op, struct mie_ctx *ctx)
 {
 	bool ok = true;
 
@@ -250,7 +263,7 @@ bool mie_op_resolve_args(struct mie_op *op, struct mie_ctx *ctx)
 	return ok;
 }
 
-bool mie_op_resolve_successors(struct mie_op *op, struct mie_ctx *ctx)
+bool mie_resolve_op_successors(struct mie_op *op, struct mie_ctx *ctx)
 {
 	bool ok = true;
 

mie/ir/walk.c

@@ -35,15 +35,15 @@ static void push_walk_item(
 	}
 
 	memcpy(i, item, sizeof *i);
-	b_queue_push_back(&walker->w_stack, &i->_e);
+	fx_queue_push_back(&walker->w_stack, &i->_e);
 }
 
 static void pop_walk_item(struct mie_walker *walker)
 {
-	b_queue_entry *entry = b_queue_pop_back(&walker->w_stack);
+	fx_queue_entry *entry = fx_queue_pop_back(&walker->w_stack);
 	if (entry) {
 		struct mie_walk_item *item
-			= b_unbox(struct mie_walk_item, entry, _e);
+			= fx_unbox(struct mie_walk_item, entry, _e);
 		free(item);
 	}
 }
@@ -65,12 +65,12 @@ static struct mie_walk_item *current_item(struct mie_walker *walker)
 		return eof ? item : NULL;
 	}
 
-	b_queue_entry *entry = b_queue_last(&walker->w_stack);
+	fx_queue_entry *entry = fx_queue_last(&walker->w_stack);
 	if (!entry) {
 		return NULL;
 	}
 
-	item = b_unbox(struct mie_walk_item, entry, _e);
+	item = fx_unbox(struct mie_walk_item, entry, _e);
 	return item->i_type != MIE_WALK_ITEM_NONE ? item : NULL;
 }
 
@@ -144,7 +144,7 @@ static bool walk_item_get_first_child(
 	struct mie_walk_item *child)
 {
 	bool ok = false;
-	b_queue_entry *entry = NULL;
+	fx_queue_entry *entry = NULL;
 
 	switch (item->i_type) {
 	case MIE_WALK_ITEM_OP:
@@ -184,7 +184,7 @@ static bool walk_item_get_last_child(
 	struct mie_walk_item *child)
 {
 	bool ok = false;
-	b_queue_entry *entry = NULL;
+	fx_queue_entry *entry = NULL;
 
 	switch (item->i_type) {
 	case MIE_WALK_ITEM_OP:
@@ -230,7 +230,7 @@ static bool walk_item_get_next_sibling(
 	sibling->i_type = item->i_type;
 
 	size_t index = 0;
-	b_queue_entry *entry = NULL;
+	fx_queue_entry *entry = NULL;
 	struct mie_region *parent_r = NULL;
 	struct mie_block *parent_b = NULL;
 	struct mie_op *parent_o = NULL;
@@ -316,11 +316,11 @@ static bool walk_item_get_prev_sibling(
 
 static void print_stack(struct mie_walker *walker)
 {
-	b_queue_entry *entry = b_queue_last(&walker->w_stack);
+	fx_queue_entry *entry = fx_queue_last(&walker->w_stack);
 
 	while (entry) {
 		struct mie_walk_item *item
-			= b_unbox(struct mie_walk_item, entry, _e);
+			= fx_unbox(struct mie_walk_item, entry, _e);
 
 		switch (item->i_type) {
 		case MIE_WALK_ITEM_OP:
@@ -347,7 +347,7 @@ static void print_stack(struct mie_walker *walker)
 
 		printf("\n");
 
-		entry = b_queue_prev(entry);
+		entry = fx_queue_prev(entry);
 	}
 }
 

mie/lt-idom.c

@@ -26,9 +26,9 @@ struct lt_ctx {
 };
 
 #if 0
-static B_BTREE_DEFINE_SIMPLE_INSERT(struct mie_block, b_node, b_id, put_block_by_id);
-static B_BTREE_DEFINE_SIMPLE_GET(
-	struct mie_block, size_t, b_node, b_id, get_block_by_id);
+static FX_BST_DEFINE_SIMPLE_INSERT(struct mie_block, fx_node, b_id, put_block_by_id);
+static FX_BST_DEFINE_SIMPLE_GET(
+	struct mie_block, size_t, fx_node, b_id, get_block_by_id);
 #endif
 
 static void set_add(struct set *set, unsigned int val)
@@ -148,16 +148,16 @@ static unsigned int eval(struct lt_ctx *ctx, unsigned int v)
 
 static void reset_block_relationship_metadata(struct mie_region *region)
 {
-	b_queue_entry *cur = b_queue_first(&region->r_blocks);
+	fx_queue_entry *cur = fx_queue_first(&region->r_blocks);
 	while (cur) {
-		struct mie_block *block = b_unbox(struct mie_block, cur, b_entry);
+		struct mie_block *block = fx_unbox(struct mie_block, cur, b_entry);
 
 		block->b_id = MIE_BLOCK_ID_INVALID;
 		block->b_idom = NULL;
 		// block->b_sdom   = block->b_dfs_parent = NULL;
 		mie_vector_destroy(block->b_ipred, NULL);
 
-		cur = b_queue_next(cur);
+		cur = fx_queue_next(cur);
 	}
 
 	memset(&region->r_blocks_s, 0x0, sizeof region->r_blocks_s);
@@ -191,7 +191,7 @@ static void lt_ctx_cleanup(struct lt_ctx *ctx)
 void mie_region_refresh_dominance(struct mie_region *region)
 {
 	struct lt_ctx ctx;
-	size_t nr_nodes = b_queue_length(&region->r_blocks);
+	size_t nr_nodes = fx_queue_length(&region->r_blocks);
 	lt_ctx_init(&ctx, nr_nodes);
 
 	struct mie_block *root = mie_region_get_first_block(region);

mie/name.c

@@ -1,12 +1,12 @@
-#include <blue/core/rope.h>
-#include <blue/ds/string.h>
+#include <fx/core/rope.h>
+#include <fx/ds/string.h>
 #include <mie/name.h>
 #include <stdlib.h>
 #include <string.h>
 
-static B_BTREE_DEFINE_SIMPLE_INSERT(
+static FX_BST_DEFINE_SIMPLE_INSERT(
 	struct mie_name_map_entry, e_node, e_hash, put_entry);
-static B_BTREE_DEFINE_SIMPLE_GET(
+static FX_BST_DEFINE_SIMPLE_GET(
 	struct mie_name_map_entry, uint64_t, e_node, e_hash, get_entry);
 
 static struct mie_name_bucket *create_bucket(void)
@@ -26,11 +26,11 @@ static struct mie_name_bucket *create_bucket(void)
 
 static void destroy_bucket(struct mie_name_bucket *bucket)
 {
-	b_queue_entry *entry = b_queue_first(&bucket->b_names);
+	fx_queue_entry *entry = fx_queue_first(&bucket->b_names);
 
 	while (entry) {
-		b_queue_entry *next = b_queue_next(entry);
-		b_queue_delete(&bucket->b_names, entry);
+		fx_queue_entry *next = fx_queue_next(entry);
+		fx_queue_delete(&bucket->b_names, entry);
 		entry = next;
 	}
 
@@ -52,13 +52,13 @@ struct mie_name_map *mie_name_map_create(const struct mie_name_map *parent)
 
 void mie_name_map_destroy(struct mie_name_map *map)
 {
-	b_btree_node *node = b_btree_first(&map->m_entries);
+	fx_bst_node *node = fx_bst_first(&map->m_entries);
 
 	while (node) {
 		struct mie_name_map_entry *entry
-			= b_unbox(struct mie_name_map_entry, node, e_node);
-		b_btree_node *next = b_btree_next(node);
-		b_btree_delete(&map->m_entries, node);
+			= fx_unbox(struct mie_name_map_entry, node, e_node);
+		fx_bst_node *next = fx_bst_next(node);
+		fx_bst_delete(&map->m_entries, node);
 		if (entry->e_type == MIE_NAME_MAP_E_BUCKET) {
 			struct mie_name_bucket *bucket
 				= (struct mie_name_bucket *)entry;
@@ -71,36 +71,36 @@ void mie_name_map_destroy(struct mie_name_map *map)
 	free(map);
 }
 
-static b_status put_name_in_bucket(
+static fx_status put_name_in_bucket(
 	struct mie_name_bucket *bucket, struct mie_name *name)
 {
-	b_queue_entry *entry = b_queue_first(&bucket->b_names);
+	fx_queue_entry *entry = fx_queue_first(&bucket->b_names);
 
 	while (entry) {
-		struct mie_name *cur = (struct mie_name *)b_unbox(
+		struct mie_name *cur = (struct mie_name *)fx_unbox(
 			struct mie_name_map_entry, entry, e_entry);
 
 		if (!strcmp(cur->n_str, name->n_str)) {
-			return B_ERR_NAME_EXISTS;
+			return FX_ERR_NAME_EXISTS;
 		}
 
-		entry = b_queue_next(entry);
+		entry = fx_queue_next(entry);
 	}
 
-	b_queue_push_back(&bucket->b_names, &name->n_base.e_entry);
+	fx_queue_push_back(&bucket->b_names, &name->n_base.e_entry);
 	name->n_bucket = bucket;
 
-	return B_SUCCESS;
+	return FX_SUCCESS;
 }
 
-static b_status put_name(struct mie_name_map *map, struct mie_name *name)
+static fx_status put_name(struct mie_name_map *map, struct mie_name *name)
 {
 	struct mie_name_map_entry *entry
 		= get_entry(&map->m_entries, name->n_base.e_hash);
 
 	if (!entry) {
 		put_entry(&map->m_entries, &name->n_base);
-		return B_SUCCESS;
+		return FX_SUCCESS;
 	}
 
 	if (entry->e_type == MIE_NAME_MAP_E_BUCKET) {
@@ -111,26 +111,26 @@ static b_status put_name(struct mie_name_map *map, struct mie_name *name)
 	struct mie_name *existing_name = (struct mie_name *)entry;
 
 	if (!strcmp(existing_name->n_str, name->n_str)) {
-		return B_ERR_NAME_EXISTS;
+		return FX_ERR_NAME_EXISTS;
 	}
 
 	struct mie_name_bucket *bucket = create_bucket();
 	if (!bucket) {
-		return B_ERR_NO_MEMORY;
+		return FX_ERR_NO_MEMORY;
 	}
 
-	b_btree_delete(&map->m_entries, &entry->e_node);
-	entry->e_entry = B_QUEUE_ENTRY_INIT;
+	fx_bst_delete(&map->m_entries, &entry->e_node);
+	entry->e_entry = FX_QUEUE_ENTRY_INIT;
 
 	bucket->b_base.e_hash = name->n_base.e_hash;
-	b_queue_push_back(&bucket->b_names, &existing_name->n_base.e_entry);
-	b_queue_push_back(&bucket->b_names, &name->n_base.e_entry);
+	fx_queue_push_back(&bucket->b_names, &existing_name->n_base.e_entry);
+	fx_queue_push_back(&bucket->b_names, &name->n_base.e_entry);
 
 	existing_name->n_bucket = name->n_bucket = bucket;
 
 	put_entry(&map->m_entries, &bucket->b_base);
 
-	return B_SUCCESS;
+	return FX_SUCCESS;
 }
 
 static bool check_name(const struct mie_name *name, const char *s, uint64_t hash)
@@ -141,16 +141,16 @@ static bool check_name(const struct mie_name *name, const char *s, uint64_t hash
 static const struct mie_name *find_name_in_bucket(
 	const struct mie_name_bucket *bucket, const char *s, uint64_t hash)
 {
-	b_queue_entry *entry = b_queue_first(&bucket->b_names);
+	fx_queue_entry *entry = fx_queue_first(&bucket->b_names);
 	while (entry) {
 		struct mie_name_map_entry *map_entry
-			= b_unbox(struct mie_name_map_entry, entry, e_entry);
+			= fx_unbox(struct mie_name_map_entry, entry, e_entry);
 		struct mie_name *name = (struct mie_name *)map_entry;
 		if (check_name(name, s, hash)) {
 			return name;
 		}
 
-		entry = b_queue_next(entry);
+		entry = fx_queue_next(entry);
 	}
 
 	return NULL;
@@ -194,7 +194,7 @@ const struct mie_name *mie_name_map_get(
 	const struct mie_name_map *map, const char *name,
 	enum mie_name_map_flags flags)
 {
-	uint64_t name_hash = b_hash_cstr(name);
+	uint64_t name_hash = fx_hash_cstr(name);
 	while (map) {
 		const struct mie_name *result = name_map_get(map, name, name_hash);
 		if (result) {
@@ -214,24 +214,24 @@ struct mie_name *mie_name_map_put(
 	memset(entry, 0x0, sizeof *entry);
 	entry->n_base.e_type = MIE_NAME_MAP_E_NAME;
 
-	b_rope base = {};
+	fx_rope base = {};
 
 	if (hint) {
-		b_rope_init_cstr_borrowed(&base, hint);
+		fx_rope_init_cstr_borrowed(&base, hint);
 	}
 
 	char str[256];
 
 	if (hint) {
 		/* first try just the hint on its own */
-		b_rope_to_cstr(&base, str, sizeof str);
+		fx_rope_to_cstr(&base, str, sizeof str);
 		entry->n_str = str;
 		entry->n_base.e_hash = base.r_v.v_cstr.hash;
-		b_status status = put_name(map, entry);
+		fx_status status = put_name(map, entry);
 
-		if (B_OK(status)) {
+		if (FX_OK(status)) {
 			entry->n_parent = map;
-			entry->n_str = b_strdup(str);
+			entry->n_str = fx_strdup(str);
 			return entry;
 		}
 	}
@@ -244,15 +244,15 @@ struct mie_name *mie_name_map_put(
 
 	/* that name already exists, use a suffix to make the name unique.
 	 * alternately, no hint was specified, so it's up to us to generate the name */
-	b_rope dot = B_ROPE_CHAR('.');
-	b_rope suffix = B_ROPE_UINT(0);
-	b_rope unique_name;
+	fx_rope dot = FX_ROPE_CHAR('.');
+	fx_rope suffix = FX_ROPE_UINT(0);
+	fx_rope unique_name;
 
 	if (hint) {
-		const b_rope *parts[] = {&base, &dot, &suffix};
-		b_rope_join(&unique_name, parts, sizeof parts / sizeof parts[0]);
+		const fx_rope *parts[] = {&base, &dot, &suffix};
+		fx_rope_join(&unique_name, parts, sizeof parts / sizeof parts[0]);
 	} else {
-		b_rope_concat(&unique_name, &base, &suffix);
+		fx_rope_concat(&unique_name, &base, &suffix);
 	}
 
 	size_t i = 0;
@@ -263,21 +263,21 @@ struct mie_name *mie_name_map_put(
 	for (;; i++) {
 		suffix.r_v.v_uint = i;
 
-		b_rope_to_cstr(&unique_name, str, sizeof str);
+		fx_rope_to_cstr(&unique_name, str, sizeof str);
 
 		entry->n_str = str;
-		entry->n_base.e_hash = b_hash_cstr(str);
-		b_status status = put_name(map, entry);
+		entry->n_base.e_hash = fx_hash_cstr(str);
+		fx_status status = put_name(map, entry);
 
-		if (B_OK(status)) {
+		if (FX_OK(status)) {
 			entry->n_parent = map;
-			entry->n_str = b_strdup(str);
-			b_rope_destroy(&unique_name);
+			entry->n_str = fx_strdup(str);
+			fx_rope_destroy(&unique_name);
 			return entry;
 		}
 	}
 
-	b_rope_destroy(&unique_name);
+	fx_rope_destroy(&unique_name);
 
 	return NULL;
 }
@@ -292,11 +292,11 @@ void mie_name_move(struct mie_name *dst, struct mie_name *src)
 	memmove(dst, src, sizeof *src);
 
 	if (src->n_bucket) {
-		b_queue_move(
+		fx_queue_move(
 			&src->n_bucket->b_names, &dst->n_base.e_entry,
 			&src->n_base.e_entry);
 	} else {
-		b_btree_move(
+		fx_bst_move(
 			&src->n_parent->m_entries, &dst->n_base.e_node,
 			&src->n_base.e_node);
 	}
@@ -318,11 +318,11 @@ void mie_name_destroy(struct mie_name *name)
 
 	switch (entry->e_type) {
 	case MIE_NAME_MAP_E_NAME:
-		b_btree_delete(&parent->m_entries, &entry->e_node);
+		fx_bst_delete(&parent->m_entries, &entry->e_node);
 		break;
 	case MIE_NAME_MAP_E_BUCKET:
-		bucket = b_unbox(struct mie_name_bucket, entry, b_base);
-		b_queue_delete(&bucket->b_names, &name->n_base.e_entry);
+		bucket = fx_unbox(struct mie_name_bucket, entry, b_base);
+		fx_queue_delete(&bucket->b_names, &name->n_base.e_entry);
 		break;
 	default:
 		abort();

mie/parse/lex.c

@@ -1,11 +1,11 @@
 #include "lex.h"
 
-#include <blue/core/hash.h>
-#include <blue/core/misc.h>
-#include <blue/core/queue.h>
-#include <blue/ds/dict.h>
-#include <blue/ds/number.h>
-#include <blue/ds/string.h>
+#include <fx/core/hash.h>
+#include <fx/core/misc.h>
+#include <fx/core/queue.h>
+#include <fx/ds/dict.h>
+#include <fx/ds/number.h>
+#include <fx/ds/string.h>
 #include <ctype.h>
 #include <mie/ctx.h>
 #include <mie/diag/diag.h>
@@ -22,10 +22,10 @@
 #define LEX_TOKEN_DEF(i, n)      {.id = (i), .name = (n)}
 
 #define IS_VALID_IDENT_CHAR(c)                                                 \
-	(b_wchar_is_alnum(c) || c == '.' || c == '-' || c == '_')
+	(fx_wchar_is_alnum(c) || c == '.' || c == '-' || c == '_')
 #define IS_VALID_IDENT_START_CHAR(c)                                           \
-	(b_wchar_is_alpha(c) || c == '.' || c == '_')
-#define IS_VALID_REG_START_CHAR(c) (b_wchar_is_alnum(c) || c == '.' || c == '_')
+	(fx_wchar_is_alpha(c) || c == '.' || c == '_')
+#define IS_VALID_REG_START_CHAR(c) (fx_wchar_is_alnum(c) || c == '.' || c == '_')
 
 static struct lex_token_def symbols[] = {
 	LEX_TOKEN_DEF(MIE_SYM_COLON, ":"),
@@ -40,6 +40,7 @@ static struct lex_token_def symbols[] = {
 	LEX_TOKEN_DEF(MIE_SYM_HASH, "#"),
 	LEX_TOKEN_DEF(MIE_SYM_ATSIGN, "@"),
 	LEX_TOKEN_DEF(MIE_SYM_BANG, "!"),
+	LEX_TOKEN_DEF(MIE_SYM_QUESTION, "?"),
 	LEX_TOKEN_DEF(MIE_SYM_TILDE, "~"),
 	LEX_TOKEN_DEF(MIE_SYM_LEFT_BRACE, "{"),
 	LEX_TOKEN_DEF(MIE_SYM_RIGHT_BRACE, "}"),
@@ -56,15 +57,15 @@ static const size_t nr_symbols = sizeof symbols / sizeof symbols[0];
 static struct mie_lex_symbol_node *get_symbol_node(
 	struct mie_lex_symbol_node *node, char c)
 {
-	b_queue_entry *entry = b_queue_first(&node->s_children);
+	fx_queue_entry *entry = fx_queue_first(&node->s_children);
 	while (entry) {
 		struct mie_lex_symbol_node *child
-			= b_unbox(struct mie_lex_symbol_node, entry, s_entry);
+			= fx_unbox(struct mie_lex_symbol_node, entry, s_entry);
 		if (child->s_char == c) {
 			return child;
 		}
 
-		entry = b_queue_next(entry);
+		entry = fx_queue_next(entry);
 	}
 
 	return NULL;
@@ -78,13 +79,13 @@ static struct mie_diag *push_diag(struct mie_lex *lex, unsigned long diag_class)
 		diag_class);
 }
 
-static b_string *get_temp_string(struct mie_lex *lex)
+static fx_string *get_temp_string(struct mie_lex *lex)
 {
 	if (!lex->lex_temp) {
-		lex->lex_temp = b_string_create();
+		lex->lex_temp = fx_string_create();
 	}
 
-	b_string_clear(lex->lex_temp);
+	fx_string_clear(lex->lex_temp);
 	return lex->lex_temp;
 }
 
@@ -109,7 +110,7 @@ static enum mie_status put_symbol(
 		child->s_def = NULL;
 		child->s_char = c;
 
-		b_queue_push_back(&tree->s_children, &child->s_entry);
+		fx_queue_push_back(&tree->s_children, &child->s_entry);
 		tree = child;
 	}
 
@@ -119,12 +120,12 @@ static enum mie_status put_symbol(
 
 static void destroy_symbol_tree(struct mie_lex_symbol_node *tree)
 {
-	b_queue_entry *entry = b_queue_first(&tree->s_children);
+	fx_queue_entry *entry = fx_queue_first(&tree->s_children);
 	while (entry) {
 		struct mie_lex_symbol_node *node
-			= b_unbox(struct mie_lex_symbol_node, entry, s_entry);
-		b_queue_entry *next = b_queue_next(entry);
-		b_queue_delete(&tree->s_children, entry);
+			= fx_unbox(struct mie_lex_symbol_node, entry, s_entry);
+		fx_queue_entry *next = fx_queue_next(entry);
+		fx_queue_delete(&tree->s_children, entry);
 
 		destroy_symbol_tree(node);
 
@@ -182,13 +183,13 @@ struct mie_lex *mie_lex_create(struct mie_line_source *src, struct mie_ctx *ctx)
 
 void mie_lex_destroy(struct mie_lex *lex)
 {
-	b_queue_entry *entry = b_queue_first(&lex->lex_queue);
+	fx_queue_entry *entry = fx_queue_first(&lex->lex_queue);
 
 	while (entry) {
 		struct mie_token *tok
-			= b_unbox(struct mie_token, entry, tok_entry);
-		b_queue_entry *next = b_queue_next(entry);
-		b_queue_delete(&lex->lex_queue, entry);
+			= fx_unbox(struct mie_token, entry, tok_entry);
+		fx_queue_entry *next = fx_queue_next(entry);
+		fx_queue_delete(&lex->lex_queue, entry);
 
 		mie_token_destroy(tok);
 
@@ -200,7 +201,7 @@ void mie_lex_destroy(struct mie_lex *lex)
 	}
 
 	if (lex->lex_temp) {
-		b_string_unref(lex->lex_temp);
+		fx_string_unref(lex->lex_temp);
 	}
 
 	free(lex);
@@ -216,6 +217,11 @@ struct mie_line_source *mie_lex_get_line_source(const struct mie_lex *lex)
 	return lex->lex_source;
 }
 
+const struct mie_file_cell *mie_lex_get_cursor(const struct mie_lex *lex)
+{
+	return &lex->lex_source->s_cursor;
+}
+
 static bool char_can_begin_symbol(char c)
 {
 	for (size_t i = 0; i < nr_symbols; i++) {
@@ -255,7 +261,7 @@ static enum mie_status push_token(struct mie_lex *lex, struct mie_token *tok)
 	tok->tok_location.s_start = lex->lex_token_start;
 	tok->tok_location.s_end = lex->lex_token_end;
 
-	b_queue_push_back(&lex->lex_queue, &tok->tok_entry);
+	fx_queue_push_back(&lex->lex_queue, &tok->tok_entry);
 	return MIE_SUCCESS;
 }
 
@@ -348,7 +354,7 @@ static enum mie_status push_float(struct mie_lex *lex, double v)
 static enum mie_status read_line_comment(struct mie_lex *lex)
 {
 	while (true) {
-		b_wchar c = mie_line_source_getc(lex->lex_source);
+		fx_wchar c = mie_line_source_getc(lex->lex_source);
 
 		if (c == -MIE_ERR_EOF || c == '\n') {
 			break;
@@ -367,14 +373,14 @@ static enum mie_status read_number(struct mie_lex *lex, bool negate)
 	int token_len = 0;
 	int base = 10;
 	int dots = 0;
-	b_string *str = get_temp_string(lex);
+	fx_string *str = get_temp_string(lex);
 
 	if (!negate) {
 		set_token_start(lex);
 	}
 
 	while (true) {
-		b_wchar c = mie_line_source_peekc(lex->lex_source);
+		fx_wchar c = mie_line_source_peekc(lex->lex_source);
 		if (c == -MIE_ERR_EOF) {
 			break;
 		}
@@ -402,13 +408,13 @@ static enum mie_status read_number(struct mie_lex *lex, bool negate)
 			token_len++;
 			dots++;
 			char s[] = {c, 0};
-			b_string_append_cstr(str, s);
+			fx_string_append_cstr(str, s);
 			set_token_end(lex);
 			mie_line_source_getc(lex->lex_source);
 			continue;
 		}
 
-		if (b_wchar_is_space(c) || b_wchar_is_punct(c)) {
+		if (fx_wchar_is_space(c) || fx_wchar_is_punct(c)) {
 			break;
 		}
 
@@ -440,7 +446,7 @@ static enum mie_status read_number(struct mie_lex *lex, bool negate)
 			return MIE_ERR_BAD_SYNTAX;
 		}
 
-		b_string_append_wc(str, c);
+		fx_string_append_wc(str, c);
 		set_token_end(lex);
 		mie_line_source_getc(lex->lex_source);
 		token_len++;
@@ -450,7 +456,7 @@ static enum mie_status read_number(struct mie_lex *lex, bool negate)
 		return push_int(lex, 0);
 	}
 
-	const char *s = b_string_ptr(str);
+	const char *s = fx_string_ptr(str);
 	char *ep = NULL;
 
 	/* negative numbers will be lexed as a hyphen followed by a positive
@@ -486,15 +492,15 @@ static enum mie_status read_number(struct mie_lex *lex, bool negate)
 static enum mie_status read_ident(struct mie_lex *lex, enum mie_token_type type)
 {
 	int dots = 0;
-	b_string *str = get_temp_string(lex);
-	b_wchar prev = 0;
+	fx_string *str = get_temp_string(lex);
+	fx_wchar prev = 0;
 
 	if (type == MIE_TOK_NONE) {
 		set_token_start(lex);
 	}
 
 	while (1) {
-		b_wchar c = mie_line_source_peekc(lex->lex_source);
+		fx_wchar c = mie_line_source_peekc(lex->lex_source);
 
 		if ((c == '.' || c == '-') && prev == c) {
 			return MIE_ERR_BAD_SYNTAX;
@@ -509,7 +515,7 @@ static enum mie_status read_ident(struct mie_lex *lex, enum mie_token_type type)
 		}
 
 		prev = c;
-		b_string_append_wc(str, c);
+		fx_string_append_wc(str, c);
 		set_token_end(lex);
 		mie_line_source_getc(lex->lex_source);
 	}
@@ -518,7 +524,7 @@ static enum mie_status read_ident(struct mie_lex *lex, enum mie_token_type type)
 		type = dots > 0 ? MIE_TOK_NAME : MIE_TOK_WORD;
 	}
 
-	char *s = b_string_steal(str);
+	char *s = fx_string_steal(str);
 
 	switch (type) {
 	case MIE_TOK_INSTNAME:
@@ -526,6 +532,7 @@ static enum mie_status read_ident(struct mie_lex *lex, enum mie_token_type type)
 			return push_string_token(lex, type, s);
 		} else {
 			push_symbol(lex, MIE_SYM_ASTERISK);
+			lex->lex_token_start.c_col++;
 			return push_string_token(lex, MIE_TOK_WORD, s);
 		}
 		break;
@@ -536,9 +543,9 @@ static enum mie_status read_ident(struct mie_lex *lex, enum mie_token_type type)
 
 static enum mie_status read_string(struct mie_lex *lex)
 {
-	b_string *str = get_temp_string(lex);
+	fx_string *str = get_temp_string(lex);
 
-	b_wchar c = mie_line_source_peekc(lex->lex_source);
+	fx_wchar c = mie_line_source_peekc(lex->lex_source);
 	bool esc = false;
 
 	if (c != '"') {
@@ -548,13 +555,13 @@ static enum mie_status read_string(struct mie_lex *lex)
 	mie_line_source_getc(lex->lex_source);
 
 	while (1) {
-		b_wchar c = mie_line_source_peekc(lex->lex_source);
+		fx_wchar c = mie_line_source_peekc(lex->lex_source);
 
 		if (esc) {
 			switch (c) {
 			case '\\':
 			case '"':
-				b_string_append_wc(str, c);
+				fx_string_append_wc(str, c);
 				break;
 			default:
 				return MIE_ERR_BAD_SYNTAX;
@@ -576,11 +583,11 @@ static enum mie_status read_string(struct mie_lex *lex)
 			break;
 		}
 
-		b_string_append_wc(str, c);
+		fx_string_append_wc(str, c);
 		mie_line_source_getc(lex->lex_source);
 	}
 
-	char *s = b_string_steal(str);
+	char *s = fx_string_steal(str);
 	return push_string_token(lex, MIE_TOK_STRING, s);
 }
 
@@ -588,10 +595,10 @@ static enum mie_status read_symbol(struct mie_lex *lex)
 {
 	struct mie_lex_symbol_node *node = lex->lex_sym_tree;
 	set_token_start(lex);
-	b_wchar prev = 0;
+	fx_wchar prev = 0;
 
 	while (true) {
-		b_wchar c = mie_line_source_peekc(lex->lex_source);
+		fx_wchar c = mie_line_source_peekc(lex->lex_source);
 		if (c < 0) {
 			break;
 		}
@@ -660,17 +667,17 @@ static enum mie_status read_symbol(struct mie_lex *lex)
 
 static void skip_whitespace(struct mie_lex *lex)
 {
-	b_wchar c = mie_line_source_peekc(lex->lex_source);
+	fx_wchar c = mie_line_source_peekc(lex->lex_source);
 
-	while (b_wchar_is_space(c)) {
+	while (fx_wchar_is_space(c)) {
 		mie_line_source_getc(lex->lex_source);
 		c = mie_line_source_peekc(lex->lex_source);
 	}
 }
 
-static bool should_skip(b_wchar c, bool skip_linefeeds)
+static bool should_skip(fx_wchar c, bool skip_linefeeds)
 {
-	bool skip = b_wchar_is_space(c);
+	bool skip = fx_wchar_is_space(c);
 
 	if (!skip_linefeeds) {
 		skip = (skip && c != '\n');
@@ -681,7 +688,7 @@ static bool should_skip(b_wchar c, bool skip_linefeeds)
 
 static void skip_ignored_chars(struct mie_lex *lex, bool include_linefeeds)
 {
-	b_wchar c = mie_line_source_peekc(lex->lex_source);
+	fx_wchar c = mie_line_source_peekc(lex->lex_source);
 
 	while (1) {
 		while (should_skip(c, include_linefeeds)) {
@@ -708,14 +715,14 @@ static void skip_ignored_chars(struct mie_lex *lex, bool include_linefeeds)
 
 static enum mie_status pump_tokens(struct mie_lex *lex)
 {
-	b_wchar c = mie_line_source_peekc(lex->lex_source);
+	fx_wchar c = mie_line_source_peekc(lex->lex_source);
 
 	if (c < 0) {
 		return -c;
 	}
 
 	while (1) {
-		if (c == ';' || (b_wchar_is_space(c) && c != '\n')) {
+		if (c == ';' || (fx_wchar_is_space(c) && c != '\n')) {
 			skip_ignored_chars(lex, false);
 		} else {
 			break;
@@ -751,7 +758,7 @@ static enum mie_status pump_tokens(struct mie_lex *lex)
 		return push_linefeed(lex);
 	}
 
-	while (b_wchar_is_space(c) && c != '\n') {
+	while (fx_wchar_is_space(c) && c != '\n') {
 		mie_line_source_getc(lex->lex_source);
 		c = mie_line_source_peekc(lex->lex_source);
 	}
@@ -793,7 +800,7 @@ struct mie_token *mie_lex_peek(struct mie_lex *lex)
 {
 	enum mie_status status = MIE_SUCCESS;
 
-	while (b_queue_empty(&lex->lex_queue)) {
+	while (fx_queue_empty(&lex->lex_queue)) {
 		status = pump_tokens(lex);
 
 		if (status != MIE_SUCCESS) {
@@ -804,8 +811,8 @@ struct mie_token *mie_lex_peek(struct mie_lex *lex)
 
 	lex->lex_status = status;
 
-	b_queue_entry *entry = b_queue_first(&lex->lex_queue);
-	struct mie_token *tok = b_unbox(struct mie_token, entry, tok_entry);
+	fx_queue_entry *entry = fx_queue_first(&lex->lex_queue);
+	struct mie_token *tok = fx_unbox(struct mie_token, entry, tok_entry);
 	return tok;
 }
 
@@ -813,7 +820,7 @@ void mie_lex_advance(struct mie_lex *lex)
 {
 	enum mie_status status = MIE_SUCCESS;
 
-	while (b_queue_empty(&lex->lex_queue)) {
+	while (fx_queue_empty(&lex->lex_queue)) {
 		status = pump_tokens(lex);
 
 		if (status != MIE_SUCCESS) {
@@ -822,14 +829,14 @@ void mie_lex_advance(struct mie_lex *lex)
 		}
 	}
 
-	b_queue_entry *entry = b_queue_pop_front(&lex->lex_queue);
-	struct mie_token *tok = b_unbox(struct mie_token, entry, tok_entry);
+	fx_queue_entry *entry = fx_queue_pop_front(&lex->lex_queue);
+	struct mie_token *tok = fx_unbox(struct mie_token, entry, tok_entry);
 	mie_token_destroy(tok);
 }
 
 bool mie_lex_tokens_available(struct mie_lex *lex)
 {
-	if (!b_queue_empty(&lex->lex_queue)) {
+	if (!fx_queue_empty(&lex->lex_queue)) {
 		return true;
 	}
 

mie/parse/lex.h

@@ -1,9 +1,9 @@
 #ifndef _PARSE_LEX_H_
 #define _PARSE_LEX_H_
 
-#include <blue/core/queue.h>
-#include <blue/ds/dict.h>
-#include <blue/ds/string.h>
+#include <fx/core/queue.h>
+#include <fx/ds/dict.h>
+#include <fx/ds/string.h>
 #include <mie/parse/lex.h>
 #include <mie/parse/line-source.h>
 #include <mie/parse/token.h>
@@ -16,10 +16,10 @@ struct mie_lex {
 	enum mie_status lex_status;
 
 	struct mie_ctx *lex_ctx;
-	b_queue lex_queue;
+	fx_queue lex_queue;
 
-	b_string *lex_temp;
-	b_queue lex_state;
+	fx_string *lex_temp;
+	fx_queue lex_state;
 	unsigned int lex_brace_depth;
 
 	struct mie_file_cell lex_token_start, lex_token_end;
@@ -29,8 +29,8 @@ struct mie_lex_symbol_node {
 	char s_char;
 	struct lex_token_def *s_def;
 
-	b_queue_entry s_entry;
-	b_queue s_children;
+	fx_queue_entry s_entry;
+	fx_queue s_children;
 };
 
 struct lex_token_def {

mie/parse/line-source.c

@@ -1,11 +1,11 @@
 #include <mie/parse/line-source.h>
 
 enum mie_status mie_line_source_init(
-	struct mie_line_source *src, const char *path, b_stream *stream)
+	struct mie_line_source *src, const char *path, fx_stream *stream)
 {
 	memset(src, 0x0, sizeof *src);
 
-	src->s_lines = b_array_create();
+	src->s_lines = fx_array_create();
 
 	if (!src->s_lines) {
 		return MIE_ERR_NO_MEMORY;
@@ -22,11 +22,11 @@ enum mie_status mie_line_source_init(
 void mie_line_source_cleanup(struct mie_line_source *src)
 {
 	if (src->s_linebuf_ptr) {
-		b_iterator_unref(src->s_linebuf_ptr);
+		fx_iterator_unref(src->s_linebuf_ptr);
 	}
 
 	if (src->s_lines) {
-		b_array_unref(src->s_lines);
+		fx_array_unref(src->s_lines);
 	}
 
 	memset(src, 0x0, sizeof *src);
@@ -50,31 +50,31 @@ static enum mie_status refill_linebuf(struct mie_line_source *src)
 	}
 
 	if (src->s_linebuf_ptr) {
-		b_iterator_unref(src->s_linebuf_ptr);
+		fx_iterator_unref(src->s_linebuf_ptr);
 		src->s_linebuf_ptr = NULL;
 	}
 
-	b_stringstream *s = b_stringstream_create();
+	fx_stringstream *s = fx_stringstream_create();
 
-	b_status status = b_stream_read_line_s(src->s_stream, s);
+	fx_status status = fx_stream_read_line_s(src->s_stream, s);
 
-	if (status == B_ERR_NO_DATA) {
+	if (status == FX_ERR_NO_DATA) {
 		return MIE_ERR_EOF;
 	}
 
-	if (!B_OK(status)) {
+	if (!FX_OK(status)) {
 		return MIE_ERR_INTERNAL_FAILURE;
 	}
 
-	b_string *line = b_string_create();
-	b_string_replace_all_with_stringstream(line, s);
-	b_stringstream_unref(s);
+	fx_string *line = fx_string_create();
+	fx_string_replace_all_with_stringstream(line, s);
+	fx_stringstream_unref(s);
 
-	b_array_append(src->s_lines, line);
-	b_string_unref(line);
+	fx_array_append(src->s_lines, line);
+	fx_string_unref(line);
 
 	src->s_linebuf = line;
-	src->s_linebuf_ptr = b_iterator_begin(src->s_linebuf);
+	src->s_linebuf_ptr = fx_iterator_begin(src->s_linebuf);
 
 	return MIE_SUCCESS;
 }
@@ -83,7 +83,7 @@ static int peek(struct mie_line_source *src)
 {
 	enum mie_status status = MIE_SUCCESS;
 
-	if (!src->s_linebuf_ptr || !b_iterator_is_valid(src->s_linebuf_ptr)) {
+	if (!src->s_linebuf_ptr || !fx_iterator_is_valid(src->s_linebuf_ptr)) {
 		status = refill_linebuf(src);
 	}
 
@@ -91,11 +91,11 @@ static int peek(struct mie_line_source *src)
 		return -status;
 	}
 
-	if (b_string_get_size(src->s_linebuf, B_STRLEN_NORMAL) == 0) {
+	if (fx_string_get_size(src->s_linebuf, FX_STRLEN_NORMAL) == 0) {
 		return -MIE_ERR_EOF;
 	}
 
-	b_wchar c = b_iterator_get_value(src->s_linebuf_ptr).v_int;
+	fx_wchar c = fx_iterator_get_value(src->s_linebuf_ptr).v_int;
 	return c;
 }
 
@@ -103,7 +103,7 @@ static int advance(struct mie_line_source *src)
 {
 	enum mie_status status = MIE_SUCCESS;
 
-	if (!b_iterator_is_valid(src->s_linebuf_ptr)) {
+	if (!fx_iterator_is_valid(src->s_linebuf_ptr)) {
 		status = refill_linebuf(src);
 	}
 
@@ -111,12 +111,12 @@ static int advance(struct mie_line_source *src)
 		return -status;
 	}
 
-	if (b_string_get_size(src->s_linebuf, B_STRLEN_NORMAL) == 0) {
+	if (fx_string_get_size(src->s_linebuf, FX_STRLEN_NORMAL) == 0) {
 		return -MIE_ERR_EOF;
 	}
 
-	b_wchar c = b_iterator_get_value(src->s_linebuf_ptr).v_int;
-	b_iterator_move_next(src->s_linebuf_ptr);
+	fx_wchar c = fx_iterator_get_value(src->s_linebuf_ptr).v_int;
+	fx_iterator_move_next(src->s_linebuf_ptr);
 
 	src->s_cursor.c_col++;
 	if (c == '\n') {
@@ -126,18 +126,18 @@ static int advance(struct mie_line_source *src)
 	return c;
 }
 
-b_wchar mie_line_source_peekc(struct mie_line_source *src)
+fx_wchar mie_line_source_peekc(struct mie_line_source *src)
 {
 	return peek(src);
 }
 
-b_wchar mie_line_source_getc(struct mie_line_source *src)
+fx_wchar mie_line_source_getc(struct mie_line_source *src)
 {
 	return advance(src);
 }
 
 enum mie_status mie_line_source_get_row(
-	struct mie_line_source *src, size_t row, const b_string **out)
+	struct mie_line_source *src, size_t row, const fx_string **out)
 {
 	if (row == 0) {
 		return MIE_ERR_INVALID_ARGUMENT;
@@ -145,11 +145,11 @@ enum mie_status mie_line_source_get_row(
 
 	row--;
 
-	if (row >= b_array_size(src->s_lines)) {
+	if (row >= fx_array_size(src->s_lines)) {
 		return MIE_ERR_EOF;
 	}
 
-	b_string *line = b_array_at(src->s_lines, row);
+	fx_string *line = fx_array_at(src->s_lines, row);
 	*out = line;
 
 	return MIE_SUCCESS;
@@ -157,5 +157,5 @@ enum mie_status mie_line_source_get_row(
 
 bool mie_line_source_input_available(struct mie_line_source *src)
 {
-	return src->s_linebuf_ptr && b_iterator_is_valid(src->s_linebuf_ptr);
+	return src->s_linebuf_ptr && fx_iterator_is_valid(src->s_linebuf_ptr);
 }

mie/pass/builtin/convert-scf-to-cf.c

@@ -1,4 +1,5 @@
 #include <mie/ctx.h>
+#include <mie/dialect/arith.h>
 #include <mie/dialect/builtin.h>
 #include <mie/dialect/cf.h>
 #include <mie/dialect/dialect.h>
@@ -51,7 +52,7 @@ static struct mie_rewrite_result if_rewrite(
 		struct mie_register *old_reg = &op->op_result.items[i];
 		struct mie_register *new_reg = mie_block_add_param(end_block);
 		new_reg->reg_type = old_reg->reg_type;
-		char *name = b_strdup(old_reg->reg_name.n_str);
+		char *name = fx_strdup(old_reg->reg_name.n_str);
 
 		mie_name_destroy(&old_reg->reg_name);
 		mie_rewriter_rename_register(rewriter, new_reg, name);
@@ -101,12 +102,144 @@ static struct mie_rewrite_result if_rewrite(
 	return MIE_REWRITE_RESULT(MIE_REWRITE_SUCCESS, MIE_SUCCESS);
 }
 
+static enum mie_match_result for_match(const struct mie_op *op)
+{
+	if (!mie_op_is(op, "scf", "for")) {
+		return MIE_NO_MATCH_FOUND;
+	}
+
+	return MIE_MATCH_FOUND;
+}
+
+static struct mie_rewrite_result for_rewrite(
+	struct mie_op *op, struct mie_rewriter *rewriter)
+{
+	printf("for: rewriting %p %s.%s\n", op, op->op_info->op_parent->d_name,
+	       op->op_info->op_name);
+
+	struct mie_region *parent_region = op->op_container->b_parent;
+	struct mie_region *for_body = mie_op_get_first_region(op);
+	struct mie_block *for_entry = mie_region_get_first_block(for_body);
+	struct mie_block *pre_block = op->op_container;
+	struct mie_block *end_block
+		= mie_rewriter_split_block(rewriter, pre_block, op, "for.end");
+
+	struct mie_register *entry_iv = &for_entry->b_params.items[0];
+	struct mie_register *lb = op->op_args.items[0].arg_value.u_reg;
+	struct mie_register *ub = op->op_args.items[1].arg_value.u_reg;
+	struct mie_register *step = op->op_args.items[2].arg_value.u_reg;
+
+	MIE_VECTOR_DEFINE(struct mie_register *, initial_args);
+	mie_vector_push_back(initial_args, &lb, NULL);
+	for (size_t i = 3; i < MIE_VECTOR_COUNT(op->op_args); i++) {
+		struct mie_register *arg = op->op_args.items[i].arg_value.u_reg;
+		mie_vector_push_back(initial_args, &arg, NULL);
+	}
+
+	mie_rewriter_set_insertion_block(rewriter, pre_block);
+	mie_cf_br_put(
+		MIE_EMITTER(rewriter), for_entry, initial_args.items,
+		initial_args.count);
+
+	char iv_next_name[64];
+	snprintf(
+		iv_next_name, sizeof iv_next_name, "%s.next",
+		entry_iv->reg_name.n_str);
+
+	mie_rewriter_set_insertion_block(rewriter, for_entry);
+	struct mie_block *for_cond
+		= mie_rewriter_create_block(rewriter, end_block, "for.cond");
+
+	for (size_t i = 0; i < MIE_VECTOR_COUNT(for_entry->b_params); i++) {
+		const char *var_name = for_entry->b_params.items[i].reg_name.n_str;
+		const struct mie_type *var_type
+			= for_entry->b_params.items[i].reg_type;
+
+		mie_rewriter_add_block_parameter(
+			rewriter, for_cond, var_name, entry_iv->reg_type);
+	}
+
+	for (size_t i = 0; i < MIE_VECTOR_COUNT(op->op_result); i++) {
+		struct mie_register *old_reg = &op->op_result.items[i];
+		struct mie_register *new_reg = mie_block_add_param(end_block);
+		new_reg->reg_type = old_reg->reg_type;
+		char *name = fx_strdup(old_reg->reg_name.n_str);
+
+		mie_name_destroy(&old_reg->reg_name);
+		mie_rewriter_rename_register(rewriter, new_reg, name);
+		mie_rewriter_replace_register(rewriter, old_reg, new_reg);
+		free(name);
+	}
+
+	struct mie_walker walker;
+	mie_walker_begin(&walker, op, MIE_WALKER_F_INCLUDE_OPS);
+
+	do {
+		const struct mie_walk_item *item = mie_walker_get(&walker);
+		if (!mie_op_is(item->i_op, "scf", "yield")) {
+			continue;
+		}
+
+		printf("for: found scf.yield %p\n", item->i_op);
+
+		struct mie_op *br = mie_rewriter_replace_op(
+			rewriter, item->i_op, "cf", "br");
+		struct mie_op_successor *s = mie_rewriter_add_op_successor(
+			rewriter, br, for_cond, NULL, 0);
+		struct mie_op_arg *iv_arg = mie_rewriter_add_op_successor_arg(
+			rewriter, br, s, entry_iv);
+		mie_rewriter_move_op_args_to_successor(rewriter, br, s);
+
+	} while (mie_walker_step(&walker) == MIE_SUCCESS);
+
+	mie_walker_end(&walker);
+
+	mie_rewriter_move_blocks_after(rewriter, for_body, parent_region, pre_block);
+
+	mie_rewriter_set_insertion_block(rewriter, for_cond);
+
+	struct mie_register *cond_iv = &for_cond->b_params.items[0];
+
+	struct mie_register *iv_next = mie_arith_addi_put(
+		MIE_EMITTER(rewriter), cond_iv, step, iv_next_name);
+	struct mie_register *iv_cmp = mie_arith_cmpi_put(
+		MIE_EMITTER(rewriter), MIE_ARITH_CMPI_UGE, iv_next, ub, "stop");
+
+	MIE_VECTOR_DEFINE(struct mie_register *, true_args);
+	MIE_VECTOR_DEFINE(struct mie_register *, false_args);
+
+	mie_vector_push_back(false_args, &iv_next, NULL);
+
+	for (size_t i = 1; i < MIE_VECTOR_COUNT(for_cond->b_params); i++) {
+		struct mie_register *param = &for_cond->b_params.items[i];
+		mie_vector_push_back(true_args, &param, NULL);
+		mie_vector_push_back(false_args, &param, NULL);
+	}
+
+	mie_cf_br_cond_put(
+		MIE_EMITTER(rewriter), iv_cmp, end_block, true_args.items,
+		true_args.count, for_entry, false_args.items, false_args.count);
+
+	mie_vector_destroy(true_args, NULL);
+	mie_vector_destroy(false_args, NULL);
+
+	mie_rewriter_erase_op(rewriter, op);
+
+	return MIE_REWRITE_RESULT(MIE_REWRITE_SUCCESS, MIE_SUCCESS);
+}
+
 MIE_REWRITE_PATTERN_BEGIN(if_pattern)
 	MIE_REWRITE_PATTERN_ROOT("scf", "if");
 	MIE_REWRITE_PATTERN_MATCH(if_match);
 	MIE_REWRITE_PATTERN_REWRITE(if_rewrite);
 MIE_REWRITE_PATTERN_END()
 
+MIE_REWRITE_PATTERN_BEGIN(for_pattern)
+	MIE_REWRITE_PATTERN_ROOT("scf", "for");
+	MIE_REWRITE_PATTERN_MATCH(for_match);
+	MIE_REWRITE_PATTERN_REWRITE(for_rewrite);
+MIE_REWRITE_PATTERN_END()
+
 static struct mie_pass_result transform(
 	struct mie_pass *pass, struct mie_op *op, struct mie_pass_args *args)
 {
@@ -115,9 +248,11 @@ static struct mie_pass_result transform(
 
 	struct mie_convert_config *cfg = mie_convert_config_create(args->p_ctx);
 	mie_convert_config_add_illegal_op(cfg, "scf", "if");
+	mie_convert_config_add_illegal_op(cfg, "scf", "for");
 
 	struct mie_pattern_set patterns = {};
 	if_pattern_create(&patterns);
+	for_pattern_create(&patterns);
 	mie_convert_apply(op, cfg, &patterns);
 
 	mie_pattern_set_cleanup(&patterns);