diff --git a/collects/honu/core/private/compile.rkt b/collects/honu/core/private/compile.rkt index b3ae1d1fd9..beb2e85f7a 100644 --- a/collects/honu/core/private/compile.rkt +++ b/collects/honu/core/private/compile.rkt @@ -11,24 +11,6 @@ (provide (all-defined-out)) -(define (honu->racket forms) - (define-literal-set literals (%racket)) - forms - #; - (syntax-parse forms #:literal-sets (literals) - #:literals ([literal-syntax syntax]) - [(%racket x) #'x - #; - (honu->racket #'x)] - [(literal-syntax form) #'#'form] - [(form ...) - (datum->syntax forms - (map honu->racket (syntax->list #'(form ...))) - forms - forms)] - [x #'x] - [() forms])) - (define (strip-stops code) (define-syntax-class stopper #:literal-sets (cruft) #; diff --git a/collects/honu/core/private/literals.rkt b/collects/honu/core/private/literals.rkt index 06ed99b620..a300df969d 100644 --- a/collects/honu/core/private/literals.rkt +++ b/collects/honu/core/private/literals.rkt @@ -34,8 +34,7 @@ honu-$ ;; FIXME: in-lines should probably not be here honu-in-lines - postfix - %racket) + postfix) (define-syntax-rule (define-literal+set set literal ...) (begin @@ -44,5 +43,4 @@ (define-literal-set set (literal ...))))) (define-literal-set cruft (#%parens #%brackets #%braces - %racket semicolon colon honu-comma)) diff --git a/collects/honu/core/private/operator.rkt b/collects/honu/core/private/operator.rkt index d90c6e1cd7..281005873f 100644 --- a/collects/honu/core/private/operator.rkt +++ b/collects/honu/core/private/operator.rkt @@ -49,7 +49,7 @@ #f ;; unary (lambda (argument) - (with-syntax ([argument (honu->racket argument)]) + (with-syntax ([argument argument]) (racket-syntax (operator argument)))) postfix?)) @@ -62,8 +62,8 @@ (begin-for-syntax (define-syntax-rule (mutator change) (lambda (left right) - (with-syntax ([left (honu->racket left)] - [right (change left (honu->racket right))]) + (with-syntax ([left left] + [right (change left right)]) (racket-syntax (set! left right)))))) ;; Traditional assignment operator diff --git a/collects/honu/core/private/parse2.rkt b/collects/honu/core/private/parse2.rkt index 0ca8e71003..4032b8023f 100644 --- a/collects/honu/core/private/parse2.rkt +++ b/collects/honu/core/private/parse2.rkt @@ -25,7 +25,6 @@ ;; phase -1 (require (for-template racket/base racket/splicing - (only-in "literals.rkt" %racket) "compile.rkt" "syntax.rkt" "extra.rkt")) @@ -507,13 +506,10 @@ colon (~seq variable:id honu-equal list:honu-expression (~optional honu-comma)) ... (~seq honu-where where:honu-expression (~optional honu-comma)) ...) (define filter (if (attribute where) - (with-syntax ([(where.result ...) (map honu->racket (syntax->list #'(where.result ...)))]) - #'((#:when where.result) ...)) + #'((#:when where.result) ...) #'())) (define comprehension - (with-syntax ([((filter ...) ...) filter] - [(list.result ...) (map honu->racket (syntax->list #'(list.result ...)))] - [work.result (honu->racket #'work.result)]) + (with-syntax ([((filter ...) ...) filter]) (racket-syntax (for/list ([variable list.result] ... filter ... ...)