[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/rx.el
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/rx.el |
Date: |
Fri, 04 Apr 2003 01:22:00 -0500 |
Index: emacs/lisp/emacs-lisp/rx.el
diff -c emacs/lisp/emacs-lisp/rx.el:1.3 emacs/lisp/emacs-lisp/rx.el:1.4
*** emacs/lisp/emacs-lisp/rx.el:1.3 Mon Dec 23 12:43:24 2002
--- emacs/lisp/emacs-lisp/rx.el Tue Feb 4 07:53:34 2003
***************
*** 78,85 ****
;; (and line-start ?\n)))
;;
;; "\\$[I]d: [^ ]+ \\([^ ]+\\) "
! ;; (rx (and "$Id: "
! ;; (1+ (not (in " ")))
;; " "
;; (submatch (1+ (not (in " "))))
;; " "))
--- 78,85 ----
;; (and line-start ?\n)))
;;
;; "\\$[I]d: [^ ]+ \\([^ ]+\\) "
! ;; (rx (and "$Id: "
! ;; (1+ (not (in " ")))
;; " "
;; (submatch (1+ (not (in " "))))
;; " "))
***************
*** 90,96 ****
;; etc.
;;; History:
! ;;
;;; Code:
--- 90,96 ----
;; etc.
;;; History:
! ;;
;;; Code:
***************
*** 244,250 ****
(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."
--- 244,250 ----
(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,402 ****
(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.
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'
--- 396,402 ----
(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.
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,469 ****
(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 ...)'."
--- 463,469 ----
(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,517 ****
info)
((null info)
(error "Unknown Rx form `%s'" form))
! (t
(funcall (nth 0 info) form)))))
((consp form)
(let ((info (rx-info (car form))))
--- 511,517 ----
info)
((null info)
(error "Unknown Rx form `%s'" form))
! (t
(funcall (nth 0 info) form)))))
((consp form)
(let ((info (rx-info (car form))))
***************
*** 549,555 ****
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)'
like `any'.
`(not (any SET))'
--- 549,555 ----
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)'
like `any'.
`(not (any SET))'
***************
*** 751,757 ****
`(one-or-more SEXP)'
matches one or more occurrences of A.
!
`(1+ SEXP)'
like `one-or-more'.
--- 751,757 ----
`(one-or-more SEXP)'
matches one or more occurrences of A.
!
`(1+ SEXP)'
like `one-or-more'.
***************
*** 763,769 ****
`(zero-or-one SEXP)'
matches zero or one occurrences of A.
!
`(optional SEXP)'
like `zero-or-one'.
--- 763,769 ----
`(zero-or-one SEXP)'
matches zero or one occurrences of A.
!
`(optional SEXP)'
like `zero-or-one'.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/emacs-lisp/rx.el,
Miles Bader <=