~ chicken-core (chicken-5) 7d7c23f6134eb7f18efb84ae7d830dcc4c093c2b

commit 7d7c23f6134eb7f18efb84ae7d830dcc4c093c2b
Merge: fd1ac20d 526179fb
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Sat Jul 31 01:00:08 2010 +0200
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Sat Jul 31 01:00:08 2010 +0200

    resolved conflicts

diff --cc irregex.scm
index 58f56e41,14c071a8..b0dd5a31
--- a/irregex.scm
+++ b/irregex.scm
@@@ -122,13 -123,8 +123,14 @@@
  			   (##sys#slot ,%cache ,(add1 (* i 2)))
  			   ,(fold (add1 i))))))))
  
 +(define-inline (fast-string-copy! to tstart from fstart fend)
 +  (##core#inline "C_substring_copy" from to fstart fend tstart))
 +
 +(define-inline (fast-substring=? a b start1 start2 len)
 +  (##core#inline "C_substring_compare" a b start1 start2 len))
 +
  (include "irregex-core.scm")
+ (include "irregex-utils.scm")
  
  (define ##sys#glob->regexp
    (let ((list->string list->string)