From 5eed9288c99e7dbbdd7593ec81f1a8a75ba097ba Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Tue, 19 Oct 2004 18:34:34 +0000 Subject: [PATCH] . original commit: 1bd92c441435a2c2ae5f0a37c7d5e6559e620360 --- collects/parser-tools/private-yacc/grammar.ss | 10 +++++----- .../parser-tools/private-yacc/input-file-parser.ss | 2 +- collects/parser-tools/private-yacc/parser-builder.ss | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/collects/parser-tools/private-yacc/grammar.ss b/collects/parser-tools/private-yacc/grammar.ss index 87362e2..a5b1436 100644 --- a/collects/parser-tools/private-yacc/grammar.ss +++ b/collects/parser-tools/private-yacc/grammar.ss @@ -26,12 +26,12 @@ (define-struct prec (num assoc) (make-inspector)) (provide/contract - (make-item (prod? (union false? natural-number?) . -> . item?)) - (make-term (symbol? (union false? natural-number?) (union prec? false?) . -> . term?)) - (make-non-term (symbol? (union false? natural-number?) . -> . non-term?)) - (make-prec (natural-number? (symbols 'left 'right 'nonassoc) . -> . prec?)) + (make-item (prod? (union false/c natural-number/c) . -> . item?)) + (make-term (symbol? (union false/c natural-number/c) (union prec? false/c) . -> . term?)) + (make-non-term (symbol? (union false/c natural-number/c) . -> . non-term?)) + (make-prec (natural-number/c (symbols 'left 'right 'nonassoc) . -> . prec?)) (make-prod (non-term? (vectorof (union non-term? term?)) - (union false? natural-number?) (union false? prec?) syntax? . -> . prod?))) + (union false/c natural-number/c) (union false/c prec?) syntax? . -> . prod?))) (provide diff --git a/collects/parser-tools/private-yacc/input-file-parser.ss b/collects/parser-tools/private-yacc/input-file-parser.ss index f0ecdaa..456c835 100644 --- a/collects/parser-tools/private-yacc/input-file-parser.ss +++ b/collects/parser-tools/private-yacc/input-file-parser.ss @@ -13,7 +13,7 @@ (provide/contract (parse-input ((listof identifier?) (listof identifier?) (listof identifier?) - (union false? syntax?) syntax? any? . -> . (is-a?/c grammar%))) + (union false/c syntax?) syntax? any/c . -> . (is-a?/c grammar%))) (get-term-list ((listof identifier?) . -> . (listof identifier?)))) (define stx-for-original-property (read-syntax #f (open-input-string "original"))) diff --git a/collects/parser-tools/private-yacc/parser-builder.ss b/collects/parser-tools/private-yacc/parser-builder.ss index 7014715..9cdbebb 100644 --- a/collects/parser-tools/private-yacc/parser-builder.ss +++ b/collects/parser-tools/private-yacc/parser-builder.ss @@ -8,12 +8,12 @@ (require-for-template mzscheme) (provide/contract - (build-parser ((string? any? any? (listof identifier?) (listof identifier?) - (listof identifier?) (union syntax? false?) syntax?) . ->* . - (any? any? any? any?)))) + (build-parser ((string? any/c any/c (listof identifier?) (listof identifier?) + (listof identifier?) (union syntax? false/c) syntax?) . ->* . + (any/c any/c any/c any/c)))) ;; fix-check-syntax : (listof identifier?) (listof identifier?) (listof identifier?) - ;; (union syntax? false?) syntax?) -> syntax? + ;; (union syntax? false/c) syntax?) -> syntax? (define (fix-check-syntax input-terms start ends assocs prods) (let* ((term-binders (get-term-list input-terms)) (get-term-binder