From fec57aeeaf272945bb8f05666ae25aed376f9cf0 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 9 Nov 2015 18:02:41 +0800 Subject: [PATCH] JSDOC/ScopeParser.vala --- JSDOC/ScopeParser.vala | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/JSDOC/ScopeParser.vala b/JSDOC/ScopeParser.vala index c705f4a..8a44dd4 100644 --- a/JSDOC/ScopeParser.vala +++ b/JSDOC/ScopeParser.vala @@ -515,12 +515,15 @@ namespace JSDOC { //print("MATCH!?"); var _t = this; + var regex = new GLib.Regex ("eval:var:([a-z_]+)",GLib.RegexCompileFlags.CASELESS ); + + - token.prefix.replace(/eval:var:([a-z_]+)/ig, function(m, a) { - //print("GOT: " + a); - var hi = _t.getIdentifier(a, scope, token); - // println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING")); - if (hi) { + regex.replace_eval (token.prefix, token.prefix.length, 0, 0, (match_info, result) => { + var a = match_info.fetch(0); + var hi = this.getIdentifier(a, scope, token); + // println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING")); + if (hi.length > 0) { // print("PROTECT "+a+" from munge"); //print(JSON.stringify(hi,null,4)); hi.toMunge = false; -- 2.39.2