Cater to dynamic subforms of SUBMATCH.

2002-10-29 15:57:00 +00:00 · 2002-10-29 15:57:00 +00:00 · a8ad3e0c71
parent c5c913b129
commit a8ad3e0c71
1 changed files with 6 additions and 1 deletions
--- a/scsh/rx/parse.scm
+++ b/scsh/rx/parse.scm
@ -182,7 +182,12 @@
 		  (hygn-eq? 'seq))
 	      (non-cset) (parse-seq (cdr sre)))
 	     
-	     ((hygn-eq? 'submatch) (non-cset) (re-submatch (parse-seq (cdr sre))))
+	     ((hygn-eq? 'submatch)
+	      (non-cset)
+	      (let ((seq (parse-seq (cdr sre))))
+		(if (static-regexp? seq)
+		    (re-submatch seq)
+		    `(,(r 're-submatch) ,(regexp->scheme seq r)))))
 	     ((hygn-eq? 'dsm)      (non-cset) (re-dsm (parse-seq (cdddr sre))
 						      (cadr sre)
 						      (caddr sre)))