*** empty log message ***

original commit: 4d3ec15b51313f6f9296a1ed2057786481570a84

collects/parser-tools/lex.ss

@@ -20,7 +20,8 @@
 			(let ((match 
 			       (push-back lb (- length longest-match-length))))
 			  (if (not longest-match-action)
-			      (error 'lex "No match found in rest of input"))
+			      (error 'lexer (format "No match found in input starting with: ~a" 
+                                                    (list->string (lex-buffer-from lb)))))
 			  (longest-match-action
 			   (lambda ()
 			     first-pos)
@@ -33,9 +34,11 @@
 			   lb)))))
 	      (lambda (lb)
 		(unless (lex-buffer? lb)
-			(error 'lex 
+                  (raise-type-error 
-			       (format 
+                   'lexer 
-				"Lexer expects argument of type lex-buf; given ~a" lb)))
+                   "lex-buf"
+                   0
+                   lb))
 		(let ((first-pos (get-position lb)))
 		  (let lexer-loop (
 				   ;; current-state
@@ -51,7 +54,6 @@
 				   (length 1)
 				   ;; how many characters are in the longest match
 				   (longest-match-length 0)
-				   ;;(end-pos first-pos))
 				   (end-pos first-pos))
 		    (let ((next-state
 			   (cond
@@ -84,45 +86,44 @@
 				      pos)))))))))))
       (lambda (stx)
 	(syntax-case stx ()
-		     ((_ (re act) ...) 
+          ((_ (re1 act1) (re act) ...) 
-		      (let* ((table (generate-table (syntax ((re act) ...)) 
+           (let* ((table (generate-table (syntax ((re1 act1) (re act) ...)) stx))
-						    stx))
                   (code
                    `(let ((start-state ,(table-start table))
                           (trans-table ,(table-trans table))
                           (eof-table ,(table-eof table))
                           (actions (vector ,@(vector->list (table-actions table)))))
                       ,code)))
-			(datum->syntax-object #'here code #f)))))))
+             (datum->syntax-object #'here code #f)))
+          (_
+           (raise-syntax-error #f "Form should be (lexer (re act) ...) with at least 1 (re ast) pair" stx))))))
   
   
   
-  (define-syntax define-lex-abbrev
+  (define-syntax (define-lex-abbrev stx)
-    (lambda (stx)
     (syntax-case stx ()
-        ((_ name val)
+      ((_ name re)
        (syntax
         (define-syntax name
-            (make-lex-abbrev (quote-syntax val)))))
+          (make-lex-abbrev (quote-syntax re)))))
       (_ 
        (raise-syntax-error
         #f
-          "Form should be (define-lex-abbrev name val)"
+        "Form should be (define-lex-abbrev name re)"
-          stx)))))
+        stx))))
 
-  (define-syntax define-lex-abbrevs
+  (define-syntax (define-lex-abbrevs stx)
-    (lambda (stx)
     (syntax-case stx ()
       ((_ x ...)
        (let* ((abbrev (syntax->list (syntax (x ...))))
               (r (map (lambda (a)
                         (syntax-case a ()
-                            ((name val)
+                          ((name re)
                            (identifier? (syntax name))
-                             (syntax (define-lex-abbrev name val)))
+                           (syntax (define-lex-abbrev name re)))
                           (_ (raise-syntax-error
-                                #f 
+                              'Lexer-abbreviation 
-                                "Lexer abbreviation must be (identifier value)"
+                              "Form should be (identifier value)"
                               a))))
                       abbrev)))
          (datum->syntax-object
@@ -132,8 +133,8 @@
       (_
        (raise-syntax-error
         #f
-          "Form should be (define-lex-abbrevs (name val) ...)"
+        "Form should be (define-lex-abbrevs (name re) ...)"
-          stx)))))
+        stx))))
 
   ;; Lex buffer is NOT thread safe