From c9ae6cdf976a09a053aa275c6daf9708ce1a33df Mon Sep 17 00:00:00 2001 From: Justin Ethier Date: Thu, 16 May 2019 13:35:51 -0400 Subject: [PATCH] Bug fixes --- scheme/cyclone/cgen.sld | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scheme/cyclone/cgen.sld b/scheme/cyclone/cgen.sld index 152dfc4d..04c17ee4 100644 --- a/scheme/cyclone/cgen.sld +++ b/scheme/cyclone/cgen.sld @@ -421,7 +421,7 @@ (cond ((and immutable use-alloca) (string-append cvar "->hdr.immutable = 1;")) - (immutable ;; no alloca + ((and immutable (not use-alloca)) (string-append cvar ".hdr.immutable = 1;")) (else ""))) ;; Mutable (default), no need to set anything @@ -586,7 +586,10 @@ ";\n" "memcpy(((string_type *)" cvar-name ")->str, " tmp-name "," blen ");\n" "((string_type *)" cvar-name ")->str[" blen "] = '\\0';" - (c-set-immutable-field cvar-name use-alloca immutable) + (c-set-immutable-field + (string-append + "((string_type *)" cvar-name ")") + use-alloca immutable) ))))) (else (c-code/vars