Scheme: Use standard `char` token (#3254)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238
diff --git a/components/prism-scheme.js b/components/prism-scheme.js
index 681da1b..2409f22 100644
--- a/components/prism-scheme.js
+++ b/components/prism-scheme.js
@@ -14,10 +14,9 @@
pattern: /'[^()\[\]#'\s]+/,
greedy: true
},
- 'character': {
+ 'char': {
pattern: /#\\(?:[ux][a-fA-F\d]+\b|[-a-zA-Z]+\b|[\uD800-\uDBFF][\uDC00-\uDFFF]|\S)/,
- greedy: true,
- alias: 'string'
+ greedy: true
},
'lambda-parameter': [
// https://www.cs.cmu.edu/Groups/AI/html/r4rs/r4rs_6.html#SEC30
diff --git a/components/prism-scheme.min.js b/components/prism-scheme.min.js
index 0da52e7..980d04e 100644
--- a/components/prism-scheme.min.js
+++ b/components/prism-scheme.min.js
@@ -1 +1 @@
-Prism.languages.scheme={comment:/;.*|#;\s*(?:\((?:[^()]|\([^()]*\))*\)|\[(?:[^\[\]]|\[[^\[\]]*\])*\])|#\|(?:[^#|]|#(?!\|)|\|(?!#)|#\|(?:[^#|]|#(?!\|)|\|(?!#))*\|#)*\|#/,string:{pattern:/"(?:[^"\\]|\\.)*"/,greedy:!0},symbol:{pattern:/'[^()\[\]#'\s]+/,greedy:!0},character:{pattern:/#\\(?:[ux][a-fA-F\d]+\b|[-a-zA-Z]+\b|[\uD800-\uDBFF][\uDC00-\uDFFF]|\S)/,greedy:!0,alias:"string"},"lambda-parameter":[{pattern:/((?:^|[^'`#])[(\[]lambda\s+)(?:[^|()\[\]'\s]+|\|(?:[^\\|]|\\.)*\|)/,lookbehind:!0},{pattern:/((?:^|[^'`#])[(\[]lambda\s+[(\[])[^()\[\]']+/,lookbehind:!0}],keyword:{pattern:/((?:^|[^'`#])[(\[])(?:begin|case(?:-lambda)?|cond(?:-expand)?|define(?:-library|-macro|-record-type|-syntax|-values)?|defmacro|delay(?:-force)?|do|else|except|export|guard|if|import|include(?:-ci|-library-declarations)?|lambda|let(?:rec)?(?:-syntax|-values|\*)?|let\*-values|only|parameterize|prefix|(?:quasi-?)?quote|rename|set!|syntax-(?:case|rules)|unless|unquote(?:-splicing)?|when)(?=[()\[\]\s]|$)/,lookbehind:!0},builtin:{pattern:/((?:^|[^'`#])[(\[])(?:abs|and|append|apply|assoc|ass[qv]|binary-port\?|boolean=?\?|bytevector(?:-append|-copy|-copy!|-length|-u8-ref|-u8-set!|\?)?|caar|cadr|call-with-(?:current-continuation|port|values)|call\/cc|car|cdar|cddr|cdr|ceiling|char(?:->integer|-ready\?|\?|<\?|<=\?|=\?|>\?|>=\?)|close-(?:input-port|output-port|port)|complex\?|cons|current-(?:error|input|output)-port|denominator|dynamic-wind|eof-object\??|eq\?|equal\?|eqv\?|error|error-object(?:-irritants|-message|\?)|eval|even\?|exact(?:-integer-sqrt|-integer\?|\?)?|expt|features|file-error\?|floor(?:-quotient|-remainder|\/)?|flush-output-port|for-each|gcd|get-output-(?:bytevector|string)|inexact\??|input-port(?:-open\?|\?)|integer(?:->char|\?)|lcm|length|list(?:->string|->vector|-copy|-ref|-set!|-tail|\?)?|make-(?:bytevector|list|parameter|string|vector)|map|max|member|memq|memv|min|modulo|negative\?|newline|not|null\?|number(?:->string|\?)|numerator|odd\?|open-(?:input|output)-(?:bytevector|string)|or|output-port(?:-open\?|\?)|pair\?|peek-char|peek-u8|port\?|positive\?|procedure\?|quotient|raise|raise-continuable|rational\?|rationalize|read-(?:bytevector|bytevector!|char|error\?|line|string|u8)|real\?|remainder|reverse|round|set-c[ad]r!|square|string(?:->list|->number|->symbol|->utf8|->vector|-append|-copy|-copy!|-fill!|-for-each|-length|-map|-ref|-set!|\?|<\?|<=\?|=\?|>\?|>=\?)?|substring|symbol(?:->string|\?|=\?)|syntax-error|textual-port\?|truncate(?:-quotient|-remainder|\/)?|u8-ready\?|utf8->string|values|vector(?:->list|->string|-append|-copy|-copy!|-fill!|-for-each|-length|-map|-ref|-set!|\?)?|with-exception-handler|write-(?:bytevector|char|string|u8)|zero\?)(?=[()\[\]\s]|$)/,lookbehind:!0},operator:{pattern:/((?:^|[^'`#])[(\[])(?:[-+*%/]|[<>]=?|=>?)(?=[()\[\]\s]|$)/,lookbehind:!0},number:{pattern:RegExp(function(r){for(var e in r)r[e]=r[e].replace(/<[\w\s]+>/g,function(e){return"(?:"+r[e].trim()+")"});return r[e]}({"<ureal dec>":"\\d+(?:/\\d+)|(?:\\d+(?:\\.\\d*)?|\\.\\d+)(?:[esfdl][+-]?\\d+)?","<real dec>":"[+-]?<ureal dec>|[+-](?:inf|nan)\\.0","<imaginary dec>":"[+-](?:<ureal dec>|(?:inf|nan)\\.0)?i","<complex dec>":"<real dec>(?:@<real dec>|<imaginary dec>)?|<imaginary dec>","<num dec>":"(?:#d(?:#[ei])?|#[ei](?:#d)?)?<complex dec>","<ureal box>":"[0-9a-f]+(?:/[0-9a-f]+)?","<real box>":"[+-]?<ureal box>|[+-](?:inf|nan)\\.0","<imaginary box>":"[+-](?:<ureal box>|(?:inf|nan)\\.0)?i","<complex box>":"<real box>(?:@<real box>|<imaginary box>)?|<imaginary box>","<num box>":"#[box](?:#[ei])?|(?:#[ei])?#[box]<complex box>","<number>":"(^|[()\\[\\]\\s])(?:<num dec>|<num box>)(?=[()\\[\\]\\s]|$)"}),"i"),lookbehind:!0},boolean:{pattern:/(^|[()\[\]\s])#(?:[ft]|false|true)(?=[()\[\]\s]|$)/,lookbehind:!0},function:{pattern:/((?:^|[^'`#])[(\[])(?:[^|()\[\]'\s]+|\|(?:[^\\|]|\\.)*\|)(?=[()\[\]\s]|$)/,lookbehind:!0},identifier:{pattern:/(^|[()\[\]\s])\|(?:[^\\|]|\\.)*\|(?=[()\[\]\s]|$)/,lookbehind:!0,greedy:!0},punctuation:/[()\[\]']/};
\ No newline at end of file
+Prism.languages.scheme={comment:/;.*|#;\s*(?:\((?:[^()]|\([^()]*\))*\)|\[(?:[^\[\]]|\[[^\[\]]*\])*\])|#\|(?:[^#|]|#(?!\|)|\|(?!#)|#\|(?:[^#|]|#(?!\|)|\|(?!#))*\|#)*\|#/,string:{pattern:/"(?:[^"\\]|\\.)*"/,greedy:!0},symbol:{pattern:/'[^()\[\]#'\s]+/,greedy:!0},char:{pattern:/#\\(?:[ux][a-fA-F\d]+\b|[-a-zA-Z]+\b|[\uD800-\uDBFF][\uDC00-\uDFFF]|\S)/,greedy:!0},"lambda-parameter":[{pattern:/((?:^|[^'`#])[(\[]lambda\s+)(?:[^|()\[\]'\s]+|\|(?:[^\\|]|\\.)*\|)/,lookbehind:!0},{pattern:/((?:^|[^'`#])[(\[]lambda\s+[(\[])[^()\[\]']+/,lookbehind:!0}],keyword:{pattern:/((?:^|[^'`#])[(\[])(?:begin|case(?:-lambda)?|cond(?:-expand)?|define(?:-library|-macro|-record-type|-syntax|-values)?|defmacro|delay(?:-force)?|do|else|except|export|guard|if|import|include(?:-ci|-library-declarations)?|lambda|let(?:rec)?(?:-syntax|-values|\*)?|let\*-values|only|parameterize|prefix|(?:quasi-?)?quote|rename|set!|syntax-(?:case|rules)|unless|unquote(?:-splicing)?|when)(?=[()\[\]\s]|$)/,lookbehind:!0},builtin:{pattern:/((?:^|[^'`#])[(\[])(?:abs|and|append|apply|assoc|ass[qv]|binary-port\?|boolean=?\?|bytevector(?:-append|-copy|-copy!|-length|-u8-ref|-u8-set!|\?)?|caar|cadr|call-with-(?:current-continuation|port|values)|call\/cc|car|cdar|cddr|cdr|ceiling|char(?:->integer|-ready\?|\?|<\?|<=\?|=\?|>\?|>=\?)|close-(?:input-port|output-port|port)|complex\?|cons|current-(?:error|input|output)-port|denominator|dynamic-wind|eof-object\??|eq\?|equal\?|eqv\?|error|error-object(?:-irritants|-message|\?)|eval|even\?|exact(?:-integer-sqrt|-integer\?|\?)?|expt|features|file-error\?|floor(?:-quotient|-remainder|\/)?|flush-output-port|for-each|gcd|get-output-(?:bytevector|string)|inexact\??|input-port(?:-open\?|\?)|integer(?:->char|\?)|lcm|length|list(?:->string|->vector|-copy|-ref|-set!|-tail|\?)?|make-(?:bytevector|list|parameter|string|vector)|map|max|member|memq|memv|min|modulo|negative\?|newline|not|null\?|number(?:->string|\?)|numerator|odd\?|open-(?:input|output)-(?:bytevector|string)|or|output-port(?:-open\?|\?)|pair\?|peek-char|peek-u8|port\?|positive\?|procedure\?|quotient|raise|raise-continuable|rational\?|rationalize|read-(?:bytevector|bytevector!|char|error\?|line|string|u8)|real\?|remainder|reverse|round|set-c[ad]r!|square|string(?:->list|->number|->symbol|->utf8|->vector|-append|-copy|-copy!|-fill!|-for-each|-length|-map|-ref|-set!|\?|<\?|<=\?|=\?|>\?|>=\?)?|substring|symbol(?:->string|\?|=\?)|syntax-error|textual-port\?|truncate(?:-quotient|-remainder|\/)?|u8-ready\?|utf8->string|values|vector(?:->list|->string|-append|-copy|-copy!|-fill!|-for-each|-length|-map|-ref|-set!|\?)?|with-exception-handler|write-(?:bytevector|char|string|u8)|zero\?)(?=[()\[\]\s]|$)/,lookbehind:!0},operator:{pattern:/((?:^|[^'`#])[(\[])(?:[-+*%/]|[<>]=?|=>?)(?=[()\[\]\s]|$)/,lookbehind:!0},number:{pattern:RegExp(function(r){for(var e in r)r[e]=r[e].replace(/<[\w\s]+>/g,function(e){return"(?:"+r[e].trim()+")"});return r[e]}({"<ureal dec>":"\\d+(?:/\\d+)|(?:\\d+(?:\\.\\d*)?|\\.\\d+)(?:[esfdl][+-]?\\d+)?","<real dec>":"[+-]?<ureal dec>|[+-](?:inf|nan)\\.0","<imaginary dec>":"[+-](?:<ureal dec>|(?:inf|nan)\\.0)?i","<complex dec>":"<real dec>(?:@<real dec>|<imaginary dec>)?|<imaginary dec>","<num dec>":"(?:#d(?:#[ei])?|#[ei](?:#d)?)?<complex dec>","<ureal box>":"[0-9a-f]+(?:/[0-9a-f]+)?","<real box>":"[+-]?<ureal box>|[+-](?:inf|nan)\\.0","<imaginary box>":"[+-](?:<ureal box>|(?:inf|nan)\\.0)?i","<complex box>":"<real box>(?:@<real box>|<imaginary box>)?|<imaginary box>","<num box>":"#[box](?:#[ei])?|(?:#[ei])?#[box]<complex box>","<number>":"(^|[()\\[\\]\\s])(?:<num dec>|<num box>)(?=[()\\[\\]\\s]|$)"}),"i"),lookbehind:!0},boolean:{pattern:/(^|[()\[\]\s])#(?:[ft]|false|true)(?=[()\[\]\s]|$)/,lookbehind:!0},function:{pattern:/((?:^|[^'`#])[(\[])(?:[^|()\[\]'\s]+|\|(?:[^\\|]|\\.)*\|)(?=[()\[\]\s]|$)/,lookbehind:!0},identifier:{pattern:/(^|[()\[\]\s])\|(?:[^\\|]|\\.)*\|(?=[()\[\]\s]|$)/,lookbehind:!0,greedy:!0},punctuation:/[()\[\]']/};
\ No newline at end of file
diff --git a/tests/languages/racket/char_feature.test b/tests/languages/racket/char_feature.test
new file mode 100644
index 0000000..1e92a05
--- /dev/null
+++ b/tests/languages/racket/char_feature.test
@@ -0,0 +1,41 @@
+#\a ; lowercase letter
+#\A ; uppercase letter
+#\( ; left parenthesis
+#\space ; the space character
+#\newline ; the newline character
+
+#\c-a ; Control-a
+#\meta-b ; Meta-b
+#\c-s-m-h-a ; Control-Meta-Super-Hyper-A
+
+#\; #\' #\"
+
+#\u0041
+#\x10FFFF
+#\λ
+#\)
+
+----------------------------------------------------
+
+[
+ ["char", "#\\a"], ["comment", "; lowercase letter"],
+ ["char", "#\\A"], ["comment", "; uppercase letter"],
+ ["char", "#\\("], ["comment", "; left parenthesis"],
+ ["char", "#\\space"], ["comment", "; the space character"],
+ ["char", "#\\newline"], ["comment", "; the newline character"],
+
+ ["char", "#\\c-a"], ["comment", "; Control-a"],
+ ["char", "#\\meta-b"], ["comment", "; Meta-b"],
+ ["char", "#\\c-s-m-h-a"], ["comment", "; Control-Meta-Super-Hyper-A"],
+
+ ["char", "#\\;"], ["char", "#\\'"], ["char", "#\\\""],
+
+ ["char", "#\\u0041"],
+ ["char", "#\\x10FFFF"],
+ ["char", "#\\λ"],
+ ["char", "#\\)"]
+]
+
+----------------------------------------------------
+
+Checks for character literals.
diff --git a/tests/languages/racket/character_feature.test b/tests/languages/racket/character_feature.test
deleted file mode 100644
index f95cb70..0000000
--- a/tests/languages/racket/character_feature.test
+++ /dev/null
@@ -1,51 +0,0 @@
-#\a ; lowercase letter
-#\A ; uppercase letter
-#\( ; left parenthesis
-#\space ; the space character
-#\newline ; the newline character
-
-#\c-a ; Control-a
-#\meta-b ; Meta-b
-#\c-s-m-h-a ; Control-Meta-Super-Hyper-A
-
-#\; #\' #\"
-
-#\u0041
-#\x10FFFF
-#\λ
-#\)
-
-----------------------------------------------------
-
-[
- ["character", "#\\a"],
- ["comment", "; lowercase letter"],
- ["character", "#\\A"],
- ["comment", "; uppercase letter"],
- ["character", "#\\("],
- ["comment", "; left parenthesis"],
- ["character", "#\\space"],
- ["comment", "; the space character"],
- ["character", "#\\newline"],
- ["comment", "; the newline character"],
-
- ["character", "#\\c-a"],
- ["comment", "; Control-a"],
- ["character", "#\\meta-b"],
- ["comment", "; Meta-b"],
- ["character", "#\\c-s-m-h-a"],
- ["comment", "; Control-Meta-Super-Hyper-A"],
-
- ["character", "#\\;"],
- ["character", "#\\'"],
- ["character", "#\\\""],
-
- ["character", "#\\u0041"],
- ["character", "#\\x10FFFF"],
- ["character", "#\\λ"],
- ["character", "#\\)"]
-]
-
-----------------------------------------------------
-
-Checks for character literals.
diff --git a/tests/languages/scheme/char_feature.test b/tests/languages/scheme/char_feature.test
new file mode 100644
index 0000000..799cf56
--- /dev/null
+++ b/tests/languages/scheme/char_feature.test
@@ -0,0 +1,43 @@
+#\a ; lowercase letter
+#\A ; uppercase letter
+#\( ; left parenthesis
+#\space ; the space character
+#\newline ; the newline character
+
+#\c-a ; Control-a
+#\meta-b ; Meta-b
+#\c-s-m-h-a ; Control-Meta-Super-Hyper-A
+
+#\; #\' #\"
+
+#\u0041
+#\x10FFFF
+#\λ
+#\)
+#\💩
+
+----------------------------------------------------
+
+[
+ ["char", "#\\a"], ["comment", "; lowercase letter"],
+ ["char", "#\\A"], ["comment", "; uppercase letter"],
+ ["char", "#\\("], ["comment", "; left parenthesis"],
+ ["char", "#\\space"], ["comment", "; the space character"],
+ ["char", "#\\newline"], ["comment", "; the newline character"],
+
+ ["char", "#\\c-a"], ["comment", "; Control-a"],
+ ["char", "#\\meta-b"], ["comment", "; Meta-b"],
+ ["char", "#\\c-s-m-h-a"], ["comment", "; Control-Meta-Super-Hyper-A"],
+
+ ["char", "#\\;"], ["char", "#\\'"], ["char", "#\\\""],
+
+ ["char", "#\\u0041"],
+ ["char", "#\\x10FFFF"],
+ ["char", "#\\λ"],
+ ["char", "#\\)"],
+ ["char", "#\\💩"]
+]
+
+----------------------------------------------------
+
+Checks for character literals.
diff --git a/tests/languages/scheme/character_feature.test b/tests/languages/scheme/character_feature.test
deleted file mode 100644
index b699e18..0000000
--- a/tests/languages/scheme/character_feature.test
+++ /dev/null
@@ -1,53 +0,0 @@
-#\a ; lowercase letter
-#\A ; uppercase letter
-#\( ; left parenthesis
-#\space ; the space character
-#\newline ; the newline character
-
-#\c-a ; Control-a
-#\meta-b ; Meta-b
-#\c-s-m-h-a ; Control-Meta-Super-Hyper-A
-
-#\; #\' #\"
-
-#\u0041
-#\x10FFFF
-#\λ
-#\)
-#\💩
-
-----------------------------------------------------
-
-[
- ["character", "#\\a"],
- ["comment", "; lowercase letter"],
- ["character", "#\\A"],
- ["comment", "; uppercase letter"],
- ["character", "#\\("],
- ["comment", "; left parenthesis"],
- ["character", "#\\space"],
- ["comment", "; the space character"],
- ["character", "#\\newline"],
- ["comment", "; the newline character"],
-
- ["character", "#\\c-a"],
- ["comment", "; Control-a"],
- ["character", "#\\meta-b"],
- ["comment", "; Meta-b"],
- ["character", "#\\c-s-m-h-a"],
- ["comment", "; Control-Meta-Super-Hyper-A"],
-
- ["character", "#\\;"],
- ["character", "#\\'"],
- ["character", "#\\\""],
-
- ["character", "#\\u0041"],
- ["character", "#\\x10FFFF"],
- ["character", "#\\λ"],
- ["character", "#\\)"],
- ["character", "#\\💩"]
-]
-
-----------------------------------------------------
-
-Checks for character literals.