From 4f08438adf277f31b01016f9245af1fc47e2c347 Mon Sep 17 00:00:00 2001
From: Scott Owens <sowens@cs.utah.edu>
Date: Fri, 10 Sep 2004 00:49:06 +0000
Subject: [PATCH] *** empty log message ***

original commit: 27620ae4971368a800168f028b47d844efd615ef
---
 collects/parser-tools/lex.ss                  |  5 ++++-
 collects/parser-tools/private-lex/stx.ss      |  9 +++++---
 collects/parser-tools/private-lex/token.ss    |  2 +-
 .../private-yacc/parser-builder.ss            | 22 +++++++------------
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/collects/parser-tools/lex.ss b/collects/parser-tools/lex.ss
index 7b8dc53..60eec6a 100644
--- a/collects/parser-tools/lex.ss
+++ b/collects/parser-tools/lex.ss
@@ -164,7 +164,10 @@
       ((_ name-form body-form)
        (let-values (((name body)
                      (normalize-definition (syntax (define-syntax name-form body-form)) #'lambda)))
-         #`(define-syntax #,name (make-lex-trans #,body))))
+         #`(define-syntax #,name 
+             (let ((certifier (syntax-local-certifier)))
+               (make-lex-trans (lambda (stx)
+                                 (certifier (#,body stx) 'a)))))))
       (_
        (raise-syntax-error
         #f
diff --git a/collects/parser-tools/private-lex/stx.ss b/collects/parser-tools/private-lex/stx.ss
index 04b5dbc..e894801 100644
--- a/collects/parser-tools/private-lex/stx.ss
+++ b/collects/parser-tools/private-lex/stx.ss
@@ -34,8 +34,9 @@
   ;; Expands lex-abbrevs and applies lex-trans.
   (define (parse stx disappeared-uses)
     (let ((parse
-           (lambda (stx)
-             (parse stx disappeared-uses))))
+           (lambda (s)
+             (parse (syntax-recertify s stx (current-inspector) 'a) 
+                    disappeared-uses))))
     (syntax-case stx (repetition union intersection complement concatenation
                       char-range char-complement)
       (_
@@ -111,7 +112,9 @@
        ((op form ...)
         (identifier? (syntax op))
         (let* ((o (syntax op))
-               (expansion (syntax-local-value o (lambda () #f))))
+               (expansion (syntax-local-value 
+                           (syntax-recertify o stx (current-inspector) 'a) 
+                           (lambda () #f))))
           (set-box! disappeared-uses (cons o (unbox disappeared-uses)))
           (cond
             ((lex-trans? expansion)
diff --git a/collects/parser-tools/private-lex/token.ss b/collects/parser-tools/private-lex/token.ss
index 6a3e456..722cbb3 100644
--- a/collects/parser-tools/private-lex/token.ss
+++ b/collects/parser-tools/private-lex/token.ss
@@ -73,7 +73,7 @@
                          #`(define (#,(make-ctor-name n) x)
                              (make-token '#,n x))))
                    (syntax->list (syntax (token ...))))
-               (define-syntax marked-token #f) ...))))
+               (define marked-token #f) ...))))
         ((_ ...)
          (raise-syntax-error 
           #f
diff --git a/collects/parser-tools/private-yacc/parser-builder.ss b/collects/parser-tools/private-yacc/parser-builder.ss
index e3b4c18..fe70e80 100644
--- a/collects/parser-tools/private-yacc/parser-builder.ss
+++ b/collects/parser-tools/private-yacc/parser-builder.ss
@@ -12,14 +12,6 @@
                   (listof identifier?) (union syntax? false?) syntax?) . ->* .
                  (any? any? any? any?))))
   
-  (define (strip so)
-    (syntax-local-introduce
-     (datum->syntax-object
-      #f
-      (syntax-object->datum so)
-      so
-      so)))
-  
   ;; fix-check-syntax : (listof identifier?) (listof identifier?) (listof identifier?)
   ;;                    (union syntax? false?) syntax?) -> syntax?
   (define (fix-check-syntax input-terms start end assocs prods)
@@ -36,8 +28,7 @@
             (syntax-case prods ()
               (((_ rhs ...) ...)
                (syntax->list (syntax (rhs ... ...)))))))
-      (with-syntax (((tmp ...) term-binders)
-                    ((term-group ...)
+      (with-syntax (((term-group ...)
                      (map (lambda (tg)
                             (syntax-property
                              (datum->syntax-object tg #f)
@@ -46,9 +37,12 @@
                           input-terms))
                     ((end ...)
                      (map get-term-binder end))
+                    ((start ...)
+                     (map get-term-binder start))
                     ((bind ...)
                      (syntax-case prods ()
-                       (((bind _ ...) ...) (syntax->list (syntax (bind ...))))))
+                       (((bind _ ...) ...)
+                        (syntax->list (syntax (bind ...))))))
                     (((bound ...) ...)
                      (map
                       (lambda (rhs)
@@ -68,9 +62,9 @@
                                 ((_ (__ term ...) ...)
                                  (syntax->list (syntax (term ... ...))))))
                          null)))
-             #`(when #f
-                 (let ((bind void) ... (tmp void) ...)
-                   (void bound ... ... term-group ... end ... prec ...))))))
+        #`(when #f
+            (let ((bind void) ...)
+              (void bound ... ... term-group ... start ... end ... prec ...))))))
   
   (define (build-parser filename src-pos suppress input-terms start end assocs prods)
     (let* ((grammar (parse-input input-terms start end assocs prods src-pos))