summaryrefslogtreecommitdiff
path: root/modules/language/python/module/re
diff options
context:
space:
mode:
authorStefan Israelsson Tampe <stefan.itampe@gmail.com>2018-09-11 20:49:02 +0200
committerStefan Israelsson Tampe <stefan.itampe@gmail.com>2018-09-11 20:49:02 +0200
commitc75be2215da7dcc993ca8450bafcbab609132871 (patch)
tree02dd34ba28787b8d98ad50433c41339639d60cfc /modules/language/python/module/re
parentf75533465dbe70b153c75c85297422964b1a598d (diff)
final hhtp code
Diffstat (limited to 'modules/language/python/module/re')
-rw-r--r--modules/language/python/module/re/parser.scm8
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/language/python/module/re/parser.scm b/modules/language/python/module/re/parser.scm
index 765500d..5af54e8 100644
--- a/modules/language/python/module/re/parser.scm
+++ b/modules/language/python/module/re/parser.scm
@@ -14,7 +14,7 @@
(mk q+? #:+? "+?")
(define subexpr (f-list #:sub
- (f-seq (f-tag "(") (Ds ee-) (f-tag ")"))))
+ (f-seq (f-tag "(") (Ds ee) (f-tag ")"))))
(define f-back
(f-or (f-list #:class (mk-token (f-reg! "[AZbBdDsSwntr]")))
@@ -89,14 +89,14 @@
lookh lookh! rev rev! f-^ f-$ flags))
(define spec (f-list #:op atom (f-or! q+? q?? q*? q* q? q+ repn? repnm? repn repnm)))
(define aatom (f-or! spec atom))
-(define f-com (f-seq (f-tag "#") (f* (f-not (f-or! f-eof f-nl)))))
+(define f-com (f-seq (f-tag "#")
+ (f-reg "[ \t]")
+ (f* (f-not (f-or! f-eof f-nl)))))
(define ws (Ds (if (fluid-ref pretty)
(f* (f-or! f-com f-nl (f-reg "[ \t\r]")))
f-true)))
(define line (f-cons* #:seq ws aatom ws (ff* (f-seq ws aatom ws) )))
-(define line- (f-cons* #:seq aatom (ff* (f-seq aatom) )))
(define ee (f-cons* #:or line (ff* (f-seq f-bar line))))
-(define ee- (f-cons* #:or line- (ff* (f-seq f-bar line-))))
(define pretty (make-fluid #f))
(define (parse-reg str)
(with-fluids ((*whitespace* ws))