diff options
Diffstat (limited to 'lisp/emacs-lisp/rx.el')
| -rw-r--r-- | lisp/emacs-lisp/rx.el | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el index a58a38bf21..3ac3538822 100644 --- a/lisp/emacs-lisp/rx.el +++ b/lisp/emacs-lisp/rx.el @@ -78,8 +78,8 @@ ;; (and line-start ?\n))) ;; ;; "\\$[I]d: [^ ]+ \\([^ ]+\\) " -;; (rx (and "$Id: " -;; (1+ (not (in " "))) +;; (rx (and "$Id: " +;; (1+ (not (in " "))) ;; " " ;; (submatch (1+ (not (in " ")))) ;; " ")) @@ -90,7 +90,7 @@ ;; etc. ;;; History: -;; +;; ;;; Code: @@ -244,7 +244,7 @@ See also `rx-constituents'." (while (and (not (null op)) (symbolp op)) (setq op (cdr (assq op rx-constituents)))) op) - + (defun rx-check (form) "Check FORM according to its car's parsing info." @@ -396,7 +396,7 @@ FORM is either `(repeat N FORM1)' or `(repeat N M FORM1)'." (defun rx-kleene (form) "Parse and produce code from FORM. FORM is `(OP FORM1)', where OP is one of the `zero-or-one', -`zero-or-more' etc. operators. +`zero-or-more' etc. operators. If OP is one of `*', `+', `?', produce a greedy regexp. If OP is one of `*?', `+?', `??', produce a non-greedy regexp. If OP is anything else, produce a greedy regexp if `rx-greedy-flag' @@ -463,7 +463,7 @@ of all atomic regexps." (cdr (assq form rx-categories))) (error "Unknown category `%s'" form)) t) - + (defun rx-category (form) "Parse and produce code from FORM, which is `(category SYMBOL ...)'." @@ -511,7 +511,7 @@ NO-GROUP non-nil means don't put shy groups around the result." info) ((null info) (error "Unknown Rx form `%s'" form)) - (t + (t (funcall (nth 0 info) form))))) ((consp form) (let ((info (rx-info (car form)))) @@ -549,7 +549,7 @@ CHAR matches any character in SET. SET may be a character or string. Ranges of characters can be specified as `A-Z' in strings. -'(in SET)' +'(in SET)' like `any'. `(not (any SET))' @@ -751,7 +751,7 @@ CHAR `(one-or-more SEXP)' matches one or more occurrences of A. - + `(1+ SEXP)' like `one-or-more'. @@ -763,7 +763,7 @@ CHAR `(zero-or-one SEXP)' matches zero or one occurrences of A. - + `(optional SEXP)' like `zero-or-one'. |