Merge remote-tracking branch 'origin/gc-dev2' into gc-dev2

Conflicts:
	include/cyclone/types.h
This commit is contained in:
Justin Ethier 2015-10-13 22:48:14 -04:00
commit 241a54324d
3 changed files with 2 additions and 8 deletions

1
TODO
View file

@ -11,6 +11,7 @@ at this point, cyclone crashes when compiling the test suite. I think there may
Roadmap:
- Make it easier to work with multiple copies of cyclone. for example, maybe an env variable could be used to point a local copy of cyclone to the current directory for resources, instead of /usr/local/
- Add macro support, ideally including some level of hygiene
- Code cleanup - need to take care of accumulated cruft before release. also, can we profile to make things any faster?
- Target r7rs support (coordinate with feature list)

View file

@ -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);

View file

@ -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)