Fix merge mistakes -- TODO: amend to the appropriate commits instead

cgay · Apr 8, 2024 · 80e273a · 80e273a
1 parent de39614
commit 80e273a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/sources/dfmc/llvm-back-end/llvm-back-end-types.dylan b/sources/dfmc/llvm-back-end/llvm-back-end-types.dylan
@@ -171,7 +171,7 @@ define method llvm-object-type
   let repeated-size-value
     = rslotd & ^slot-value(o, ^size-slot-descriptor(rslotd));
   let repeated-size
-    = if (o.^object-class == dylan-value(#"<byte-string>"))
+    = if (o.^object-class == dylan-value(#"<string>"))
         repeated-size-value + 1 // for NUL termination
       else
         repeated-size-value

diff --git a/sources/dfmc/llvm-linker/llvm-link-object.dylan b/sources/dfmc/llvm-linker/llvm-link-object.dylan
@@ -243,7 +243,7 @@ define method emit-object-slot
  => ();
   let repeated-size-value = ^slot-value(o, ^size-slot-descriptor(slotd));
   let (repeated-size, terminated?)
-    = if (o.^object-class == dylan-value(#"<byte-string>"))
+    = if (o.^object-class == dylan-value(#"<string>"))
         values(repeated-size-value + 1, #t)
       else
         values(repeated-size-value, #f)
@@ -256,8 +256,7 @@ define method emit-object-slot
       repeated-elements[i] := llvm-raw-byte(back-end, byte);
     end;
     if (terminated?)
-      repeated-elements[repeated-size-value]
-        := llvm-raw-byte-character(back-end, '\0');
+      repeated-elements[repeated-size-value] := llvm-raw-byte(back-end, 0);
     end if;
   else
     for (i from 0 below repeated-size)

diff --git a/sources/lib/jam/jam-evaluator.dylan b/sources/lib/jam/jam-evaluator.dylan
@@ -226,13 +226,7 @@ define function jam-expand-arg-colon
             if (replace?)
               method (name :: <string>) => (modified :: <string>);
                 let locator = as(<file-locator>, strip-grist(name));
-<<<<<<< HEAD
-
                 as(<string>,
-=======
-
-                as(<byte-string>,
->>>>>>> bb1206747 (Remove end-of-line whitespace in all .dylan files)
                    make(<file-locator>,
                         directory: locator.locator-directory,
                         base: locator.locator-base,