Changeset trunk,6 for trunk

Timestamp:

06/08/2007 06:37:29 PM (19 years ago)

Author:

dsowen

revision id:

svn-v3-trunk0:2948df59-2b31-0410-8e06-c40c0b09d5b6:trunk:6

Message:

Fleshed out the regex macro (untested).
Added a macro to handle symbols embedded in rules.

File:

• trunk/parse2.lisp (modified) (2 diffs)

trunk/parse2.lisp

@@ -51 +51 @@
 
 (defmacro with-regex-parser ((name regex) &body body)
-  (error "Not implemented."))
+  (declare ((symbol name)
+            (string regex)))
+  (follow "with-regex-parser~%")
+  (let ((regex2 `(:sequence (:flags) :start-anchor
+                  (:register (:regex ,regex)))))
+    (with-gensyms (input start end)
+      `(flet ((,name (,input)
+               ,(format nil "Regex parser for ~S." regex)
+               (declare (string ,input))
+               (multiple-value-bind (,start ,end) (scan (quote ,regex2) ,input)
+                 (when ,start
+                   (values
+                    t
+                    (substring ,input :start ,end)
+                    (list (substring ,input :end ,end)))))))))))
+
+(defmacro with-user-parser ((name parser) &body body)
+  (declare (symbol name parser))
+  (follow "with-user-parser~%")
+  (with-gensyms (input)
+    `(flet ((,name (,input)
+             ,(format nil "User parser for ~S." parser)
+             (,parser ,input)))
+      (declare (inline ,name))
+      ,@body)))
 
 (defmacro with-sequence-parser% ((name seq) &body body)
@@ -181 +205 @@
     (character `(with-character-parser (,name ,rule) ,@body))
     (string `(with-string-parser (,name ,rule) ,@body))
+    (symbol `(with-user-parser (,name ,rule) ,@body))
     (list
      (destructuring-bind (head . tail) rule