suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some style things.

Browse Source
This commit is contained in:
Eli Barzilay 2013-02-23 02:07:46 -05:00
parent cec73f5652
commit 334e1cfdd9
6 changed files with 582 additions and 673 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

256
collects/eopl/datatype.rkt
View File

@ -1,64 +1,51 @@
;; NOTE: datatypes are currently transparent, for the sake of EoPL's
;; use of `equal?'
#lang racket
#lang racket/base
(require (for-syntax "private/utils.rkt"))
(require (for-syntax racket/base "private/utils.rkt"))
(define-syntax define-datatype
(lambda (stx)
(define-syntax (define-datatype stx)
(syntax-case stx ()
[(_ name pred-name
(variant-name (field-name field-pred) ...)
...)
(let ([variant-names (syntax->list (syntax (variant-name ...)))])
(let ([variant-names (syntax->list #'(variant-name ...))])
;; More syntax checks...
(unless (identifier? (syntax name))
(raise-syntax-error #f
"expected an identifier for the datatype name"
stx (syntax name)))
(unless (identifier? (syntax pred-name))
(raise-syntax-error #f
"expected an identifier for the predicate name"
stx (syntax pred-name)))
(for-each (lambda (vt fields)
(unless (identifier? #'name)
(raise-syntax-error
#f "expected an identifier for the datatype name" stx #'name))
(unless (identifier? #'pred-name)
(raise-syntax-error
#f "expected an identifier for the predicate name" stx #'pred-name))
(for ([vt (in-list variant-names)]
[fields (in-list (syntax->list #'((field-name ...) ...)))])
(unless (identifier? vt)
(raise-syntax-error
'cases
"expected an identifier for the variant name"
stx vt))
(for-each (lambda (field)
'cases "expected an identifier for the variant name" stx vt))
(for ([field (in-list (syntax->list fields))])
(unless (identifier? field)
(raise-syntax-error
'cases
"expected an identifier for the field name"
stx field)))
(syntax->list fields)))
variant-names
(syntax->list (syntax ((field-name ...) ...))))
'cases "expected an identifier for the field name" stx field))))
;; Count the fields for each variant:
(with-syntax ([(variant-field-count ...)
(map (lambda (n)
(datum->syntax (quote-syntax here) n #f))
(map length
(map
syntax->list
(syntax->list
(syntax ((field-name ...) ...))))))]
(for/list ([x (in-list (syntax->list
#'((field-name ...) ...)))])
(datum->syntax (quote-syntax here)
(length (syntax->list x))
#f))]
[(variant? ...)
(map (lambda (vn)
(for/list ([vn (in-list variant-names)])
(datum->syntax
vn
(string->uninterned-symbol
(format "~a?" (syntax-e vn)))))
variant-names)]
(format "~a?" (syntax-e vn)))))]
[(variant-accessor ...)
(map (lambda (vn)
(for/list ([vn (in-list variant-names)])
(datum->syntax
vn
(string->uninterned-symbol
(format "~a-accessor" (syntax-e vn)))))
variant-names)]
(format "~a-accessor" (syntax-e vn)))))]
[(variant-mutator ...)
(generate-temporaries variant-names)]
[(make-variant ...)
@ -66,25 +53,22 @@
[(struct:variant ...)
(generate-temporaries variant-names)]
[(make-variant-name ...)
(map (lambda (vn)
(for/list ([vn (in-list variant-names)])
(datum->syntax
vn
(string->symbol
(format "make-~a" (syntax-e vn)))))
variant-names)])
(syntax
(begin
(format "make-~a" (syntax-e vn)))))])
#'(begin
(define-syntax name
;; Note: we're back to the transformer environment, here.
;; Also, this isn't a transformer function, so any direct
;; use of the name will trigger a syntax error. The name
;; can be found by `syntax-local-value', though.
(let ([cert (syntax-local-certifier #t)])
(make-dt (cert (syntax pred-name))
(list
(make-vt (cert (syntax variant-name))
(cert (syntax variant?))
(cert (syntax variant-accessor))
(make-dt (cert #'pred-name)
(list (make-vt (cert #'variant-name)
(cert #'variant?)
(cert #'variant-accessor)
variant-field-count)
...))))
;; Bind the predicate and selector functions:
@ -107,128 +91,98 @@
(values
x? ;; The datatype predicate
;; Create the constructor functions:
(let ([vname (quote variant-name)])
(let ([variant-name
(let* ([vname 'variant-name]
[variant-name
(lambda (field-name ...)
(unless (field-pred field-name)
(error vname
"bad value for ~a field: ~e"
(quote field-name)
field-name))
(error vname "bad value for ~a field: ~e"
'field-name field-name))
...
(make-variant field-name ...))])
variant-name))
variant-name)
...
variant? ...
variant-accessor ...))))
;; Compatibility bindings
(define-values (make-variant-name ...) (values variant-name ...))))))]
(define-values (make-variant-name ...) (values variant-name ...)))))]
[(_ name pred-name variant ...)
;; Must be a bad variant...
(for-each (lambda (variant)
(for ([variant (in-list (syntax->list #'(variant ...)))])
(syntax-case variant ()
[(variant-name field ...)
(let ([name (syntax variant-name)])
(let ([name #'variant-name])
(unless (identifier? name)
(raise-syntax-error
#f
"expected an identifier for the variant name"
stx
name))
#f "expected an identifier for the variant name" stx name))
;; Must be a bad field:
(for-each (lambda (field)
(for ([field (in-list (syntax->list #'(field ...)))])
(syntax-case field ()
[(field-name field-pred)
(let ([name (syntax field-name)])
(let ([name #'field-name])
(unless (identifier? name)
(raise-syntax-error
#f
"expected an identifier for the field name"
stx
name)))]
#f "expected an identifier for the field name" stx name)))]
[_else
(raise-syntax-error
#f
"expected a field name followed by a predicate expression, all in parentheses"
stx
field)]))
(syntax->list (syntax (field ...)))))]
#f "expected a field name followed by a predicate expression, all in parentheses" stx field)])))]
[_else
(raise-syntax-error
#f
"expected a variant name followed by a sequence of field declarations, all in parentheses"
stx
variant)]))
(syntax->list (syntax (variant ...))))]
#f "expected a variant name followed by a sequence of field declarations, all in parentheses" stx variant)]))]
[(_ name)
(raise-syntax-error
#f
"missing predicate name and variant clauses"
stx)])))
#f "missing predicate name and variant clauses" stx)]))
(define-syntax cases
(lambda (stx)
(define-syntax (cases stx)
(syntax-case stx ()
[(_ datatype expr
clause
...)
;; Get datatype information:
(let ([dt (and (identifier? (syntax datatype))
(syntax-local-value (syntax datatype) (lambda () #f)))])
(let ([dt (and (identifier? #'datatype)
(syntax-local-value #'datatype (lambda () #f)))])
(unless (dt? dt)
(raise-syntax-error
'cases
"not a datatype name"
stx
(syntax datatype)))
(raise-syntax-error 'cases "not a datatype name" stx #'datatype))
;; Parse clauses:
(let-values ([(vts field-idss bodys else-body)
(let loop ([clauses (syntax->list (syntax (clause ...)))][saw-cases null])
(cond
[(null? clauses)
(values null null null #f)]
[else
(define-values (vts field-idss bodys else-body)
(let loop ([clauses (syntax->list #'(clause ...))]
[saw-cases null])
(if (null? clauses)
(values null null null #f)
(let ([clause (car clauses)])
(syntax-case* clause ()
(lambda (a b)
(and (eq? (syntax-e b) 'else)
(not (identifier-binding b))))
[(variant (field-id ...) body0 body1 ...)
(let* ([variant (syntax variant)]
[vt
(ormap (lambda (dtv)
(let ([vt-name (vt-name-stx dtv)])
(let* ([variant #'variant]
[vt (ormap (lambda (dtv)
(define vt-name (vt-name-stx dtv))
(and (free-identifier=? variant vt-name)
dtv)))
dtv))
(dt-variants dt))]
[orig-variant (and vt (vt-name-stx vt))])
(unless orig-variant
(raise-syntax-error
#f
(format "not a variant of `~a'"
(syntax->datum (syntax datatype)))
(syntax->datum #'datatype))
stx
variant))
(let ([field-ids (syntax->list (syntax (field-id ...)))])
(for-each (lambda (fid)
(let ([field-ids (syntax->list #'(field-id ...))])
(for ([fid (in-list field-ids)])
(unless (identifier? fid)
(raise-syntax-error
#f
"expected an identifier for a field"
stx
fid)))
field-ids)
#f "expected an identifier for a field" stx fid)))
(let ([dtv (variant-assq variant (dt-variants dt))])
(unless (= (length field-ids)
(vt-field-count dtv))
(unless (= (length field-ids) (vt-field-count dtv))
(raise-syntax-error
#f
(format
"variant case `~a' for `~a' has wrong field count (expected ~a, found ~a)"
(syntax->datum variant)
(syntax->datum (syntax datatype))
(syntax->datum #'datatype)
(vt-field-count dtv)
(length field-ids))
stx
@ -238,79 +192,58 @@
(let ([dup (check-duplicate-identifier field-ids)])
(when dup
(raise-syntax-error
#f
"duplicate field identifier"
stx
dup)))
#f "duplicate field identifier" stx dup)))
;; Check for redundant case:
(when (memq orig-variant saw-cases)
(raise-syntax-error
#f
"duplicate case"
stx
clause))
(raise-syntax-error #f "duplicate case" stx clause))
;; This clause is ok:
(let-values ([(vts idss bodys else)
(loop (cdr clauses) (cons orig-variant saw-cases))])
(values (cons vt vts)
(cons field-ids idss)
(cons (syntax (begin body0 body1 ...)) bodys)
(cons #'(begin body0 body1 ...) bodys)
else))))]
[(else body0 body1 ...)
(begin
(unless (null? (cdr clauses))
(raise-syntax-error
#f
"else clause must be last"
stx
clause))
(values null null null (syntax (begin body0 body1 ...))))]
[_else (raise-syntax-error
#f
"bad clause"
stx
clause)]))]))])
#f "else clause must be last" stx clause))
(values null null null #'(begin body0 body1 ...)))]
[_else (raise-syntax-error #f "bad clause" stx clause)])))))
;; Missing any variants?
(unless (or else-body
(= (length vts) (length (dt-variants dt))))
(let* ([here (map vt-name-stx vts)]
[missing (let loop ([l (dt-variants dt)])
(cond
[(null? l) ""]
(unless (or else-body (= (length vts) (length (dt-variants dt))))
(define here (map vt-name-stx vts))
(define missing
(let loop ([l (dt-variants dt)])
(cond [(null? l) ""]
[(ormap (lambda (i) (free-identifier=? (vt-name-stx (car l)) i)) here)
(loop (cdr l))]
[else
(format " ~a~a"
[else (format " ~a~a"
(syntax-e (vt-name-stx (car l)))
(loop (cdr l)))]))])
(loop (cdr l)))])))
(raise-syntax-error
#f
(format "missing cases for the following variants:~a" missing)
stx)))
stx))
;; Create the result:
(with-syntax ([pred (dt-pred-stx dt)]
[(variant? ...) (map vt-predicate-stx vts)]
[((field-extraction ...) ...)
(map (lambda (vt)
(for/list ([vt (in-list vts)])
(with-syntax ([accessor (vt-accessor-stx vt)])
(let loop ([n 0])
(if (= n (vt-field-count vt))
null
(cons (with-syntax ([n n])
(syntax (accessor v n)))
(loop (add1 n)))))))
vts)]
(cons #`(accessor v #,n)
(loop (add1 n)))))))]
[((field-id ...) ...) field-idss]
[(body ...) bodys]
[else-body (or else-body
(syntax
(error 'cases "no variant case matched")))])
(syntax
(let ([v expr])
#'(error 'cases "no variant case matched"))])
#'(let ([v expr])
(if (not (pred v))
(error 'cases "not a ~a: ~s" (quote datatype) v)
(cond
@ -318,25 +251,16 @@
(let ([field-id field-extraction] ...)
body)]
...
[else else-body])))))))])))
[else else-body])))))]))
(define-syntax provide-datatype
(lambda (stx)
(define-syntax (provide-datatype stx)
(syntax-case stx ()
[(_ datatype)
(let ([dt (syntax-local-value (syntax datatype) (lambda () #f))])
(let ([dt (syntax-local-value #'datatype (lambda () #f))])
(unless (dt? dt)
(raise-syntax-error
#f
"not a datatype name"
stx
(syntax datatype)))
(raise-syntax-error #f "not a datatype name" stx #'datatype))
(with-syntax ([pred (dt-pred-stx dt)]
[(orig-variant ...)
(map vt-name-stx (dt-variants dt))])
(syntax
(provide datatype
pred
orig-variant ...))))])))
[(orig-variant ...) (map vt-name-stx (dt-variants dt))])
#'(provide datatype pred orig-variant ...)))]))
(provide define-datatype cases provide-datatype)

1
collects/eopl/info.rkt
View File

@ -3,4 +3,3 @@
(require string-constants)
(define scribblings '(("eopl.scrbl" () (teaching -20))))

6
collects/eopl/private/slldef.rkt
View File

@ -1,4 +1,4 @@
#lang racket
;; A compile-time table shared by eopl and sllgen:
(define sllgen-def (make-hasheq))
(provide sllgen-def)
;; A compile-time table shared by eopl and sllgen:
(define sllgen-def (make-hasheq))
(provide sllgen-def)

33
collects/eopl/private/sllgen.rkt
View File

@ -11,9 +11,7 @@
"../datatype.rkt"
"sllboth.rkt"
"slldef.rkt"
(for-syntax racket/base
"sllboth.rkt"
"slldef.rkt"))
(for-syntax racket/base "sllboth.rkt" "slldef.rkt"))
(provide sllgen:make-string-parser
@ -24,7 +22,8 @@
sllgen:show-define-datatypes
sllgen:list-define-datatypes)
'(let ((time-stamp "Time-stamp: <2000-09-25 11:48:47 wand>"))
#; ; this was originally quoted, probably intended as a comment
(let ((time-stamp "Time-stamp: <2000-09-25 11:48:47 wand>"))
(display (string-append
"sllgen.scm "
(substring time-stamp 13 29)
@ -113,7 +112,6 @@
scanner-spec))))
(syntax (make-string-parser parser-maker scanner-maker)))))
(define sllgen:make-stream-parser-maker
(lambda (scanner-spec grammar srcstx)
(with-syntax ((parser-maker (sllgen:make-parser-maker grammar srcstx))
@ -124,7 +122,6 @@
scanner-spec))))
(syntax (make-stream-parser parser-maker scanner-maker)))))
(define sllgen:make-stream-scanner-maker
(lambda (scanner-spec grammar srcstx)
(sllgen:make-scanner-maker
@ -159,8 +156,6 @@
pretty-print
'datatype-definitions))))))
(define sllgen:list-define-datatypes-maker
(lambda (scanner-spec grammar srcstx)
(with-syntax ((datatype-definitions
@ -221,7 +216,6 @@
(sllgen:find-production 'start-symbol parse-table
'() '() token-stream k)))))))
(define the-table 'ignored)
(define sllgen:build-parse-table
@ -321,8 +315,7 @@
(eq? (car rhs-item) 'separated-list)
(> (length rhs-item) 2)
(sllgen:rhs-check-syntax (cdr rhs-item))
(let
; ((last-item (car (last-pair rhs-item))))
(let ; ((last-item (car (last-pair rhs-item))))
((last-item (sllgen:last rhs-item)))
(or (symbol? last-item) (string? last-item))))))
@ -360,7 +353,6 @@
(((car preds) obj) #t)
(else (loop (cdr preds))))))))
(define sllgen:grammar->productions
(lambda (gram) gram)) ; nothing else now, but this
; might change
@ -368,8 +360,7 @@
(define sllgen:grammar->start-symbol
(lambda (gram)
(sllgen:production->lhs
(car
(sllgen:grammar->productions gram)))))
(car (sllgen:grammar->productions gram)))))
(define sllgen:make-production
(lambda (lhs rhs action)
@ -452,7 +443,6 @@
;; table ::= ((symbol . list) ...)
(define sllgen:make-initial-table ; makes table with all entries
; initialized to empty
(lambda (symbols)
@ -494,7 +484,6 @@
((eqv? a (car s)) (cdr s))
(else (cons (car s) (sllgen:rember a (cdr s)))))))
(define sllgen:gensym
(let ((n 0))
(lambda (s)
@ -947,8 +936,7 @@
(table (sllgen:make-initial-table non-terminals)))
(for-each
(lambda (production)
(let
((lhs (sllgen:production->lhs production)))
(let ((lhs (sllgen:production->lhs production)))
(sllgen:add-value-to-table! table lhs production)))
productions)
table)))
@ -1248,8 +1236,7 @@
(define sllgen:make-scanner-datatypes-alist
(lambda (init-states)
(let
((opcode-type-alist
(let ((opcode-type-alist
'((make-symbol . symbol?)
(symbol . symbol?)
(make-string . string?)
@ -1604,8 +1591,7 @@
(define sllgen:scanner-outer-loop
(lambda (start-states input-stream) ; -> (token stream), same as before
(let
((states start-states) ; list of local-states
(let ((states start-states) ; list of local-states
(buffer '()) ; characters accumulated so far
(success-buffer '()) ; characters for the last
; candidate token (a sublist
@ -1616,7 +1602,8 @@
(letrec
((process-stream
(lambda ()
(sllgen:scanner-inner-loop states stream
(sllgen:scanner-inner-loop
states stream
(lambda (new-actions new-states char new-stream)
(when (not (null? new-actions))
;; ok, the current buffer is a candidate token

17
collects/eopl/private/utils.rkt
View File

@ -1,17 +1,16 @@
#lang racket
#lang racket/base
;; Generative structure definitions:
(define-struct dt (pred-stx variants) #:mutable)
(define-struct vt (name-stx predicate-stx accessor-stx field-count) #:mutable)
;; Generative structure definitions:
(define-struct dt (pred-stx variants) #:mutable)
(define-struct vt (name-stx predicate-stx accessor-stx field-count) #:mutable)
;; Helper function:
(define (variant-assq name-stx variants)
;; Helper function:
(define (variant-assq name-stx variants)
(let loop ([l variants])
(if (free-identifier=? name-stx
(vt-name-stx (car l)))
(if (free-identifier=? name-stx (vt-name-stx (car l)))
(car l)
(loop (cdr l)))))
(provide (struct-out dt)
(provide (struct-out dt)
(struct-out vt)
variant-assq)