Compare commits

..

2 Commits

Author SHA1 Message Date
Georges Dupéron
95bdc806de Fails 2017-01-01 20:30:22 +01:00
Georges Dupéron
93660ec4b8 Works 2017-01-01 20:28:51 +01:00
6 changed files with 46 additions and 98 deletions

View File

@ -6,22 +6,14 @@ env:
global: global:
- RACKET_DIR=~/racket - RACKET_DIR=~/racket
matrix: matrix:
#- RACKET_VERSION=6.1.1 - RACKET_VERSION=6.1.1
#- RACKET_VERSION=6.2 - RACKET_VERSION=6.2
#- RACKET_VERSION=6.2.1 - RACKET_VERSION=6.2.1
#- RACKET_VERSION=6.3 - RACKET_VERSION=6.3
- RACKET_VERSION=6.4 - RACKET_VERSION=6.4
- RACKET_VERSION=6.5 - RACKET_VERSION=6.5
- RACKET_VERSION=6.6
- RACKET_VERSION=6.7 - RACKET_VERSION=6.7
- RACKET_VERSION=6.8
- RACKET_VERSION=6.9
- RACKET_VERSION=6.10
- RACKET_VERSION=6.10.1
- RACKET_VERSION=6.11
- RACKET_VERSION=6.12
- RACKET_VERSION=7.0
- RACKET_VERSION=7.1
- RACKET_VERSION=7.2
- RACKET_VERSION=HEAD - RACKET_VERSION=HEAD
matrix: matrix:
@ -41,6 +33,6 @@ before_script:
script: script:
- raco pkg install -j 2 --deps search-auto --link aful - raco pkg install -j 2 --deps search-auto --link aful
- raco test -r -p aful - raco test -x -p aful
after_script: after_script:

View File

@ -6,16 +6,14 @@
read read-syntax) read read-syntax)
(except-in aful/reader (except-in aful/reader
read read-syntax))) read read-syntax)))
@author[
"Alex Knauth"
@author+email["Suzanne Soy" "racket@suzanne.soy"]]
@title{aful} @title{aful}
@;; example: @aful-code{(map #λ(+ % 1) '(1 2 3))} @;; example: @aful-code{(map #λ(+ % 1) '(1 2 3))}
@(define-syntax-rule @aful-code[stuff ...] @(define-syntax-rule @aful-code[stuff ...]
@code[#:lang "aful racket" stuff ...]) @code[#:lang "aful racket" stuff ...])
source code: @url["https://github.com/jsmaniac/aful/"] source code: @url["https://github.com/AlexKnauth/aful"]
@section{#lang aful} @section{#lang aful}

View File

@ -19,9 +19,9 @@
racket/function racket/function
syntax/srcloc syntax/srcloc
hygienic-reader-extension/extend-reader hygienic-reader-extension/extend-reader
"scribble-enhanced.rkt" ;"scribble-enhanced.rkt"
(only-in scribble/base)
phc-toolkit/stx phc-toolkit/stx
"unhygienic/hygienic-reader-extension--extend-reader--unhygienic.rkt"
(for-meta -10 racket/base) (for-meta -10 racket/base)
(for-meta -9 racket/base) (for-meta -9 racket/base)
(for-meta -8 racket/base) (for-meta -8 racket/base)
@ -64,7 +64,7 @@
(require syntax/strip-context) (require syntax/strip-context)
(define ((wrap-reader-unhygienic p) . p-args) (define ((wrap-reader-unhygienic p) . p-args)
(strip-context (strip-context
(apply (extend-reader-unhygienic p (apply (extend-reader p
(λ ([orig-rt (current-readtable)] (λ ([orig-rt (current-readtable)]
#:outer-scope outer-scope #:outer-scope outer-scope
#:arg-str [arg-str (current-arg-string)]) #:arg-str [arg-str (current-arg-string)])
@ -160,14 +160,10 @@
[% (string->id stx* arg-str)] [% (string->id stx* arg-str)]
[%1 (string->id stx* arg-str "1")] [%1 (string->id stx* arg-str "1")]
[body stx*]) [body stx*])
(syntax-property (syntax/loc loc-stx
(syntax/top-loc loc-stx
(lambda args (lambda args
(define-syntax % (make-rename-transformer #'%1)) (define-syntax % (make-rename-transformer #'%1))
body)) body))))
'scribble-render-as
aful-scribble-render)
))
stx))) stx)))
(define (orig stx) (define (orig stx)

View File

@ -1,20 +1,11 @@
#lang racket #lang racket
(provide aful-scribble-render) ;(require (only-in scribble/base));scribble-enhanced/with-manual)
(require phc-toolkit/stx) ;(provide aful-scribble-render)
(define (aful-scribble-render self id code typeset-code uncode d->s stx-prop) #;(define (aful-scribble-render self)
(syntax-case self () (syntax-case self ()
[(_ _ _ body) [(_ _ _ body)
; #λ(body) reads as: #`(elem (list (seclink "_lang_aful" #:doc '(lib "aful/docs/aful.scrbl")
; (lambda args (tt ""))
; (define-syntax % (make-rename-transformer #'%1)) (racket body)))]))
; body)
(with-syntax ([uncode (datum->syntax uncode (syntax-e uncode) self)])
(syntax/top-loc self
((uncode(let ()
(local-require scribble-enhanced/with-manual)
(seclink "_lang_aful"
#:doc '(lib "aful/docs/aful.scrbl")
(tt ""))))
body)))]))

View File

@ -1,27 +0,0 @@
#lang racket
;; Copied and adjusted from
;; https://github.com/AlexKnauth/hygienic-reader-extension
;; /blob/master/hygienic-reader-extension/extend-reader.rkt
(provide extend-reader-unhygienic)
;; extend-reader : (-> (-> A ... Any)
;; (-> Readtable #:outer-scope (-> Syntax Syntax) Readtable)
;; (-> A ... Any))
(define (extend-reader-unhygienic proc extend-readtable #:hygiene? [hygiene? #t])
(lambda args
(define orig-readtable (current-readtable))
(define outer-scope (make-syntax-introducer/use-site))
(parameterize ([current-readtable (extend-readtable orig-readtable #:outer-scope outer-scope)])
(define stx (apply proc args))
(if (and (syntax? stx) hygiene?)
(outer-scope stx)
stx))))
;; make-syntax-introducer/use-site : (-> (-> Syntax Syntax))
(define (make-syntax-introducer/use-site)
(cond [(procedure-arity-includes? make-syntax-introducer 1)
(make-syntax-introducer #t)]
[else
(make-syntax-introducer)]))

View File

@ -10,7 +10,6 @@
"rackunit-lib" "rackunit-lib"
"phc-toolkit" "phc-toolkit"
"scribble-enhanced" "scribble-enhanced"
"scribble-lib"
)) ))
(define build-deps (define build-deps
@ -18,6 +17,5 @@
"racket-doc" "racket-doc"
"scribble-doc" "scribble-doc"
"scribble-code-examples" "scribble-code-examples"
"scribble-doc"
)) ))