From bd19ba636c01324326a250685c19aa40c6a090fc Mon Sep 17 00:00:00 2001
From: Edgar Luque <git@edgarluque.com>
Date: Sat, 13 Apr 2024 11:36:42 +0200
Subject: [PATCH] initial str type

---
 lib/edlang_codegen_llvm/src/codegen.rs |  97 +++++++++++++++++++++++--
 lib/edlang_ir/src/lib.rs               |   4 +-
 lib/edlang_lowering/src/lib.rs         |  27 ++++++-
 program                                | Bin 15544 -> 0 bytes
 4 files changed, 121 insertions(+), 7 deletions(-)
 delete mode 100755 program

diff --git a/lib/edlang_codegen_llvm/src/codegen.rs b/lib/edlang_codegen_llvm/src/codegen.rs
index db58553d8..c6d6c960e 100644
--- a/lib/edlang_codegen_llvm/src/codegen.rs
+++ b/lib/edlang_codegen_llvm/src/codegen.rs
@@ -95,7 +95,7 @@ pub fn compile(session: &Session, program: &ProgramBody) -> Result<PathBuf, Box<
             if session.library {
                 inkwell::targets::RelocMode::DynamicNoPic
             } else {
-                inkwell::targets::RelocMode::Default
+                inkwell::targets::RelocMode::PIC
             },
             inkwell::targets::CodeModel::Default,
         )
@@ -1238,9 +1238,9 @@ fn compile_load_place<'ctx>(
 fn compile_value<'ctx>(
     ctx: &ModuleCompileCtx<'ctx, '_>,
     val: &ValueTree,
-    ty: &ir::TypeInfo,
+    type_info: &ir::TypeInfo,
 ) -> Result<BasicValueEnum<'ctx>, BuilderError> {
-    let ty = compile_basic_type(ctx, ty);
+    let ty = compile_basic_type(ctx, type_info);
     Ok(match val {
         ValueTree::Leaf(const_val) => match const_val {
             ir::ConstValue::Bool(x) => ty
@@ -1298,6 +1298,23 @@ fn compile_value<'ctx>(
                 .into_int_type()
                 .const_int((*x) as u64, true)
                 .as_basic_value_enum(),
+            ir::ConstValue::Str(x) => {
+                let inner_ty = match &type_info.kind {
+                    ir::TypeKind::Ref(_, inner) => &**inner,
+                    _ => unreachable!(),
+                };
+                let inner_ty = compile_basic_type(ctx, inner_ty);
+                let x = &x[1..x.len() - 1];
+                let ptr = ctx.builder.build_global_string_ptr(x, "")?;
+                let len = ctx.ctx.context.i64_type().const_int(x.len() as u64, false);
+                let value = inner_ty
+                    .into_struct_type()
+                    .const_named_struct(&[ptr.as_basic_value_enum(), len.as_basic_value_enum()])
+                    .as_basic_value_enum();
+                let ptr = ctx.builder.build_alloca(inner_ty, "")?;
+                ctx.builder.build_store(ptr, value)?;
+                ptr.as_basic_value_enum()
+            }
         },
         ValueTree::Branch(_) => todo!(),
     })
@@ -1393,7 +1410,35 @@ fn compile_basic_type<'ctx>(
                 .struct_type(&fields, false)
                 .as_basic_type_enum()
         }
-        ir::TypeKind::Str => todo!(),
+        ir::TypeKind::Str => {
+            let fields = [
+                compile_basic_type(
+                    ctx,
+                    &ir::TypeInfo {
+                        span: None,
+                        kind: ir::TypeKind::Ptr(
+                            true,
+                            Box::new(ir::TypeInfo {
+                                span: None,
+                                kind: ir::TypeKind::Uint(ir::UintTy::U8),
+                            }),
+                        ),
+                    },
+                ),
+                compile_basic_type(
+                    ctx,
+                    &ir::TypeInfo {
+                        span: None,
+                        kind: ir::TypeKind::Uint(ir::UintTy::U64),
+                    },
+                ),
+            ];
+
+            ctx.ctx
+                .context
+                .struct_type(&fields, false)
+                .as_basic_type_enum()
+        }
     }
 }
 
