From e911a12af9b67ca4a7d6a2fa8bd9862adf6eb2c2 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 6 Feb 2016 19:42:05 +0000 Subject: [PATCH] commitid.scad.pl: Break out argl_formal and argl_actual (nfc) --- commitid.scad.pl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/commitid.scad.pl b/commitid.scad.pl index 6a4aa1f..c1d3a4c 100755 --- a/commitid.scad.pl +++ b/commitid.scad.pl @@ -279,12 +279,15 @@ sub gentextmodule_demo_start_batch () { $gtm_demo_i++; } +sub argl_formal (@) { join ', ', @_; } +sub argl_actual (@) { join ',', map { m/=/ ? $` : $_ } @_; } + sub gen3dmodule ($@) { my ($modb,@argl) = (@_); - p "module ${modb}(".(join ', ', @argl)."){\n"; + p "module ${modb}(".argl_formal(@argl)."){\n"; p " d=Commitid_depth();\n"; p " translate([0,0,-d]) linear_extrude(height=d*2)\n"; - p " ${modb}_2D(".(join ',', map { m/=/ ? $` : $_ } @argl).");\n"; + p " ${modb}_2D(".argl_actual(@argl).");\n"; p "}\n"; } @@ -545,7 +548,7 @@ sub do_some_best ($$) { my ($modname, $formre) = @_; my $fullmodname = "Commitid_${modname}_2D"; my @argl = qw(max_sz margin=Commitid_pixelsz()); - p "module $fullmodname(".(join ', ', @argl).") {\n"; + p "module $fullmodname(".argl_formal(@argl).") {\n"; my $mbs = '$Commitid_max_best_scale'; p " sc_max = $mbs ? $mbs : 2;\n"; p " sz = max_sz - 2*[margin,margin];\n"; -- 2.30.2