~ chicken-core (chicken-5) bd8e5228fe1b6adeeaf61bf4695cdbf15ce8a2f2
commit bd8e5228fe1b6adeeaf61bf4695cdbf15ce8a2f2
Merge: 7f113e59 8ab5a7ec
Author: felix <felix@call-with-current-continuation.org>
AuthorDate: Thu May 26 09:08:28 2011 -0400
Commit: felix <felix@call-with-current-continuation.org>
CommitDate: Thu May 26 09:08:28 2011 -0400
resolved conflicts
diff --cc types.db
index c544dd50,c1133982..26aca684
--- a/types.db
+++ b/types.db
@@@ -1041,76 -542,48 +1041,77 @@@
(irregex (procedure irregex (#!rest) *))
;irregex-apply-match
-
-(irregex-dfa (procedure irregex-dfa (*) *))
-(irregex-dfa/extract (procedure irregex-dfa/extract (*) *))
-(irregex-dfa/search (procedure irregex-dfa/search (*) *))
-(irregex-extract (procedure irregex-extract (* string #!optional fixnum fixnum) list))
-(irregex-flags (procedure irregex-flags (*) *))
-(irregex-fold (procedure irregex-fold (* (procedure (fixnum (struct regexp-match) *) *) * string #!optional (procedure (fixnum *) *) fixnum fixnum) *))
-(irregex-fold/chunked (procedure irregex-fold/chunked (* (procedure (* fixnum (struct regexp-match) *) *) * procedure * #!optional (procedure (* fixnum *) *) fixnum fixnum) *))
-(irregex-lengths (procedure irregex-lengths (*) *))
-(irregex-match (procedure irregex-match (* string) *))
+(irregex-dfa (procedure! irregex-dfa ((struct regexp)) *)
+ (((struct regexp)) (##sys#slot #(1) '1)))
+
+(irregex-dfa/extract (procedure! irregex-dfa/extract ((struct regexp)) *)
+ (((struct regexp)) (##sys#slot #(1) '3)))
+
+(irregex-dfa/search (procedure! irregex-dfa/search ((struct regexp)) *)
+ (((struct regexp)) (##sys#slot #(1) '2)))
+
+(irregex-extract (procedure! irregex-extract (* string #!optional fixnum fixnum) list))
+(irregex-flags (procedure! irregex-flags ((struct regexp)) *)
+ (((struct regexp)) (##sys#slot #(1) '5)))
+
+(irregex-fold (procedure! irregex-fold (* (procedure (fixnum (struct regexp-match) *) *) * string #!optional (procedure (fixnum *) *) fixnum fixnum) *))
- (irregex-fold/chunked (procedure! irregex-fold/chunked (* (procedure (fixnum (struct regexp-match) *) *) * procedure * #!optional (procedure (fixnum *) *) fixnum fixnum) *))
++
++(irregex-fold/chunked (procedure! irregex-fold/chunked (* (procedure (* fixnum (struct regexp-match) *) *) * procedure * #!optional (procedure (* fixnum *) *) fixnum fixnum) *))
+
+(irregex-lengths (procedure! irregex-lengths ((struct regexp)) *)
+ (((struct regexp)) (##sys#slot #(1) '7)))
+
+(irregex-match (procedure! irregex-match (* string) *))
;irregex-match?
+
(irregex-match-data? (procedure irregex-match-data? (*) boolean))
+(#%predicate irregex-match-data? (struct regexp-match))
+
(irregex-match-end (procedure irregex-match-end (* #!optional *) *))
;irregex-match-end-chunk
-(irregex-match-end-index (procedure irregex-match-end-index ((struct regexp-match) #!optional *) fixnum))
-(irregex-match-names (procedure irregex-match-names ((struct regexp-match)) list))
-(irregex-match-num-submatches (procedure irregex-match-num-submatches ((struct regexp-match)) fixnum))
+(irregex-match-end-index (procedure! irregex-match-end-index ((struct regexp-match) #!optional *) fixnum))
+
+(irregex-match-names (procedure! irregex-match-names ((struct regexp-match)) list)
+ (((struct regexp-match)) (##sys#slot #(1) '2)))
+
+(irregex-match-num-submatches (procedure! irregex-match-num-submatches ((struct regexp-match)) fixnum))
(irregex-match-start (procedure irregex-match-start (* #!optional *) *))
;irregex-match-start-chunk
-(irregex-match-start-index (procedure irregex-match-start-index ((struct regexp-match) #!optional *) fixnum))
+(irregex-match-start-index (procedure! irregex-match-start-index ((struct regexp-match) #!optional *) fixnum))
(irregex-match-string (procedure irregex-match-string (*) *))
-(irregex-match-subchunk (procedure irregex-match-subchunk ((struct regexp-match) #!optional *) *))
+(irregex-match-subchunk (procedure! irregex-match-subchunk ((struct regexp-match) #!optional *) *))
(irregex-match-substring (procedure irregex-match-substring (* #!optional *) *))
-(irregex-match/chunked (procedure irregex-match/chunked (* * * #!optional fixnum) *))
-(irregex-names (procedure irregex-names (*) *))
+(irregex-match/chunked (procedure! irregex-match/chunked (* * * #!optional fixnum) *))
+
+(irregex-names (procedure! irregex-names ((struct regexp)) *)
+ (((struct regexp)) (##sys#slot #(1) '8)))
+
(irregex-new-matches (procedure irregex-new-matches (*) *))
-(irregex-nfa (procedure irregex-nfa (*) *))
-(irregex-num-submatches (procedure irregex-num-submatches (*) fixnum))
-(irregex-opt (procedure irregex-opt (list) *))
-(irregex-quote (procedure irregex-quote (string) string))
-(irregex-replace (procedure irregex-replace (* string #!rest) *))
-(irregex-replace/all (procedure irregex-replace/all (* string #!rest) *))
+
+(irregex-nfa (procedure! irregex-nfa ((struct regexp)) *)
+ (((struct regexp)) (##sys#slot #(1) '4)))
+
+(irregex-num-submatches (procedure! irregex-num-submatches ((struct regexp))
+ fixnum)
+ (((struct regexp)) (##sys#slot #(1) '6)))
+
+(irregex-opt (procedure! irregex-opt (list) *))
+(irregex-quote (procedure! irregex-quote (string) string))
+(irregex-replace (procedure! irregex-replace (* string #!rest) *))
+(irregex-replace/all (procedure! irregex-replace/all (* string #!rest) *))
(irregex-reset-matches! (procedure irregex-reset-matches! (*) *))
-(irregex-search (procedure irregex-search (* string #!optional fixnum fixnum) *))
-(irregex-search/chunked (procedure irregex-search/chunked (* procedure * #!optional fixnum fixnum *) *))
-(irregex-search/matches (procedure irregex-search/matches (* string fixnum fixnum *) *))
-(irregex-split (procedure irregex-split (* string #!optional fixnum fixnum) list))
-(irregex-submatches (procedure irregex-submatches (*) *))
+(irregex-search (procedure! irregex-search (* string #!optional fixnum fixnum) *))
+(irregex-search/matches (procedure! irregex-search/matches (* string fixnum fixnum *) *))
+(irregex-split (procedure! irregex-split (* string #!optional fixnum fixnum) list))
++(irregex-search/chunked (procedure! irregex-search/chunked (* procedure * #!optional fixnum fixnum *) *))
(irregex-match-valid-index?
- (procedure irregex-match-valid-index? ((struct regexp-match) *) boolean))
+ (procedure! irregex-match-valid-index? ((struct regexp-match) *) boolean))
+
(irregex? (procedure irregex? (*) boolean))
+(#%predicate irregex? (struct regexp))
+
(make-irregex-chunker
- (procedure make-irregex-chunker
+ (procedure! make-irregex-chunker
((procedure (*) *)
(procedure (*) *)
#!optional
Trap