@@ -1545,6 +1590,48 @@ fn compile_debug_type<'ctx>(ctx: &ModuleCompileCtx<'ctx, '_>, ty: &ir::TypeInfo)
                 )
                 .as_type()
         }
-        ir::TypeKind::Str => todo!(),
+        ir::TypeKind::Str => {
+            let fields = [
+                compile_debug_type(
+                    ctx,
+                    &ir::TypeInfo {
+                        span: None,
+                        kind: ir::TypeKind::Ptr(
+                            true,
+                            Box::new(ir::TypeInfo {
+                                span: None,
+                                kind: ir::TypeKind::Uint(ir::UintTy::U8),
+                            }),
+                        ),
+                    },
+                ),
+                compile_debug_type(
+                    ctx,
+                    &ir::TypeInfo {
+                        span: None,
+                        kind: ir::TypeKind::Uint(ir::UintTy::U64),
+                    },
+                ),
+            ];
+
+            let real_ty = compile_basic_type(ctx, ty);
+
+            ctx.di_builder
+                .create_struct_type(
+                    ctx.di_namespace,
+                    "str",
+                    ctx.di_unit.get_file(),
+                    0,
+                    ctx.target_data.get_bit_size(&real_ty),
+                    ctx.target_data.get_abi_alignment(&real_ty),
+                    0,
+                    None,
+                    &fields,
+                    0,
+                    None,
+                    "str",
+                )
+                .as_type()
+        }
     }
 }
diff --git a/lib/edlang_ir/src/lib.rs b/lib/edlang_ir/src/lib.rs
index f0a85c300..b9e45392c 100644
--- a/lib/edlang_ir/src/lib.rs
+++ b/lib/edlang_ir/src/lib.rs
@@ -406,6 +406,7 @@ impl ValueTree {
                 ConstValue::F64(_) => TypeKind::Float(FloatTy::F64),
                 ConstValue::Char(_) => TypeKind::Char,
                 ConstValue::Isize(_) => TypeKind::Int(IntTy::Isize),
+                ConstValue::Str(_) => TypeKind::Str,
             },
             ValueTree::Branch(_) => todo!(),
         }
@@ -534,7 +535,7 @@ pub enum UnOp {
     Neg,
 }
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone)]
 pub enum ConstValue {
     Bool(bool),
     Char(char),
@@ -551,4 +552,5 @@ pub enum ConstValue {
     U128(u128),
     F32(f32),
     F64(f64),
+    Str(String),
 }
diff --git a/lib/edlang_lowering/src/lib.rs b/lib/edlang_lowering/src/lib.rs
index 372e24c5f..1dd903aff 100644
--- a/lib/edlang_lowering/src/lib.rs
+++ b/lib/edlang_lowering/src/lib.rs
@@ -1171,7 +1171,32 @@ fn lower_value(
             },
             None => todo!(),
         },
-        ast::ValueExpr::Str { value: _, span: _ } => todo!(),
+        ast::ValueExpr::Str { value, span } => {
+            let ty = match type_hint {
+                Some(ty) => ty.clone(),
+                None => ir::TypeInfo {
+                    span: None,
+                    kind: ir::TypeKind::Ref(
+                        false,
+                        Box::new(ir::TypeInfo {
+                            span: None,
+                            kind: ir::TypeKind::Str,
+                        }),
+                    ),
+                },
+            };
+            (
+                ir::Operand::Constant(ir::ConstData {
+                    span: Some(*span),
+                    type_info: ty.clone(),
+                    kind: ir::ConstKind::Value(ir::ValueTree::Leaf(ir::ConstValue::Str(
+                        value.clone(),
+                    ))),
+                }),
+                ty.kind,
+                *span,
+            )
+        }
         ast::ValueExpr::Path(info) => {
             let (place, ty, span) = lower_path(builder, info)?;
             (Operand::Move(place), ty, span)
diff --git a/program b/program
deleted file mode 100755
index 308731e00c82da0837951b493269b69da2edb26f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15544
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
OHTdTtSZja~aK)eg490Z;