Commit ad010eac22ca42eae28363c627f8b6bae92eda52
2012-12-18T00:18:43
Changed regex Prism.languages.clike.number Changes: * Variable names matching /[a-f]+/ are no longer treated as numbers. * Added support for upper case and scientific notation. * Also changed corresponding files in /components. Minor issues: * No support for type suffixes (e.g. 300f for float). * Leading decimal point is marked up as 'punctuation', instead as part of * the number (e.g. .1; 0.1 is matched correctly).
diff --git a/components/prism-clike.js b/components/prism-clike.js
index 309ec4d..ab6aa8c 100644
--- a/components/prism-clike.js
+++ b/components/prism-clike.js
@@ -6,7 +6,7 @@ Prism.languages.clike = {
'string': /("|')(\\?.)*?\1/g,
'keyword': /\b(if|else|while|do|for|return|in|instanceof|function|new|try|catch|finally|null|break|continue)\b/g,
'boolean': /\b(true|false)\b/g,
- 'number': /\b-?(0x)?\d*\.?[\da-f]+\b/g,
+ 'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/g,
'operator': /[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,
'ignore': /&(lt|gt|amp);/gi,
'punctuation': /[{}[\];(),.:]/g
diff --git a/components/prism-clike.min.js b/components/prism-clike.min.js
index ddae79e..7ded333 100644
--- a/components/prism-clike.min.js
+++ b/components/prism-clike.min.js
@@ -1 +1 @@
-Prism.languages.clike={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,keyword:/\b(if|else|while|do|for|return|in|instanceof|function|new|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x)?\d*\.?[\da-f]+\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};
\ No newline at end of file
+Prism.languages.clike={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,keyword:/\b(if|else|while|do|for|return|in|instanceof|function|new|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/g,operator:/[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};
\ No newline at end of file
diff --git a/prism.js b/prism.js
index 60c07ae..10e4417 100644
--- a/prism.js
+++ b/prism.js
@@ -443,7 +443,7 @@ Prism.languages.clike = {
'string': /("|')(\\?.)*?\1/g,
'keyword': /\b(if|else|while|do|for|return|in|instanceof|function|new|try|catch|finally|null|break|continue)\b/g,
'boolean': /\b(true|false)\b/g,
- 'number': /\b-?(0x)?\d*\.?[\da-f]+\b/g,
+ 'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/g,
'operator': /[-+]{1,2}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,
'ignore': /&(lt|gt|amp);/gi,
'punctuation': /[{}[\];(),.:]/g