hiro/highlight-lisp
1
0
Fork 0
mirror of https://github.com/vale981/highlight-lisp synced 2025-03-04 17:01:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

working around issue in search/replace regex engine where matching a string causes a repeated match to not replace correctly. so, changing all regexes ENDING in a delim search to be zero-width (?=...) which fixes this problem completely.

Browse source
This commit is contained in:
Andrew Danger Lyon 2013-03-25 15:32:50 -07:00
parent 3cbb38d266
commit 1425f39d3f
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
highlight-lisp.js
View file

@ -263,11 +263,11 @@ var highlight_lisp = function() {
// "special" (let/lambda)
// ---------------------------------------------------------------------
{
regex: new RegExp('.'+list_to_regex(special)+'([\\s()])', 'g'),
replace: function(fullmatch, fnname, whitespace) {
regex: new RegExp('.'+list_to_regex(special)+'(?=[\\s()])', 'g'),
replace: function(fullmatch, fnname) {
if(fullmatch[0] == '(')
{
return '(<span class="function special known">' + fnname + '</span>' + whitespace;
return '(<span class="function special known">' + fnname + '</span>';
}
else
{
@ -282,11 +282,11 @@ var highlight_lisp = function() {
// ---------------------------------------------------------------------
// known functions
{
regex: new RegExp('.'+list_to_regex(funcs)+'([\\s()])', 'g'),
replace: function(fullmatch, fnname, whitespace) {
regex: new RegExp('.'+list_to_regex(funcs)+'(?=[\\s()])', 'g'),
replace: function(fullmatch, fnname) {
if(fullmatch[0] == '(')
{
return '(<span class="function known">' + fnname + '</span>' + whitespace;
return '(<span class="function known">' + fnname + '</span>';
}
else
{
@ -296,28 +296,28 @@ var highlight_lisp = function() {
},
// symbol functions (#'my-fn)
{
regex: /([\s()])(#'(\w[\w_-]*))([\s()])/g,
replace: function(fullmatch, delim1, symfun, sym, delim2)
regex: /([\s()])(#'(\w[\w_-]*))(?=[\s()])/g,
replace: function(fullmatch, delim1, symfun, sym)
{
var known = false;
if(is_in_list(sym, funcs))
{
known = true;
}
return delim1 +'<span class="function symbol'+ (known ? ' known' : '') +'">'+ symfun +'</span>'+ delim2;
return delim1 +'<span class="function symbol'+ (known ? ' known' : '') +'">'+ symfun +'</span>';
}
},
// ---------------------------------------------------------------------
// lambda keywords
// ---------------------------------------------------------------------
{regex: new RegExp('([\\s()])'+list_to_regex(lambda)+'([\\s()])', 'g'), replace: '$1<span class="lambda-list">$2</span>$3'},
{regex: new RegExp('([\\s()])'+list_to_regex(lambda)+'(?=[\\s()])', 'g'), replace: '$1<span class="lambda-list">$2</span>'},
// ---------------------------------------------------------------------
// symbols/keywords/variables
// ---------------------------------------------------------------------
// generic symbols
{regex: /([\s()])('\w[\w_-]*)([\s()])/g, replace: '$1<span class="symbol">$2</span>$3'},
{regex: /([\s()])('\w[\w_-]*)(?=[\s()])/g, replace: '$1<span class="symbol">$2</span>'},
// known keywords
{
regex: new RegExp('([\\s()])'+list_to_regex(keywords)+'([\\s()])', 'g'),
@ -344,29 +344,29 @@ var highlight_lisp = function() {
}
},
// globals/constants
{regex: /([\s()])(\*\w[\w_-]*\*)([\s()])/g, replace: '$1<span class="variable global">$2</span>$3'},
{regex: /([\s()])(\+\w[\w_-]*\+)([\s()])/g, replace: '$1<span class="variable constant">$2</span>$3'},
{regex: /([\s()])(\*\w[\w_-]*\*)(?=[\s()])/g, replace: '$1<span class="variable global">$2</span>'},
{regex: /([\s()])(\+\w[\w_-]*\+)(?=[\s()])/g, replace: '$1<span class="variable constant">$2</span>'},
// ---------------------------------------------------------------------
// numbers
// ---------------------------------------------------------------------
// binary
{regex: /([\s()])(#b[01]+)([\s()])/gi, replace: '$1<span class="number binary">$2</span>$3'},
{regex: /([\s()])(#b[01]+)(?=[\s()])/ig, replace: '$1<span class="number binary">$2</span>'},
// hex
{regex: /([\s()])(#x[\da-f]+)([\s()])/gi, replace: '$1<span class="number hex">$2</span>$3'},
{regex: /([\s()])(#x[\da-f]+)(?=[\s()])/ig, replace: '$1<span class="number hex">$2</span>'},
// float
{regex: /([\s()])([+-]?(?:\d+\.\d+|\d+\.|\.\d+))([\s()])/g, replace: '$1<span class="number float">$2</span>$3'},
{regex: /([\s()])([+-]?(?:\d+\.\d+|\d+\.|\.\d+))(?=[\s()])/g, replace: '$1<span class="number float">$2</span>'},
// integers
{regex: /([\s()])(\d+)([\s()])/g, replace: '$1<span class="number integer">$2</span>$3'},
{regex: /([\s()])(\d+)(?=[\s()])/g, replace: '$1<span class="number integer">$2</span>'},
// ---------------------------------------------------------------------
// misc parsers
// ---------------------------------------------------------------------
// t/nil
{regex: /([\s()])(nil|t)([\s()])/g, replace: '$1<span class="nil">$2</span>$3'},
{regex: /([\s()])(nil|t)(?=[\s()])/g, replace: '$1<span class="nil">$2</span>'},
// generic "maybe a function" forms. best second to last
{regex: /\((\w[\w_:-]*)([\s()])/g, replace: '(<span class="function">$1</span>$2'},
{regex: /\((\w[\w_:-]*)(?=[\s()])/g, replace: '(<span class="function">$1</span>'},
// ()'s (should most probably be last, unless there's a good reason)
{regex: /([()])/g, replace: '<span class="list">$1</span>'}