diff --git a/base.ss b/base.ss index 098d2b0..ca4e369 100644 --- a/base.ss +++ b/base.ss @@ -58,4 +58,4 @@ [quote-case-restriction (parameter/c (or/c 'lower 'upper))] [lowercase-quote-symbols (listof symbol?)] [uppercase-quote-symbols (listof symbol?)] - [current-time-format (parameter/c (or/c string? (-> (or/c time-utc? time-tai?) string?)))]) + [current-time-format (parameter/c (or/c string? (-> date? string?)))]) diff --git a/main.ss b/main.ss index 020715e..b1b4e34 100644 --- a/main.ss +++ b/main.ss @@ -1,6 +1,7 @@ #lang scheme/base -(require "csv/csv.ss" +(require "base.ss" + "csv/csv.ss" "javascript/javascript.ss" "plain/plain.ss" "xml/xml.ss") @@ -10,4 +11,5 @@ (provide (all-from-out "csv/csv.ss" "javascript/javascript.ss" "plain/plain.ss" - "xml/xml.ss")) + "xml/xml.ss") + current-time-format) diff --git a/scribblings/javascript-syntax.scrbl b/scribblings/javascript-syntax.scrbl index 1373ef3..01c939c 100644 --- a/scribblings/javascript-syntax.scrbl +++ b/scribblings/javascript-syntax.scrbl @@ -91,8 +91,7 @@ The forms above use the same parenthetical Javascript syntax: (unquote-splicing expr) js-expr] [js-decl (custom-syntax-id js-decl ...) - (function id (id ...) js-stmt ...) - (var js-init ...)] + (function id (id ...) js-stmt ...)] [js-init id [id js-expr] (unquote expr) @@ -125,11 +124,12 @@ The forms above use the same parenthetical Javascript syntax: [dot-expr (code:line id (code:comment "property-style: a.b")) (code:line (!index id expr) (code:comment "array-style: a.b[1]")) (code:line (id js-expr ...) (code:comment "method-style: a.b(1, 2)"))] - [opt-decl _ - var-decl] - [opt-expr _ - expr]] - + [switch-clause (case id js-expr ...) + (default js-expr ...)] + [opt-decl _ var-decl] + [opt-expr _ expr] + [var-decl (var js-init ...)]] + @scheme[!raw] forms are treated as statements or expressions depending on their context. Semicolons and parentheses are added automatically depending on the interpretation of the block: @examples[