Fix two bugs in SRFI 115 support.

(cherry picked from commit d147c3907dfc1bde56b854bd1fe3c3714bab41c3)

diff --git a/src/runtime/mit-macros.scm b/src/runtime/mit-macros.scm
index dba67971906383840f8b926f70765a688c7e0a38..b35693a3ccf32d77dc677244759f176831b25121 100644 (file)
--- a/src/runtime/mit-macros.scm
+++ b/src/runtime/mit-macros.scm
@@ -266,7 +266,7 @@ USA.
      (scons-rule `((* any))
        (lambda (sres)
         (scons-call 'regexp
-                    (apply scons-call 'quasiquote (scons-close ':) sres)))))))
+                    (scons-call 'quasiquote (cons ': sres))))))))
 \f
 ;;;; Conditionals
 

diff --git a/src/runtime/regexp-nfa.scm b/src/runtime/regexp-nfa.scm
index adf6b1557fa6ffc643b395a353841a958448cc5e..dddc763a90f9509f65b76eab3f602b2a26aaa2cb 100644 (file)
--- a/src/runtime/regexp-nfa.scm
+++ b/src/runtime/regexp-nfa.scm
@@ -665,7 +665,9 @@ USA.
 (define (all-groups string index ctx)
   (cons (make-group 0 string index (ctx-index ctx))
        (map (lambda (p) (p string))
-            (reverse (ctx-groups ctx)))))
+            (if (ctx-groups ctx)
+                (reverse (ctx-groups ctx))
+                '()))))
 
 (define-record-type <group>
     (make-group key string start end)