Replace syntax-map with stx-map in unstable/automata
This commit is contained in:
parent
07efcc95d3
commit
d6b63dddf7
|
@ -1,8 +1,8 @@
|
||||||
#lang racket/base
|
#lang racket/base
|
||||||
(require "nfa.rkt"
|
(require "nfa.rkt"
|
||||||
(for-syntax syntax/parse
|
(for-syntax syntax/parse
|
||||||
|
syntax/stx
|
||||||
racket/syntax
|
racket/syntax
|
||||||
unstable/syntax
|
|
||||||
syntax/id-table
|
syntax/id-table
|
||||||
racket/dict
|
racket/dict
|
||||||
racket/list
|
racket/list
|
||||||
|
@ -34,13 +34,13 @@
|
||||||
(list* state (append-map state->epsilons es)))))
|
(list* state (append-map state->epsilons es)))))
|
||||||
(with-syntax*
|
(with-syntax*
|
||||||
([((start* ...) ...)
|
([((start* ...) ...)
|
||||||
(syntax-map state->epsilons #'(start ...))]
|
(stx-map state->epsilons #'(start ...))]
|
||||||
[((((next-state* ...) ...) ...) ...)
|
[((((next-state* ...) ...) ...) ...)
|
||||||
(syntax-map (λ (ns*)
|
(stx-map (λ (ns*)
|
||||||
(syntax-map (λ (ns)
|
(stx-map (λ (ns)
|
||||||
(syntax-map state->epsilons ns))
|
(stx-map state->epsilons ns))
|
||||||
ns*))
|
ns*))
|
||||||
#'(((next-state ...) ...) ...))])
|
#'(((next-state ...) ...) ...))])
|
||||||
(syntax/loc stx
|
(syntax/loc stx
|
||||||
(nfa (start* ... ...)
|
(nfa (start* ... ...)
|
||||||
(end ...)
|
(end ...)
|
||||||
|
|
|
@ -7,9 +7,9 @@
|
||||||
racket/set
|
racket/set
|
||||||
racket/list
|
racket/list
|
||||||
(for-syntax syntax/parse
|
(for-syntax syntax/parse
|
||||||
|
syntax/stx
|
||||||
syntax/id-table
|
syntax/id-table
|
||||||
racket/syntax
|
racket/syntax
|
||||||
unstable/syntax
|
|
||||||
racket/dict
|
racket/dict
|
||||||
racket/list
|
racket/list
|
||||||
racket/base))
|
racket/base))
|
||||||
|
@ -45,7 +45,7 @@
|
||||||
[start-set start-set]
|
[start-set start-set]
|
||||||
[((next-state_n ...) ...)
|
[((next-state_n ...) ...)
|
||||||
(for/list ([states (in-list (syntax->list #'(((next-state ...) ...) ...)))])
|
(for/list ([states (in-list (syntax->list #'(((next-state ...) ...) ...)))])
|
||||||
(syntax-map set->num states))]
|
(stx-map set->num states))]
|
||||||
; Use optimized version if there are not too many states
|
; Use optimized version if there are not too many states
|
||||||
[op= (if is-fixnum? #'unsafe-fx= #'=)]
|
[op= (if is-fixnum? #'unsafe-fx= #'=)]
|
||||||
[bit-shift (if is-fixnum? #'unsafe-fxlshift #'arithmetic-shift)]
|
[bit-shift (if is-fixnum? #'unsafe-fxlshift #'arithmetic-shift)]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user