From 97f875670087afee5d293baccab2ab60118d02e4 Mon Sep 17 00:00:00 2001 From: Andrew Danger Lyon Date: Mon, 25 Mar 2013 14:45:41 -0700 Subject: [PATCH] fixing some padding/regex issues (also uncommenting number formatting) --- highlight-lisp.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/highlight-lisp.js b/highlight-lisp.js index c73af7e..180057b 100644 --- a/highlight-lisp.js +++ b/highlight-lisp.js @@ -350,14 +350,14 @@ var highlight_lisp = function() { // --------------------------------------------------------------------- // numbers // --------------------------------------------------------------------- - //// binary - //{regex: /([\s()])(#b[01]+)([\s()])/gi, replace: '$1$2$3'}, - //// hex - //{regex: /([\s()])(#x[\da-f]+)([\s()])/gi, replace: '$1$2$3'}, - //// float - //{regex: /([\s()])([+-]?(?:\d+\.\d+|\d+\.|\.\d+))([\s()])/g, replace: '$1$2$3'}, + // binary + {regex: /([\s()])(#b[01]+)([\s()])/gi, replace: '$1$2$3'}, + // hex + {regex: /([\s()])(#x[\da-f]+)([\s()])/gi, replace: '$1$2$3'}, + // float + {regex: /([\s()])([+-]?(?:\d+\.\d+|\d+\.|\.\d+))([\s()])/g, replace: '$1$2$3'}, // integers - {regex: /([\s()])([+-]?\d+)([\s()])/g, replace: '$1$2$3'}, + {regex: /([\s()])(\d+)([\s()])/g, replace: '$1$2$3'}, // --------------------------------------------------------------------- // misc parsers @@ -382,11 +382,15 @@ var highlight_lisp = function() { html = html.replace(/&/g, '&'); html = html.replace(/</g, '<'); html = html.replace(/>/g, '>'); + // pad the HTML string (makes regexs much simpler) + html = "\n" + html + "\n"; for(var i = 0, n = replace.length; i < n; i++) { var rep = replace[i]; html = html.replace(rep.regex, rep.replace); } + // unpad HTML string + html = html.replace(/(^\n|\n$)/g, ''); code_el.innerHTML = html; },