From 12fa0e11f7c88d26606c91fa99ee11ebdb92126d Mon Sep 17 00:00:00 2001 From: Matthew Butterick Date: Thu, 27 Feb 2014 16:27:14 -0800 Subject: [PATCH] add sugar dependency --- info.rkt | 2 +- main.rkt | 24 ++++++++++-------------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/info.rkt b/info.rkt index 4ec478d..a4fbca0 100644 --- a/info.rkt +++ b/info.rkt @@ -1,4 +1,4 @@ #lang info (define collection "txexpr") - +(define deps '("sugar")) (define scribblings '(("scribblings/txexpr.scrbl" ()))) diff --git a/main.rkt b/main.rkt index 04347bf..f2c70b3 100644 --- a/main.rkt +++ b/main.rkt @@ -1,20 +1,9 @@ #lang racket/base -(require (for-syntax racket/base)) (require racket/match xml) +(require sugar/define) -(module+ safe (require racket/contract)) - -(define-syntax (define+provide+safe stx) - (syntax-case stx () - [(_ (proc arg ... . rest-arg) contract body ...) - #'(define+provide+safe proc contract - (λ(arg ... . rest-arg) body ...))] - [(_ name contract body ...) - #'(begin - (define name body ...) - (provide name) - (module+ safe - (provide (contract-out [name contract]))))])) +(module+ safe + (require racket/contract)) (define+provide+safe (txexpr-tag? x) (any/c . -> . boolean?) @@ -222,3 +211,10 @@ (define tx-extracted (do-extraction tx)) ;; do this first to fill matches (values tx-extracted (reverse matches))) + +#| +(module+ main + (define tx '(root (meta ((here "pollen"))) (meta ((here-path "/Users/mb/Desktop/pollen.pm"))) "\n" "\n" (make-table ("" "writer" "reader") ("Attention span" "Long" "Short") ("Interest in topic" "High" "Low") ("Persuadable by other opinions" "No" "Yes") ("Cares about your happiness" "Yes" "No")))) + (splitf-txexpr tx (λ(x) (and (txexpr? x) (equal? 'meta (car x)))))) + +|# \ No newline at end of file