Merge branch 'c-fixes' of https://github.com/rygorous/prism into gh-p…

…ages

Conflicts:
	components/prism-c.js
	components/prism-c.min.js
	components/prism-clike.js
	components/prism-clike.min.js

+ added tests

components/prism-c.js

@@ -1,6 +1,7 @@
 Prism.languages.c = Prism.languages.extend('clike', {
 	'keyword': /\b(asm|typeof|inline|auto|break|case|char|const|continue|default|do|double|else|enum|extern|float|for|goto|if|int|long|register|return|short|signed|sizeof|static|struct|switch|typedef|union|unsigned|void|volatile|while)\b/,
-	'operator': /\-[>-]?|\+\+?|!=?|<<?=?|>>?=?|==?|&&?|\|?\||[~^%?*\/]/
+	'operator': /\-[>-]?|\+\+?|!=?|<<?=?|>>?=?|==?|&&?|\|?\||[~^%?*\/]/,
+	'number': /\b-?(0x[\da-f]+|\d*\.?\d+(e[+-]?\d+)?)[fFuUlL]*\b/i
 });
 
 Prism.languages.insertBefore('c', 'string', {
@@ -21,4 +22,4 @@ Prism.languages.insertBefore('c', 'string', {
 });
 
 delete Prism.languages.c['class-name'];
-delete Prism.languages.c['boolean'];
+delete Prism.languages.c['boolean'];

components/prism-clike.js

@@ -20,7 +20,7 @@ Prism.languages.clike = {
 	'keyword': /\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,
 	'boolean': /\b(true|false)\b/,
 	'function': /[a-z0-9_]+(?=\()/i,
-	'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,
+	'number': /\b-?(0x[\da-f]+|\d*\.?\d+(e[+-]?\d+)?)\b/i,
 	'operator': /--?|\+\+?|!=?=?|<=?|>=?|==?=?|&&?|\|\|?|\?|\*|\/|~|\^|%/,
 	'punctuation': /[{}[\];(),.:]/
 };