diff --git a/_includes/cheatsheet-text.md b/_includes/cheatsheet-text.md index 6aaf710..b9b417c 100644 --- a/_includes/cheatsheet-text.md +++ b/_includes/cheatsheet-text.md @@ -2,7 +2,7 @@ | *Document* | := | *Value* **ws** | | *Value* | := | **ws** (*Record* | *Collection* | *Atom* | *Embedded* | *Annotated*) | | *Collection* | := | *Sequence* | *Dictionary* | *Set* | -| *Atom* | := | *Boolean* | *String* | *ByteString* | *QuotedSymbol* | *Symbol* | *Number* | +| *Atom* | := | *Boolean* | *ByteString* | *String* | *QuotedSymbol* | *Symbol* | *Number* | | **ws** | := | (**space** | **tab** | **cr** | **lf** |`,`) | {:.postcard-grammar} @@ -13,9 +13,9 @@ {:.postcard-grammar} | *Boolean* | := | `#t`|`#f` | -| *String* | := | `"` (*unescaped* |`|`| (*escaped* |`\"`|`\u`*hex* *hex* *hex* *hex*)) `"` | -| *ByteString* | := | `#"`*binchar* `"`|`#x"` (**ws** | *hex* *hex*) **ws**`"`|`#[` (**ws** | *base64char*) **ws**`]` | -| *QuotedSymbol* | := | `|` (*unescaped* |`"`| (*escaped* |`\|`|`\u`*hex* *hex* *hex* *hex*)) `|` | +| *ByteString* | := | `#"`*binchar* `"`|`#x"` (**ws** *hex* *hex*) **ws**`"`|`#[` (**ws** | *base64char*) **ws**`]` | +| *String* | := | `"` (« any unicode scalar value except `\` or `"` » | *escaped* |`\"`) `"` | +| *QuotedSymbol* | := | `|` (« any unicode scalar value except `\` or `|` » | *escaped* |`\|`) `|` | | *Symbol* | := | (`A`..`Z`|`a`..`z`|`0`..`9`| *sympunct* | *symuchar*)+ | | *Number* | := | *Float* | *Double* | *SignedInteger* | | *Float* | := | *flt* (`f`|`F`) |`#xf"` (**ws** *hex* *hex*)4 **ws**`"` | @@ -25,13 +25,12 @@ {:.postcard-grammar} | *Embedded* | := | `#!`*Value* | | *Annotated* | := | *Annotation* *Value* | -| *Annotation* | := | `@`*Value* |`;`« any unicode scalar value except **cr** or **lf** » (**cr** | **lf**) | +| *Annotation* | := | `@`*Value* |`;`« any unicode scalar value except **cr** or **lf** » (**cr** | **lf**) | {:.postcard-grammar} -| *escaped* | := | `\\`|`\/`|`\b`|`\f`|`\n`|`\r`|`\t` | -| *unescaped* | := | « any unicode scalar value except `"`, `\`, or `|` » | +| *escaped* | := | `\\`|`\/`|`\b`|`\f`|`\n`|`\r`|`\t`|`\u`*hex* *hex* *hex* *hex* | | *binchar* | := | *binunescaped* | (*escaped* |`\"`|`\x`*hex* *hex*) | -| *binunescaped* | := | « any unicode scalar value between 32 and 126, except `"` or `\` » | +| *binunescaped* | := | « any unicode scalar value between 32 and 126, except `\` or `"` » | | *base64char* | := | `A`..`Z`|`a`..`z`|`0`..`9`|`+`|`/`|`-`|`_`|`=` | | *sympunct* | := | `~`|`!`|`$`|`%`|`^`|`&`|`*`|`?`|`_`|`=`|`+`|`-`|`/`|`.` | | *symuchar* | := | « any scalar value greater than 127 whose Unicode category is Lu, Ll, Lt, Lm, Lo, Mn, Mc, Me, Nd, Nl, No, Pc, Pd, Po, Sc, Sm, Sk, So, or Co » |