fly/fgdata
1
0
Fork 0
Code Activity

Fix string.compileTemplate algorithms

Browse source
This commit is contained in:
Philosopher 2014-02-09 20:12:20 -06:00
parent 0522a6504a
commit 4b2cb3a07c
1 changed files with 45 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
Nasal/string.nas
View file

@ -245,7 +245,8 @@ replace = func(str, old, new) {
# Get a function out of a string template for fast insertion of template # Get a function out of a string template for fast insertion of template
# parameters. This allows to use the same templates as with most available tile # parameters. This allows to use the same templates as with most available tile
# mapping engines (eg. Leaflet, Polymaps). Return a callable function object on # mapping engines (eg. Leaflet, Polymaps). Return a callable function object on
# success, and nil if parsing the templated fails. # success, and nil if parsing the templated fails. See string._template_getargs
# for more on calling a compile object.
# #
# Example (Build MapQuest tile url): # Example (Build MapQuest tile url):
# #
@ -260,11 +261,11 @@ replace = func(str, old, new) {
# #
var compileTemplate = func(template, type=nil) { var compileTemplate = func(template, type=nil) {
var code = 'func(__ENV=nil) { string._template_getargs();'; var code = 'func(__ENV=nil) { string._template_getargs();';
if (type == nil or type == "simple_names") { var len = size(template);
# See http://james.padolsey.com/javascript/straight-up-interpolation/
var code = '';
var start = 0; var start = 0;
var end = 0; var end = 0;
if (type == nil or type == "simple_names") {
# See http://james.padolsey.com/javascript/straight-up-interpolation/
while( (start = template.find('{', end)) >= 0 ) while( (start = template.find('{', end)) >= 0 )
{ {
if( end > 0 ) if( end > 0 )
@ -272,42 +273,49 @@ var compileTemplate = func(template, type=nil) {
code ~= '"' ~ substr(template, end, start - end) ~ '"'; code ~= '"' ~ substr(template, end, start - end) ~ '"';
if( (end = template.find('}', start)) < 0 ) if( (end = template.find('}', start)) < 0 )
{ {
debug.warn("string.compileTemplate: unclosed '{' (" ~ template ~ ")"); debug.warn("string.compileTemplate: unclosed brace pair (" ~ template ~ ")");
return nil; return nil;
} }
code ~= '~arg[0]["' ~ substr(template, start + 1, end - start - 1) ~ '"]'; code ~= '~__ENV["' ~ substr(template, start + 1, end - start - 1) ~ '"]';
end += 1;
}
if( end >= 0 )
code ~= '~"' ~ substr(template, end, size(template) - end) ~ '"';
code ~= ';';
} elsif (type == "nasal_expression") {
var len = size(template);
var level = var start = var end = 0;
for (var i=0; i<len; i+=1) {
if ( end > 0 )
code ~= "~";
code ~= '"' ~ substr(template, end, start - end) ~ '"';
if (template[i] != `{`) continue;
level += 1; var skip = 0;
for (var j=i+1; j<len; j+=1)
if (template[j] == `{`) level += 1;
elsif (template[j] == `}`) level -= 1;
elsif (template[j] == `"`)
if (skip <= 1) skip = !skip;
else skip = 1;
elsif (skip and template[j] == "\\")
if (skip <= 1) skip = 2;
else skip = 1;
if (j >= len or template[j] != `}`)
die("string.compileTemplate: unclosed '{' (" ~ template ~ ")");
end = j;
code ~= '~(' ~ substr(template, start + 1, end - start - 1)~")";
end += 1; end += 1;
} }
if( end < len ) if( end < len )
code ~= '~"' ~ substr(template, end, size(template) - end) ~ '"'; code ~= '~"' ~ substr(template, end, len - end) ~ '"';
} elsif (type == "nasal_expression") {
var level = 0;
for (var i=0; i<len; i+=1) {
if (template[i] != `{`) continue;
start = i;
if ( end > 0 )
code ~= "~";
code ~= '"' ~ substr(template, end, start - end) ~ '"';
level = 1; var skip = 0;
for (var j=i+1; j<len and level > 0; j+=1)
if (template[j] == `{`) level += 1;
elsif (template[j] == `}`) level -= 1;
elsif (template[j] == `"`)
if (skip == `"`) skip = 0;
elsif (skip != `'`) skip = `"`;
elsif (template[j] == `'`)
if (skip == `'`) skip = 0;
elsif (skip != '"') skip = `'`;
elsif (skip)
if ((skip == `'` or skip == `"`) and template[j] == `\\`)
skip = `\\`;
elsif (skip == `\\` and template[j] == `\\`)
skip = skip;
else
skip = 0;
if (level)
die("string.compileTemplate: unclosed brace pair (" ~ template ~ ")");
end = j;
code ~= '~(' ~ substr(template, start + 1, end - start - 1)~")";
end += 1;
i = end;
}
if( end < len )
code ~= '~"' ~ substr(template, end, len - end) ~ '"';
} }
code ~= "}"; code ~= "}";
var fn = compile(code)(); # get the inside function with the argument __ENV=nil var fn = compile(code)(); # get the inside function with the argument __ENV=nil
@ -336,11 +344,11 @@ var _template_getargs = func() {
var ns = caller(1)[0]; var ns = caller(1)[0];
if (contains(ns, "__ENV")) { if (contains(ns, "__ENV")) {
var __ENV = ns.__ENV; var __ENV = ns.__ENV;
ns.__ENV = ns;
if (__ENV != nil) if (__ENV != nil)
foreach (var k; keys(__ENV)) foreach (var k; keys(__ENV))
ns[k] = __ENV[k]; ns[k] = __ENV[k];
} }
ns.__ENV = ns;
} }