fly/fgdata
1
0
Fork 0
Code Activity

Use new built-in string functions

Browse source
This commit is contained in:
Thomas Geymayer 2013-01-31 20:17:13 +01:00
parent 8b3fa6f2fe
commit 4374ab0ce8
2 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Nasal/canvas/api.nas
View file

@ -335,10 +335,7 @@ var Group = {
var _parseRadius = func(id) var _parseRadius = func(id)
{ {
var r = opts["border-" ~ id ~ "-radius"]; if( (var r = opts["border-" ~ id ~ "-radius"]) == nil )
var id = std.string.new(id);
if( r == nil )
{ {
# parse top, bottom, left, right separate if no value specified for # parse top, bottom, left, right separate if no value specified for
# single corner # single corner

16
Nasal/canvas/svg.nas
View file

@ -54,8 +54,6 @@ var parsesvg = func(group, path, options = nil)
if( tf == nil ) if( tf == nil )
return; return;
tf = std.string.new(tf);
var end = 0; var end = 0;
while(1) while(1)
{ {
@ -84,10 +82,10 @@ var parsesvg = func(group, path, options = nil)
end = tf.find_first_of("),\t\n ", start_num + 1); end = tf.find_first_of("),\t\n ", start_num + 1);
if( end < 0 ) if( end < 0 )
break; break;
append(values, tf.substr(start_num, end - start_num)); append(values, substr(tf, start_num, end - start_num));
} }
var type = tf.substr(start_type, end_type - start_type); var type = substr(tf, start_type, end_type - start_type);
if( type == "translate" ) if( type == "translate" )
# translate(<tx> [<ty>]), which specifies a translation by tx and ty. If # translate(<tx> [<ty>]), which specifies a translation by tx and ty. If
@ -126,14 +124,12 @@ var parsesvg = func(group, path, options = nil)
s: Path.VG_SCUBIC_TO s: Path.VG_SCUBIC_TO
}; };
var parsePath = func(d) var parsePath = func(path_data)
{ {
if( d == nil ) if( path_data == nil )
return; return;
var path_data = std.string.new(d);
var pos = 0; var pos = 0;
var cmds = []; var cmds = [];
var coords = []; var coords = [];
@ -145,7 +141,7 @@ var parsesvg = func(group, path, options = nil)
break; break;
# get command # get command
var cmd = path_data.substr(pos, 1); var cmd = substr(path_data, pos, 1);
pos += 1; pos += 1;
# and get all following arguments # and get all following arguments
@ -161,7 +157,7 @@ var parsesvg = func(group, path, options = nil)
if( start_num == pos ) if( start_num == pos )
break; break;
append(args, path_data.substr(start_num, pos > 0 ? pos - start_num : nil)); append(args, substr(path_data, start_num, pos > 0 ? pos - start_num : nil));
} }
# now execute the command # now execute the command