Commit e7a1c5d37910241192f241612a576b98991e9907

Bastian Holst 2014-07-13T21:56:40

Remove escaped entities from Haskell language def

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
diff --git a/components/prism-haskell.js b/components/prism-haskell.js
index fd82036..5128467 100644
--- a/components/prism-haskell.js
+++ b/components/prism-haskell.js
@@ -1,6 +1,6 @@
 Prism.languages.haskell= {
 	'comment': {
-		pattern: /(^|[^-!#$%*+=\?&@|~.:<>^\\]|&amp;|&gt;|&lt;)(--([^-!#$%*+=\?&@|~.:<>^\\]|&amp;|&gt;|&lt;).*(\r?\n|$)|{-[\w\W]*?-})/gm,
+		pattern: /(^|[^-!#$%*+=\?&@|~.:<>^\\])(--[^-!#$%*+=\?&@|~.:<>^\\].*(\r?\n|$)|{-[\w\W]*?-})/gm,
 		lookbehind: true
 	},
 	'string': /("|')(\\?.)*?\1/g,
@@ -18,7 +18,7 @@ Prism.languages.haskell= {
 	'builtin': /\b(abs|acos|acosh|all|and|any|appendFile|approxRational|asTypeOf|asin|asinh|atan|atan2|atanh|basicIORun|break|catch|ceiling|chr|compare|concat|concatMap|const|cos|cosh|curry|cycle|decodeFloat|denominator|digitToInt|div|divMod|drop|dropWhile|either|elem|encodeFloat|enumFrom|enumFromThen|enumFromThenTo|enumFromTo|error|even|exp|exponent|fail|filter|flip|floatDigits|floatRadix|floatRange|floor|fmap|foldl|foldl1|foldr|foldr1|fromDouble|fromEnum|fromInt|fromInteger|fromIntegral|fromRational|fst|gcd|getChar|getContents|getLine|group|head|id|inRange|index|init|intToDigit|interact|ioError|isAlpha|isAlphaNum|isAscii|isControl|isDenormalized|isDigit|isHexDigit|isIEEE|isInfinite|isLower|isNaN|isNegativeZero|isOctDigit|isPrint|isSpace|isUpper|iterate|last|lcm|length|lex|lexDigits|lexLitChar|lines|log|logBase|lookup|map|mapM|mapM_|max|maxBound|maximum|maybe|min|minBound|minimum|mod|negate|not|notElem|null|numerator|odd|or|ord|otherwise|pack|pi|pred|primExitWith|print|product|properFraction|putChar|putStr|putStrLn|quot|quotRem|range|rangeSize|read|readDec|readFile|readFloat|readHex|readIO|readInt|readList|readLitChar|readLn|readOct|readParen|readSigned|reads|readsPrec|realToFrac|recip|rem|repeat|replicate|return|reverse|round|scaleFloat|scanl|scanl1|scanr|scanr1|seq|sequence|sequence_|show|showChar|showInt|showList|showLitChar|showParen|showSigned|showString|shows|showsPrec|significand|signum|sin|sinh|snd|sort|span|splitAt|sqrt|subtract|succ|sum|tail|take|takeWhile|tan|tanh|threadToIOResult|toEnum|toInt|toInteger|toLower|toRational|toUpper|truncate|uncurry|undefined|unlines|until|unwords|unzip|unzip3|userError|words|writeFile|zip|zip3|zipWith|zipWith3)\b/g,
 	// In Haskell, nearly everything is a variable, do not highlight these.
 	// 'variable': /\b[_a-z][_a-zA-Z0-9']*\b/,
-	'operator' : /(&amp;|&lt;|&gt;|[-!#$%*+=\?&@|~.:<>^\\])+|(`[_a-zA-Z0-9']+`)/g,
+	'operator' : /[-!#$%*+=\?&@|~.:<>^\\]+|(`[_a-zA-Z0-9']+`)/g,
 	'constant': /\b[A-Z][_a-zA-Z0-9']*\b/g,
 	'number' : /\b-?\d*(\.?\d+)\b/g,
 	'ignore' : /&(lt|gt|amp);/gi,