diff --git a/include/cyclone/runtime.h b/include/cyclone/runtime.h index 10291097..78b2d12c 100644 --- a/include/cyclone/runtime.h +++ b/include/cyclone/runtime.h @@ -126,7 +126,7 @@ object Cyc_string2symbol(object str); object Cyc_list2string(object cont, object lst); common_type Cyc_string2number(object str); void dispatch_string_91append(int argc, object clo, object cont, object str1, ...); -object Cyc_string_append(int argc, object cont, object str1, ...); +object Cyc_string_append(object cont, int argc, object str1, ...); integer_type Cyc_string_length(object str); object Cyc_substring(object cont, object str, object start, object end); object Cyc_string_ref(object str, object k); diff --git a/runtime.c b/runtime.c index 5b87b259..d4658cf9 100644 --- a/runtime.c +++ b/runtime.c @@ -966,7 +966,7 @@ void dispatch_string_91append(int _argc, object clo, object cont, object str1, . Cyc_string_append_va_list(_argc - 1); } -object Cyc_string_append(int _argc, object cont, object str1, ...) { +object Cyc_string_append(object cont, int _argc, object str1, ...) { string_type result; va_list ap; va_start(ap, str1); diff --git a/scheme/cyclone/cgen.sld b/scheme/cyclone/cgen.sld index c8a79ee4..b1d7be0d 100644 --- a/scheme/cyclone/cgen.sld +++ b/scheme/cyclone/cgen.sld @@ -610,13 +610,6 @@ Cyc-read-line cons length vector-length cell)))) -TODO: how to fix this up to generate argc after cont? -or alternatively, maybe we say screw it and just reverse the order of -args in the runtime function... but that's not ideal since we do it differently -everywhere else. will it cause problems to have a special case????? -object c_732612 = Cyc_string_append((closure)&c_732599, 2,&c_732613, r_73276); -return_closcall1((closure)&c_732599, c_732612);; - ;; Pass continuation as the function's first parameter? (define (prim:cont? exp) (and (prim? exp)