Skip to content

fixing string model mixing #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
dev-m03 wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

fixing string model mixing #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
36bca8a
fixing string model mixing
dev-m03 Jan 25, 2026
656f578
fixing docs error
dev-m03 Jan 25, 2026
6c6ae79
ci: trigger
dev-m03 Jan 25, 2026
3e96e84
ci: trigger
dev-m03 Jan 25, 2026
514c904
fixing issue in pyproject
dev-m03 Jan 25, 2026
f5915ee
ci: trigger
dev-m03 Jan 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../README.md
../README.md
35 changes: 14 additions & 21 deletions src/irx/builders/llvmliteir.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,7 @@ class VariablesLLVM:
INT32_TYPE: ir.types.Type
VOID_TYPE: ir.types.Type
BOOLEAN_TYPE: ir.types.Type
STRING_TYPE: ir.types.Type
ASCII_STRING_TYPE: ir.types.Type
UTF8_STRING_TYPE: ir.types.Type

TIMESTAMP_TYPE: ir.types.Type
DATETIME_TYPE: ir.types.Type
SIZE_T_TYPE: ir.types.Type
Expand Down Expand Up @@ -134,11 +132,11 @@ def get_data_type(self, type_name: str) -> ir.types.Type:
elif type_name == "char":
return self.INT8_TYPE
elif type_name == "string":
return self.STRING_TYPE
return ir.IntType(8).as_pointer()
elif type_name == "stringascii":
return self.ASCII_STRING_TYPE
return ir.IntType(8).as_pointer()
elif type_name == "utf8string":
return self.UTF8_STRING_TYPE
return ir.IntType(8).as_pointer()
elif type_name == "nonetype":
return self.VOID_TYPE

Expand Down Expand Up @@ -214,11 +212,7 @@ def initialize(self) -> None:
self._llvm.INT32_TYPE = ir.IntType(32)
self._llvm.INT64_TYPE = ir.IntType(64)
self._llvm.VOID_TYPE = ir.VoidType()
self._llvm.STRING_TYPE = ir.LiteralStructType(
[ir.IntType(32), ir.IntType(8).as_pointer()]
)
self._llvm.ASCII_STRING_TYPE = ir.IntType(8).as_pointer()
self._llvm.UTF8_STRING_TYPE = self._llvm.STRING_TYPE

# Composite types
self._llvm.TIMESTAMP_TYPE = ir.LiteralStructType(
[
Expand Down Expand Up @@ -1620,8 +1614,8 @@ def _create_string_concat_function(self) -> ir.Function:
return self._llvm.module.get_global(func_name)

func_type = ir.FunctionType(
self._llvm.ASCII_STRING_TYPE,
[self._llvm.ASCII_STRING_TYPE, self._llvm.ASCII_STRING_TYPE],
ir.IntType(8).as_pointer(),
[ir.IntType(8).as_pointer(), ir.IntType(8).as_pointer()],
)
func = ir.Function(self._llvm.module, func_type, func_name)

Expand All @@ -1636,7 +1630,7 @@ def _create_string_length_function(self) -> ir.Function:

# Function signature: string_length(char* str) -> i32
func_type = ir.FunctionType(
self._llvm.INT32_TYPE, [self._llvm.ASCII_STRING_TYPE]
self._llvm.INT32_TYPE, [ir.IntType(8).as_pointer()]
)
func = ir.Function(self._llvm.module, func_type, func_name)
func.linkage = "external"
Expand All @@ -1651,7 +1645,7 @@ def _create_string_equals_function(self) -> ir.Function:
# Function signature: string_equals(char* str1, char* str2) -> i1
func_type = ir.FunctionType(
self._llvm.BOOLEAN_TYPE,
[self._llvm.ASCII_STRING_TYPE, self._llvm.ASCII_STRING_TYPE],
[ir.IntType(8).as_pointer(), ir.IntType(8).as_pointer()],
)
func = ir.Function(self._llvm.module, func_type, func_name)
func.linkage = "external"
Expand All @@ -1665,9 +1659,9 @@ def _create_string_substring_function(self) -> ir.Function:

# string_substring(char* str, i32 start, i32 length) -> char*
func_type = ir.FunctionType(
self._llvm.ASCII_STRING_TYPE,
ir.IntType(8).as_pointer(),
[
self._llvm.ASCII_STRING_TYPE,
ir.IntType(8).as_pointer(),
self._llvm.INT32_TYPE,
self._llvm.INT32_TYPE,
],
Expand Down Expand Up @@ -2210,10 +2204,9 @@ def visit(self, node: system.Cast) -> None:
value, target_type, "cast_fp_down"
)

elif target_type in (
self._llvm.ASCII_STRING_TYPE,
self._llvm.STRING_TYPE,
):
elif isinstance(
target_type, ir.PointerType
) and target_type.pointee == ir.IntType(8):
if isinstance(value.type, ir.IntType):
arg, fmt_str = self._normalize_int_for_printf(value)
fmt_gv = self._get_or_create_format_global(fmt_str)
Expand Down
Loading