Permalink
Browse files

Update the :re regular-expression binding form

The :re form didn't get updated for the changes needed
for :flet. This commit fixes that and updates the testsuite.
  • Loading branch information...
1 parent 35bddd8 commit dcc7c68237713d2ea0dcb66f66f2346345ed81b9 Gary King committed Mar 7, 2010
Showing with 8 additions and 6 deletions.
  1. +3 −3 dev/bind-cl-ppcre.lisp
  2. +1 −1 dev/bind-re-allegro.lisp
  3. +3 −1 metabang-bind-test.asd
  4. +1 −1 metabang-bind.asd
View
@@ -16,7 +16,7 @@
(progn ,@(bind-macro-helper
remaining-bindings declarations body)))))
(cl-ppcre:register-groups-bind
- ,vars (,regex ,value-form :sharedp t)
+ ,vars (,regex ,(first value-form) :sharedp t)
,(bind-filter-declarations
declarations variable-form)
(setf ,gok t)
@@ -32,7 +32,7 @@
body declarations remaining-bindings)
;; (:re "re" vars)
(bind (((regex &rest vars) variable-form))
- `((cl-ppcre:register-groups-bind ,vars (,regex ,value-form :sharedp t)
+ `((cl-ppcre:register-groups-bind ,vars (,regex ,(first value-form) :sharedp t)
,(bind-filter-declarations
declarations variable-form)
,@(bind-macro-helper
@@ -54,7 +54,7 @@
,@(bind-macro-helper
remaining-bindings declarations body))))
(cl-ppcre:register-groups-bind
- ,vars (,regex ,value-form :sharedp t)
+ ,vars (,regex ,(first value-form) :sharedp t)
,(bind-filter-declarations
declarations variable-form)
(setf ,gok t)
View
@@ -15,7 +15,7 @@
(return-from ,gblock
(progn ,@(bind-macro-helper
remaining-bindings declarations body)))))
- (excl:re-let ,regex ,value-form
+ (excl:re-let ,regex ,(first value-form)
,(loop for var in vars for i from 1 collect
`(,var ,i))
,(bind-filter-declarations
View
@@ -22,7 +22,9 @@
(:file "classes")
(:file "plists")
(:file "arrays")
- (:file "functions"))))
+ (:file "functions")
+ #+allegro
+ (:file "regex"))))
:depends-on (:metabang-bind :lift))
#+asdf-system-connections
View
@@ -2,7 +2,7 @@
(in-package #:metabang.bind-system)
(defsystem metabang-bind
- :version "0.7.4"
+ :version "0.8.0"
:author "Gary Warren King <gwking@metabang.com>"
:licence "MIT License"
:description "Bind is a macro that generalizes multiple-value-bind, let, let*, destructuring-bind, structure and slot accessors, and a whole lot more."

0 comments on commit dcc7c68

Please sign in to comment.