mbutterick
/
pollen
3
3
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

tidy core lang modules

Browse Source
pull/111/head
Matthew Butterick 9 years ago
parent 3765a57be4
commit d1d211f93e
8 changed files with 166 additions and 173 deletions
Show Stats Download Patch File Download Diff File

11
pollen/main.rkt
Unescape Escape View File

@ -1,8 +1,5 @@
#lang racket/base (module main "private/main-base.rkt"
(require "private/main-base.rkt") default-mode-preproc
(define+provide-module-begin-in-mode default-mode-preproc) ; because default mode in submodule is preproc (module reader "private/reader-base.rkt"
default-mode-auto))
(module reader racket/base
(require pollen/private/reader-base)
(define+provide-reader-in-mode default-mode-auto)) ; because default mode in file is auto

11
pollen/markdown.rkt
Unescape Escape View File

@ -1,8 +1,5 @@
#lang racket/base (module markdown "private/main-base.rkt"
(require "private/main-base.rkt") default-mode-markdown
(define+provide-module-begin-in-mode default-mode-markdown) (module reader "private/reader-base.rkt"
default-mode-markdown))
(module reader racket/base
(require pollen/private/reader-base)
(define+provide-reader-in-mode default-mode-markdown))

11
pollen/markup.rkt
Unescape Escape View File

@ -1,8 +1,5 @@
#lang racket/base (module markup "private/main-base.rkt"
(require "private/main-base.rkt") default-mode-markup
(define+provide-module-begin-in-mode default-mode-markup) (module reader "private/reader-base.rkt"
default-mode-markup))
(module reader racket/base
(require pollen/private/reader-base)
(define+provide-reader-in-mode default-mode-markup))

11
pollen/pre.rkt
Unescape Escape View File

@ -1,8 +1,5 @@
#lang racket/base (module pre "private/main-base.rkt"
(require "private/main-base.rkt") default-mode-preproc
(define+provide-module-begin-in-mode default-mode-preproc) (module reader "private/reader-base.rkt"
default-mode-preproc))
(module reader racket/base
(require pollen/private/reader-base)
(define+provide-reader-in-mode default-mode-preproc))

110
pollen/private/main-base.rkt
Unescape Escape View File

