From 9a928bfeee4dcb0ceeefda122585d42e3ac4b866 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 9 Nov 2015 18:08:41 +0800 Subject: [PATCH] JSDOC/ScopeParser.vala --- JSDOC/ScopeParser.vala | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/JSDOC/ScopeParser.vala b/JSDOC/ScopeParser.vala index 37a2a1d..f40bf6a 100644 --- a/JSDOC/ScopeParser.vala +++ b/JSDOC/ScopeParser.vala @@ -774,26 +774,24 @@ namespace JSDOC { if (token.name == "EVAL") { - Regex.match_simple ("s[ai]mple", "This is a simple sample.",GLib.RegexCompileFlags.CASELESS); - var regex = new GLib.Regex ("eval:var:([a-z_]+)",GLib.RegexCompileFlags.CASELESS ); - - regex.replace_eval (token.prefix, token.prefix.length, 0, 0, (match_info, result) => { - //print(JSON.stringify(token,null,4)); - if (token.prefix.length > 0 && token.prefix.match(/eval:var:/g)) { + if (token.prefix.length > 0 && Regex.match_simple ("eval:var:", token.prefix,GLib.RegexCompileFlags.CASELESS)) { // look for eval:var:noreplace\n // print("GOT MATCH?"); - var _t = this; - token.prefix.replace(/eval:var:([a-z]+)/ig, function(m, a) { - + + + var regex = new GLib.Regex ("eval:var:([a-z_]+)",GLib.RegexCompileFlags.CASELESS ); + + regex.replace_eval (token.prefix, token.prefix.length, 0, 0, (match_info, result) => { + var a = match_info.fetch(0); //print("PROTECT: " + a); - var hi = _t.getIdentifier(a, scope, token); + var hi = this.getIdentifier(a, scope, token); //println("PROTECT "+a+" from munge" + (hi ? "FOUND" : "MISSING")); - if (hi) { + if (hi != null) { // println("PROTECT "+a+" from munge"); hi.toMunge = false; } -- 2.39.2