@ -1,55 +1,61 @@
#lang racket/base #lang racket/base
(require (for-syntax racket/base syntax/strip-context racket/syntax "../setup.rkt" "split-metas.rkt") (require (for-syntax racket/base syntax/strip-context racket/syntax "../setup.rkt" "split-metas.rkt")
"to-string.rkt" "../pagetree.rkt" "splice.rkt" "../setup.rkt" ) ; need world here to resolve PARSER-MODE-ARG "to-string.rkt" "../pagetree.rkt" "splice.rkt" "../setup.rkt")
(provide (all-defined-out)) (require "../setup.rkt")
(provide (except-out (all-from-out racket/base) #%module-begin)
(all-from-out "../setup.rkt")
(rename-out [dialect-module-begin #%module-begin]))
(define-syntax-rule (define+provide-module-begin-in-mode PARSER-MODE-ARG)
(begin (define-syntax-rule (dialect-module-begin PARSER-MODE-IN OUTER-EXPR ...)
(provide (except-out (all-from-out racket/base) #%module-begin) (#%module-begin
(rename-out [pollen-module-begin #%module-begin])) (require racket/base)
(define-syntax (pollen-module-begin stx) (provide (except-out (all-from-out racket/base) #%module-begin)
(syntax-case stx () (rename-out [pollen-module-begin #%module-begin]))
[(_ EXPR (... ...)) (define-syntax (pollen-module-begin stx)
(let-values ([(meta-hash expr-without-metas) (split-metas (syntax->datum #'(EXPR (... ...))) (setup:define-meta-name))]) (syntax-case stx ()
(with-syntax ([META-HASH (datum->syntax #'(EXPR (... ...)) meta-hash)] [(_ EXPR (... ...))
[(EXPR-WITHOUT-METAS (... ...)) (datum->syntax #'(EXPR (... ...)) expr-without-metas)] (let-values ([(meta-hash expr-without-metas) (split-metas (syntax->datum #'(EXPR (... ...))) (setup:define-meta-name))])
[METAS (format-id #'(EXPR (... ...)) "~a" (setup:meta-export))] (with-syntax ([META-HASH (datum->syntax #f meta-hash)]
[META-MOD (format-symbol "~a" (setup:meta-export))] [(EXPR-WITHOUT-METAS (... ...)) (datum->syntax #f expr-without-metas)]
[ROOT (format-id #'(EXPR (... ...)) "~a" (setup:main-root-node))] [METAS (format-id #f "~a" (setup:meta-export))]
[NEWLINE (datum->syntax #'(EXPR (... ...)) (setup:newline))] [META-MOD (format-symbol "~a" (setup:meta-export))]
[MODE-PAGETREE (datum->syntax #'(EXPR (... ...)) default-mode-pagetree)] [ROOT (format-id #f "~a" (setup:main-root-node))]
[MODE-MARKUP (datum->syntax #'(EXPR (... ...)) default-mode-markup)] [NEWLINE (datum->syntax #f (setup:newline))]
[MODE-MARKDOWN (datum->syntax #'(EXPR (... ...)) default-mode-markdown)] [MODE-PAGETREE (datum->syntax #f default-mode-pagetree)]
[SPLICING_TAG (datum->syntax #'(EXPR (... ...)) (setup:splicing-tag))] [MODE-MARKUP (datum->syntax #f default-mode-markup)]
[DOC (format-id #'(EXPR (... ...)) "~a" (setup:main-export))] [MODE-MARKDOWN (datum->syntax #f default-mode-markdown)]
[DOC-RAW (generate-temporary 'pollen-)]); prevents conflicts with other imported Pollen sources [SPLICING_TAG (datum->syntax #f (setup:splicing-tag))]
(replace-context #'(EXPR (... ...)) [DOC (format-id #f "~a" (setup:main-export))]
#'(#%module-begin [DOC-RAW (generate-temporary 'pollen-)]); prevents conflicts with other imported Pollen sources
(module META-MOD racket/base (replace-context #'(EXPR (... ...))
(provide METAS) #'(#%module-begin
(define METAS META-HASH)) (module META-MOD racket/base
(provide METAS)
(module inner pollen/private/doclang-raw (define METAS META-HASH))
DOC-RAW ; positional arg for doclang-raw that sets name of export.
(require pollen/top pollen/setup pollen/core) (module inner pollen/private/doclang-raw
(require (submod ".." META-MOD)) DOC-RAW ; positional arg for doclang-raw that sets name of export.
(provide (all-defined-out) #%top (all-from-out (submod ".." META-MOD) pollen/core)) (require pollen/top pollen/setup pollen/core)
EXPR-WITHOUT-METAS (... ...)) (require (submod ".." META-MOD))
(provide (all-defined-out) #%top (all-from-out (submod ".." META-MOD) pollen/core))
(require 'inner) EXPR-WITHOUT-METAS (... ...))
(define DOC (require 'inner)
(let* ([parser-mode-undefined? (procedure? inner:parser-mode)] ; if undefined, #%top makes it a procedure
[parser-mode (if parser-mode-undefined? PARSER-MODE-ARG inner:parser-mode)] (define DOC
[proc (cond (let* ([parser-mode-undefined? (procedure? inner:parser-mode)] ; if undefined, #%top makes it a procedure
[(eq? parser-mode 'MODE-PAGETREE) decode-pagetree] [parser-mode (if parser-mode-undefined? PARSER-MODE-IN inner:parser-mode)]
[(eq? parser-mode 'MODE-MARKUP) (λ(xs) (apply ROOT xs))] ; if `root` undefined, it becomes a default tag function [proc (cond
[(eq? parser-mode 'MODE-MARKDOWN) [(eq? parser-mode 'MODE-PAGETREE) decode-pagetree]
(λ(xs) (apply ROOT (map strip-empty-attrs ((dynamic-require 'markdown 'parse-markdown) (apply string-append (map to-string xs))))))] [(eq? parser-mode 'MODE-MARKUP) (λ(xs) (apply ROOT xs))] ; if `root` undefined, it becomes a default tag function
[else (λ(xs) (apply string-append (map to-string xs)))])] ; string output for preprocessor [(eq? parser-mode 'MODE-MARKDOWN)
;; drop leading newlines, as they're often the result of `defines` and `requires` (λ(xs) (apply ROOT (map strip-empty-attrs ((dynamic-require 'markdown 'parse-markdown) (apply string-append (map to-string xs))))))]
[doc-elements (or (memf (λ(ln) (not (equal? ln NEWLINE))) DOC-RAW) null)] [else (λ(xs) (apply string-append (map to-string xs)))])] ; string output for preprocessor
[doc-elements-spliced (splice doc-elements 'SPLICING_TAG)]) ;; drop leading newlines, as they're often the result of `defines` and `requires`
(proc doc-elements-spliced))) [doc-elements (or (memf (λ(ln) (not (equal? ln NEWLINE))) DOC-RAW) null)]
[doc-elements-spliced (splice doc-elements 'SPLICING_TAG)])
(provide DOC METAS (except-out (all-from-out 'inner) DOC-RAW #%top))))))])))) ; hide internal exports (proc doc-elements-spliced)))
(provide DOC METAS (except-out (all-from-out 'inner) DOC-RAW #%top))))))]))
OUTER-EXPR ...))

172
pollen/private/reader-base.rkt
Unescape Escape View File

@ -1,91 +1,93 @@
#lang racket/base #lang racket/base
(require racket/syntax syntax/strip-context racket/class) (require racket/syntax syntax/strip-context racket/class (for-syntax racket/base))
(require (only-in scribble/reader make-at-reader) pollen/setup "project.rkt" racket/list) (require (only-in scribble/reader make-at-reader) "../setup.rkt" "project.rkt")
(provide define+provide-reader-in-mode (all-from-out pollen/setup)) (provide (rename-out [reader-module-begin #%module-begin]) (all-from-out "../setup.rkt"))
(define (path-string->here-path path-string)
(cond
[(symbol? path-string) (symbol->string path-string)]
[(equal? path-string "unsaved editor") path-string]
[else (path->string path-string)]))
(define (make-custom-read custom-read-syntax-proc)
(λ(p) (syntax->datum (custom-read-syntax-proc (object-name p) p))))
(define (infer-parser-mode reader-mode reader-here-path)
(if (eq? reader-mode default-mode-auto)
(let* ([file-ext-pattern (pregexp "\\w+$")]
[here-ext (string->symbol (car (regexp-match file-ext-pattern reader-here-path)))]
[auto-computed-mode (cond
[(eq? here-ext (setup:pagetree-source-ext)) default-mode-pagetree]
[(eq? here-ext (setup:markup-source-ext)) default-mode-markup]
[(eq? here-ext (setup:markdown-source-ext)) default-mode-markdown]
[else default-mode-preproc])])
auto-computed-mode)
reader-mode))
(define (make-custom-read-syntax reader-mode) (define (custom-read p)
(λ (path-string p) (syntax->datum (custom-read-syntax (object-name p) p)))
(define read-inner (make-at-reader
#:command-char (if (or (eq? reader-mode default-mode-template)
(and (string? path-string)
(regexp-match (pregexp (format "\\.~a$" (setup:template-source-ext))) path-string)))
(setup:template-command-char)
(setup:command-char))
#:syntax? #t
#:inside? #t))
(define source-stx (read-inner path-string p))
(define reader-here-path (cond
[(symbol? path-string) (symbol->string path-string)]
[(equal? path-string "unsaved editor") path-string]
[else (path->string path-string)]))
(define parser-mode (if (eq? reader-mode default-mode-auto)
(let* ([file-ext-pattern (pregexp "\\w+$")]
[here-ext (string->symbol (car (regexp-match file-ext-pattern reader-here-path)))]
[auto-computed-mode (cond
[(eq? here-ext (setup:pagetree-source-ext)) default-mode-pagetree]
[(eq? here-ext (setup:markup-source-ext)) default-mode-markup]
[(eq? here-ext (setup:markdown-source-ext)) default-mode-markdown]
[else default-mode-preproc])])
auto-computed-mode)
reader-mode))
(define post-parser-syntax
(with-syntax ([HERE-KEY (format-id source-stx "~a" (setup:here-path-key))]
[HERE-PATH (datum->syntax source-stx reader-here-path)]
[POLLEN-MOD (format-symbol "~a" (gensym))] ; prevents conflicts with other imported Pollen sources
[PARSER-MODE-VALUE (format-symbol "~a" parser-mode)]
[DIRECTORY-REQUIRES (datum->syntax source-stx (require+provide-directory-require-files path-string))]
[(SOURCE-LINE ...) source-stx]
[DOC (format-id source-stx "~a" (setup:main-export))])
(replace-context
source-stx
#'(module runtime-wrapper racket/base
(module POLLEN-MOD pollen
(define-meta HERE-KEY HERE-PATH)
(define parser-mode 'PARSER-MODE-VALUE)
(provide (except-out (all-defined-out) parser-mode)
(prefix-out inner: parser-mode)) ; avoids conflicts with importing modules
DIRECTORY-REQUIRES
SOURCE-LINE ...)
(require (submod pollen/private/runtime-config show) 'POLLEN-MOD)
(provide (all-from-out 'POLLEN-MOD))
(show DOC inner:parser-mode HERE-PATH))))) ; HERE-PATH acts as "local" runtime config
(syntax-property post-parser-syntax
'module-language
`#(pollen/private/language-info get-language-info ,reader-here-path)))) ; reader-here-path acts as "top" runtime config
(define-syntax-rule (define+provide-reader-in-mode mode)
(begin (define (custom-read-syntax #:reader-mode [reader-mode #f] path-string p)
(define reader-mode mode) (define source-stx (let ([read-inner (make-at-reader
(define custom-read-syntax (make-custom-read-syntax reader-mode)) #:command-char (setup:command-char)
(define custom-read (make-custom-read custom-read-syntax)) #:syntax? #t
(define (get-info in mod line col pos) #:inside? #t)])
;; DrRacket caches source file information per session, (read-inner path-string p)))
;; so we can do the same to avoid multiple searches for the command char. (define reader-here-path (path-string->here-path path-string))
(let ([command-char-cache (make-hash)]) (define parser-mode (infer-parser-mode reader-mode reader-here-path))
(λ (key default) (define parsed-syntax
(case key (with-syntax ([HERE-KEY (format-id #f "~a" (setup:here-path-key))]
[(color-lexer drracket:toolbar-buttons) ; only do source-path searching if we have one of these keys [HERE-PATH (datum->syntax #f reader-here-path)]
(define maybe-source-path (with-handlers ([exn:fail? (λ(exn) #f)]) [POLLEN-MOD (format-symbol "~a" (gensym))] ; prevents conflicts with other imported Pollen sources
;; Robert Findler does not endorse `get-filename` here, [PARSER-MODE-VALUE (format-symbol "~a" parser-mode)]
;; because it's sneaky and may not always work. [DIRECTORY-REQUIRES (datum->syntax #f (require+provide-directory-require-files path-string))]
;; OTOH Scribble relies on it, so IMO it's highly unlikely to change. [(SOURCE-LINE ...) source-stx]
(let ([maybe-definitions-frame (object-name in)]) [DOC (format-id #f "~a" (setup:main-export))])
(send maybe-definitions-frame get-filename)))) ; will be #f if unsaved file (replace-context
(define my-command-char (hash-ref! command-char-cache maybe-source-path (λ _ (setup:command-char maybe-source-path)))) source-stx
(case key #'(module runtime-wrapper racket/base
[(color-lexer) (module POLLEN-MOD pollen
(define my-make-scribble-inside-lexer (define-meta HERE-KEY HERE-PATH)
(dynamic-require 'syntax-color/scribble-lexer 'make-scribble-inside-lexer (λ () #f))) (define parser-mode 'PARSER-MODE-VALUE)
(cond [my-make-scribble-inside-lexer (provide (except-out (all-defined-out) parser-mode)
(my-make-scribble-inside-lexer #:command-char my-command-char)] (prefix-out inner: parser-mode)) ; avoids conflicts with importing modules
[else default])] DIRECTORY-REQUIRES
[(drracket:toolbar-buttons) SOURCE-LINE ...)
(define my-make-drracket-buttons (dynamic-require 'pollen/private/drracket-buttons 'make-drracket-buttons)) (require (submod pollen/private/runtime-config show) 'POLLEN-MOD)
(my-make-drracket-buttons my-command-char)])] (provide (all-from-out 'POLLEN-MOD))
[else default])))) (show DOC inner:parser-mode HERE-PATH))))) ; HERE-PATH acts as "local" runtime config
(provide (rename-out [custom-read read] [custom-read-syntax read-syntax]) get-info))) (syntax-property parsed-syntax
'module-language
`#(pollen/private/language-info get-language-info ,reader-here-path))) ; reader-here-path acts as "top" runtime config
(define (custom-get-info in mod line col pos)
;; DrRacket caches source file information per session,
;; so we can do the same to avoid multiple searches for the command char.
(let ([command-char-cache (make-hash)])
(λ (key default)
(case key
[(color-lexer drracket:toolbar-buttons) ; only do source-path searching if we have one of these keys
(define maybe-source-path (with-handlers ([exn:fail? (λ(exn) #f)])
;; Robert Findler does not endorse `get-filename` here,
;; because it's sneaky and may not always work.
;; OTOH Scribble relies on it, so IMO it's highly unlikely to change.
(let ([maybe-definitions-frame (object-name in)])
(send maybe-definitions-frame get-filename)))) ; will be #f if unsaved file
(define my-command-char (hash-ref! command-char-cache maybe-source-path (λ _ (setup:command-char maybe-source-path))))
(case key
[(color-lexer)
(define my-make-scribble-inside-lexer
(dynamic-require 'syntax-color/scribble-lexer 'make-scribble-inside-lexer (λ () #f)))
(cond [my-make-scribble-inside-lexer
(my-make-scribble-inside-lexer #:command-char my-command-char)]
[else default])]
[(drracket:toolbar-buttons)
(define my-make-drracket-buttons (dynamic-require 'pollen/private/drracket-buttons 'make-drracket-buttons))
(my-make-drracket-buttons my-command-char)])]
[else default]))))
(define-syntax-rule (reader-module-begin mode expr-to-ignore ...)
(#%module-begin
(define cgi custom-get-info) ; stash hygienic references to local funcs with new identifiers
(define cr custom-read)
(define (crs ps p) (custom-read-syntax #:reader-mode mode ps p))
(provide (rename-out [cr read][crs read-syntax][cgi get-info]))))

2
pollen/private/ts.rktd
Unescape Escape View File

@ -1 +1 @@
1455065350 1455151281

11
pollen/ptree.rkt
Unescape Escape View File

@ -1,8 +1,5 @@
#lang racket/base (module ptree "private/main-base.rkt"
(require "private/main-base.rkt") default-mode-pagetree
(define+provide-module-begin-in-mode default-mode-pagetree) (module reader "private/reader-base.rkt"
default-mode-pagetree))
(module reader racket/base
(require pollen/private/reader-base)
(define+provide-reader-in-mode default-mode-pagetree))

Write Preview
Loading…
Cancel
Save