diff options
| author | John R. Lenton <jlenton@gmail.com> | 2014-01-13 23:14:35 +0000 |
|---|---|---|
| committer | John R. Lenton <jlenton@gmail.com> | 2014-01-13 23:14:35 +0000 |
| commit | 93451002f04e0b89e41e1faa82f86e937bb219f1 (patch) | |
| tree | 478f8fedae2b08f12181c98a4a3d1c4cdf19403d | |
| parent | 88cb1e60e0b780d71e9c2d7b0acafa71ba3ea318 (diff) | |
| parent | ca318bba0d97c66d8fb14a089d8fa269a0e1b424 (diff) | |
| download | micropython-93451002f04e0b89e41e1faa82f86e937bb219f1.tar.gz micropython-93451002f04e0b89e41e1faa82f86e937bb219f1.zip | |
Merge remote-tracking branch 'upstream/master' into builtins
Conflicts:
py/builtin.c
py/builtin.h
py/runtime.c
| -rw-r--r-- | logo/vector-logo-3.png | bin | 0 -> 114034 bytes | |||
| -rw-r--r-- | logo/vector-logo-inkscape_master.svg | 2099 | ||||
| -rw-r--r-- | py/builtin.c | 71 | ||||
| -rw-r--r-- | py/builtin.h | 35 | ||||
| -rw-r--r-- | py/builtinimport.c | 2 | ||||
| -rw-r--r-- | py/mpconfig.h | 2 | ||||
| -rw-r--r-- | py/obj.c | 10 | ||||
| -rw-r--r-- | py/objfun.c | 37 | ||||
| -rw-r--r-- | py/objint.c | 15 | ||||
| -rw-r--r-- | py/objint.h | 9 | ||||
| -rw-r--r-- | py/objstr.c | 15 | ||||
| -rw-r--r-- | py/runtime.c | 39 | ||||
| -rw-r--r-- | py/runtime.h | 6 | ||||
| -rw-r--r-- | stm/audio.c | 6 | ||||
| -rw-r--r-- | stm/lcd.c | 14 | ||||
| -rw-r--r-- | stm/main.c | 42 | ||||
| -rw-r--r-- | stm/printf.c | 4 | ||||
| -rw-r--r-- | stm/pybwlan.c | 10 | ||||
| -rw-r--r-- | stm/std.h | 2 | ||||
| -rw-r--r-- | stm/string0.c | 28 | ||||
| -rw-r--r-- | stm/timer.c | 8 |
21 files changed, 2190 insertions, 264 deletions
diff --git a/logo/vector-logo-3.png b/logo/vector-logo-3.png Binary files differnew file mode 100644 index 0000000000..ba75b05624 --- /dev/null +++ b/logo/vector-logo-3.png diff --git a/logo/vector-logo-inkscape_master.svg b/logo/vector-logo-inkscape_master.svg index bbfca47803..ddcf741178 100644 --- a/logo/vector-logo-inkscape_master.svg +++ b/logo/vector-logo-inkscape_master.svg @@ -15,8 +15,8 @@ height="779.328" id="svg2" inkscape:version="0.48.4 r9939" - sodipodi:docname="vector-logo-inkscape_master.svg" - inkscape:export-filename="R:\Mark_Sector\!!Projects-2\microPython\Logo\vector-logo-4.png" + sodipodi:docname="vector-logo-inkscape_master-2.svg" + inkscape:export-filename="C:\Users\user3\Documents\GitHub\micropython\logo\vector-logo-2.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> <sodipodi:namedview @@ -28,20 +28,110 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1609" + inkscape:window-width="1414" inkscape:window-height="1086" id="namedview127" showgrid="false" - inkscape:zoom="5.4082024" - inkscape:cx="367.53099" - inkscape:cy="675.33912" + inkscape:zoom="0.80389336" + inkscape:cx="-0.14388424" + inkscape:cy="205.20636" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="0" - inkscape:current-layer="layer4" /> + inkscape:current-layer="layer3" /> <defs id="defs4"> <linearGradient + id="linearGradient5215"> + <stop + style="stop-color:#f1f1f1;stop-opacity:1;" + offset="0" + id="stop5217" /> + <stop + style="stop-color:#000000;stop-opacity:0.4054054;" + offset="1" + id="stop5219" /> + </linearGradient> + <linearGradient + id="linearGradient5205"> + <stop + style="stop-color:#d8d8d8;stop-opacity:1;" + offset="0" + id="stop5207" /> + <stop + style="stop-color:#000000;stop-opacity:0;" + offset="1" + id="stop5209" /> + </linearGradient> + <linearGradient + id="linearGradient4753"> + <stop + id="stop4755" + offset="0" + style="stop-color:#101010;stop-opacity:1;" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.47657159" + id="stop4761" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.60369939" + id="stop4759" /> + <stop + id="stop4757" + offset="1" + style="stop-color:#3e3e3e;stop-opacity:1;" /> + </linearGradient> + <linearGradient + id="linearGradient4249"> + <stop + style="stop-color:#afafaf;stop-opacity:1;" + offset="0" + id="stop4251" /> + <stop + style="stop-color:#0b0b0b;stop-opacity:1;" + offset="1" + id="stop4253" /> + </linearGradient> + <linearGradient + id="linearGradient4233"> + <stop + style="stop-color:#6f6f6f;stop-opacity:1;" + offset="0" + id="stop4235" /> + <stop + id="stop4247" + offset="0.0808401" + style="stop-color:#ffffff;stop-opacity:1" /> + <stop + id="stop4245" + offset="0.125" + style="stop-color:#616161;stop-opacity:1;" /> + <stop + id="stop4243" + offset="0.25" + style="stop-color:#535353;stop-opacity:1;" /> + <stop + id="stop4241" + offset="0.5" + style="stop-color:#373737;stop-opacity:1;" /> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="1" + id="stop4237" /> + </linearGradient> + <linearGradient + id="linearGradient4029"> + <stop + style="stop-color:#3e3e3e;stop-opacity:1;" + offset="0" + id="stop4031" /> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="1" + id="stop4033" /> + </linearGradient> + <linearGradient id="linearGradient4981"> <stop style="stop-color:#370000;stop-opacity:1;" @@ -364,6 +454,1786 @@ x2="273.90927" y2="601.64478" gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4029" + id="linearGradient4035" + x1="50.162903" + y1="641.96503" + x2="305.03671" + y2="733.44366" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249" + id="linearGradient4255" + x1="48.514041" + y1="697.80837" + x2="326.39456" + y2="697.80837" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-2" + id="linearGradient4332-7" + gradientUnits="userSpaceOnUse" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + id="linearGradient4249-2"> + <stop + style="stop-color:#afafaf;stop-opacity:1;" + offset="0" + id="stop4251-2" /> + <stop + style="stop-color:#0b0b0b;stop-opacity:1;" + offset="1" + id="stop4253-9" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-9" + id="linearGradient4332-1" + gradientUnits="userSpaceOnUse" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + id="linearGradient4249-9"> + <stop + style="stop-color:#afafaf;stop-opacity:1;" + offset="0" + id="stop4251-6" /> + <stop + style="stop-color:#0b0b0b;stop-opacity:1;" + offset="1" + id="stop4253-98" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-4" + id="linearGradient4332-5" + gradientUnits="userSpaceOnUse" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + id="linearGradient4249-4"> + <stop + style="stop-color:#afafaf;stop-opacity:1;" + offset="0" + id="stop4251-9" /> + <stop + style="stop-color:#0b0b0b;stop-opacity:1;" + offset="1" + id="stop4253-1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-3" + id="linearGradient4332-8" + gradientUnits="userSpaceOnUse" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + id="linearGradient4249-3"> + <stop + style="stop-color:#afafaf;stop-opacity:1;" + offset="0" + id="stop4251-93" /> + <stop + style="stop-color:#0b0b0b;stop-opacity:1;" + offset="1" + id="stop4253-96" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-7" + id="linearGradient4332-9" + gradientUnits="userSpaceOnUse" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + id="linearGradient4249-7"> + <stop + style="stop-color:#afafaf;stop-opacity:1;" + offset="0" + id="stop4251-69" /> + <stop + style="stop-color:#0b0b0b;stop-opacity:1;" + offset="1" + id="stop4253-3" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-6" + id="linearGradient4332-6" + gradientUnits="userSpaceOnUse" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + id="linearGradient4249-6"> + <stop + style="stop-color:#afafaf;stop-opacity:1;" + offset="0" + id="stop4251-5" /> + <stop + style="stop-color:#0b0b0b;stop-opacity:1;" + offset="1" + id="stop4253-8" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-63" + id="linearGradient4332-61" + gradientUnits="userSpaceOnUse" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + id="linearGradient4249-63"> + <stop + style="stop-color:#afafaf;stop-opacity:1;" + offset="0" + id="stop4251-3" /> + <stop + style="stop-color:#0b0b0b;stop-opacity:1;" + offset="1" + id="stop4253-5" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-5" + id="linearGradient4332-82" + gradientUnits="userSpaceOnUse" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + id="linearGradient4249-5"> + <stop + style="stop-color:#afafaf;stop-opacity:1;" + offset="0" + id="stop4251-36" /> + <stop + style="stop-color:#0b0b0b;stop-opacity:1;" + offset="1" + id="stop4253-18" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-62" + id="linearGradient4332-4" + gradientUnits="userSpaceOnUse" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + id="linearGradient4249-62"> + <stop + style="stop-color:#afafaf;stop-opacity:1;" + offset="0" + id="stop4251-91" /> + <stop + style="stop-color:#0b0b0b;stop-opacity:1;" + offset="1" + id="stop4253-50" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-29" + id="linearGradient4332-49" + gradientUnits="userSpaceOnUse" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + id="linearGradient4249-29"> + <stop + style="stop-color:#afafaf;stop-opacity:1;" + offset="0" + id="stop4251-34" /> + <stop + style="stop-color:#0b0b0b;stop-opacity:1;" + offset="1" + id="stop4253-4" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-42" + id="linearGradient4332-63" + gradientUnits="userSpaceOnUse" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + id="linearGradient4249-42"> + <stop + style="stop-color:#afafaf;stop-opacity:1;" + offset="0" + id="stop4251-8" /> + <stop + style="stop-color:#0b0b0b;stop-opacity:1;" + offset="1" + id="stop4253-87" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-57" + id="linearGradient4332-2" + gradientUnits="userSpaceOnUse" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + id="linearGradient4249-57"> + <stop + style="stop-color:#afafaf;stop-opacity:1;" + offset="0" + id="stop4251-4" /> + <stop + style="stop-color:#0b0b0b;stop-opacity:1;" + offset="1" + id="stop4253-44" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-0" + id="linearGradient4332-93" + gradientUnits="userSpaceOnUse" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + id="linearGradient4249-0"> + <stop + style="stop-color:#afafaf;stop-opacity:1;" + offset="0" + id="stop4251-7" /> + <stop + style="stop-color:#0b0b0b;stop-opacity:1;" + offset="1" + id="stop4253-7" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-38" + id="linearGradient4332-0" + gradientUnits="userSpaceOnUse" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + id="linearGradient4249-38"> + <stop + style="stop-color:#afafaf;stop-opacity:1;" + offset="0" + id="stop4251-25" /> + <stop + style="stop-color:#0b0b0b;stop-opacity:1;" + offset="1" + id="stop4253-2" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-53" + id="linearGradient4332-97" + gradientUnits="userSpaceOnUse" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + id="linearGradient4249-53"> + <stop + style="stop-color:#afafaf;stop-opacity:1;" + offset="0" + id="stop4251-43" /> + <stop + style="stop-color:#0b0b0b;stop-opacity:1;" + offset="1" + id="stop4253-21" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249" + id="linearGradient4627" + gradientUnits="userSpaceOnUse" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-2" + id="linearGradient4629" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(16.462108,6.0241868)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-9" + id="linearGradient4631" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(32.653947,11.977068)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-4" + id="linearGradient4633" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(49.0839,18.168066)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-3" + id="linearGradient4635" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(65.513853,24.359063)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-7" + id="linearGradient4637" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(81.467577,30.311944)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-6" + id="linearGradient4639" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(97.89753,36.02671)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-63" + id="linearGradient4641" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(115.04183,41.741477)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-5" + id="linearGradient4643" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(130.99555,47.694359)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-62" + id="linearGradient4645" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(147.66362,53.647241)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-29" + id="linearGradient4647" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(164.09357,59.838237)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-42" + id="linearGradient4649" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(180.52353,65.314889)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-57" + id="linearGradient4651" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(196.71536,71.744001)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-0" + id="linearGradient4653" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(212.66909,77.934999)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-38" + id="linearGradient4655" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(229.57527,82.935419)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-53" + id="linearGradient4657" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(246.00523,89.126416)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4029" + id="linearGradient4692" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="50.162903" + y1="641.96503" + x2="305.03671" + y2="733.44366" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4029" + id="linearGradient4695" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="50.162903" + y1="641.96503" + x2="305.03671" + y2="733.44366" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4029" + id="linearGradient4698" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="50.162903" + y1="641.96503" + x2="305.03671" + y2="733.44366" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4029" + id="linearGradient4701" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="50.162903" + y1="641.96503" + x2="305.03671" + y2="733.44366" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4029" + id="linearGradient4704" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="50.162903" + y1="641.96503" + x2="305.03671" + y2="733.44366" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4029" + id="linearGradient4707" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="50.162903" + y1="641.96503" + x2="305.03671" + y2="733.44366" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4029" + id="linearGradient4710" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="50.162903" + y1="641.96503" + x2="305.03671" + y2="733.44366" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4029" + id="linearGradient4713" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="50.162903" + y1="641.96503" + x2="305.03671" + y2="733.44366" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4029" + id="linearGradient4716" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="50.162903" + y1="641.96503" + x2="305.03671" + y2="733.44366" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4029" + id="linearGradient4719" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="50.162903" + y1="641.96503" + x2="305.03671" + y2="733.44366" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4029" + id="linearGradient4722" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="50.162903" + y1="641.96503" + x2="305.03671" + y2="733.44366" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4029" + id="linearGradient4725" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="50.162903" + y1="641.96503" + x2="305.03671" + y2="733.44366" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4029" + id="linearGradient4728" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="50.162903" + y1="641.96503" + x2="305.03671" + y2="733.44366" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4029" + id="linearGradient4731" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="50.162903" + y1="641.96503" + x2="305.03671" + y2="733.44366" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4029" + id="linearGradient4734" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="50.162903" + y1="641.96503" + x2="305.03671" + y2="733.44366" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753" + id="linearGradient4737" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4029-2" + id="linearGradient4704-3" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-94.138416,56.066335)" + x1="50.162903" + y1="641.96503" + x2="305.03671" + y2="733.44366" /> + <linearGradient + id="linearGradient4029-2"> + <stop + style="stop-color:#3e3e3e;stop-opacity:1;" + offset="0" + id="stop4031-1" /> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="1" + id="stop4033-0" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-0" + id="linearGradient4737-4" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + id="linearGradient4753-0"> + <stop + id="stop4755-7" + offset="0" + style="stop-color:#101010;stop-opacity:1;" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.47657159" + id="stop4761-5" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.60369939" + id="stop4759-9" /> + <stop + id="stop4757-0" + offset="1" + style="stop-color:#3e3e3e;stop-opacity:1;" /> + </linearGradient> + <linearGradient + y2="713.91241" + x2="447.14349" + y1="762.51996" + x1="462.33984" + gradientTransform="translate(-94.138416,56.066335)" + gradientUnits="userSpaceOnUse" + id="linearGradient4785" + xlink:href="#linearGradient4753-0" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-09" + id="linearGradient4737-2" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + id="linearGradient4753-09"> + <stop + id="stop4755-8" + offset="0" + style="stop-color:#101010;stop-opacity:1;" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.47657159" + id="stop4761-9" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.60369939" + id="stop4759-1" /> + <stop + id="stop4757-7" + offset="1" + style="stop-color:#3e3e3e;stop-opacity:1;" /> + </linearGradient> + <linearGradient + y2="713.91241" + x2="447.14349" + y1="762.51996" + x1="462.33984" + gradientTransform="translate(16.293772,-6.7832111)" + gradientUnits="userSpaceOnUse" + id="linearGradient4835" + xlink:href="#linearGradient4753-09" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-07" + id="linearGradient4737-3" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + id="linearGradient4753-07"> + <stop + id="stop4755-6" + offset="0" + style="stop-color:#101010;stop-opacity:1;" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.47657159" + id="stop4761-6" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.60369939" + id="stop4759-0" /> + <stop + id="stop4757-2" + offset="1" + style="stop-color:#3e3e3e;stop-opacity:1;" /> + </linearGradient> + <linearGradient + y2="713.91241" + x2="447.14349" + y1="762.51996" + x1="462.33984" + gradientTransform="translate(32.866764,-12.497978)" + gradientUnits="userSpaceOnUse" + id="linearGradient4835-8" + xlink:href="#linearGradient4753-07" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-9" + id="linearGradient4737-8" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + id="linearGradient4753-9"> + <stop + id="stop4755-9" + offset="0" + style="stop-color:#101010;stop-opacity:1;" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.47657159" + id="stop4761-94" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.60369939" + id="stop4759-2" /> + <stop + id="stop4757-08" + offset="1" + style="stop-color:#3e3e3e;stop-opacity:1;" /> + </linearGradient> + <linearGradient + y2="713.91241" + x2="447.14349" + y1="762.51996" + x1="462.33984" + gradientTransform="translate(49.296717,-18.212744)" + gradientUnits="userSpaceOnUse" + id="linearGradient4835-7" + xlink:href="#linearGradient4753-9" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-3" + id="linearGradient4737-7" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + id="linearGradient4753-3"> + <stop + id="stop4755-0" + offset="0" + style="stop-color:#101010;stop-opacity:1;" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.47657159" + id="stop4761-7" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.60369939" + id="stop4759-6" /> + <stop + id="stop4757-4" + offset="1" + style="stop-color:#3e3e3e;stop-opacity:1;" /> + </linearGradient> + <linearGradient + y2="713.91241" + x2="447.14349" + y1="762.51996" + x1="462.33984" + gradientTransform="translate(65.72667,-24.403741)" + gradientUnits="userSpaceOnUse" + id="linearGradient4835-2" + xlink:href="#linearGradient4753-3" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-1" + id="linearGradient4737-9" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + id="linearGradient4753-1"> + <stop + id="stop4755-60" + offset="0" + style="stop-color:#101010;stop-opacity:1;" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.47657159" + id="stop4761-3" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.60369939" + id="stop4759-3" /> + <stop + id="stop4757-6" + offset="1" + style="stop-color:#3e3e3e;stop-opacity:1;" /> + </linearGradient> + <linearGradient + y2="713.91241" + x2="447.14349" + y1="762.51996" + x1="462.33984" + gradientTransform="translate(82.156624,-30.356622)" + gradientUnits="userSpaceOnUse" + id="linearGradient4835-22" + xlink:href="#linearGradient4753-1" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-6" + id="linearGradient4737-32" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + id="linearGradient4753-6"> + <stop + id="stop4755-05" + offset="0" + style="stop-color:#101010;stop-opacity:1;" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.47657159" + id="stop4761-4" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.60369939" + id="stop4759-96" /> + <stop + id="stop4757-082" + offset="1" + style="stop-color:#3e3e3e;stop-opacity:1;" /> + </linearGradient> + <linearGradient + y2="713.91241" + x2="447.14349" + y1="762.51996" + x1="462.33984" + gradientTransform="translate(98.586578,-36.309505)" + gradientUnits="userSpaceOnUse" + id="linearGradient4835-74" + xlink:href="#linearGradient4753-6" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-01" + id="linearGradient4737-76" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + id="linearGradient4753-01"> + <stop + id="stop4755-2" + offset="0" + style="stop-color:#101010;stop-opacity:1;" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.47657159" + id="stop4761-93" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.60369939" + id="stop4759-8" /> + <stop + id="stop4757-5" + offset="1" + style="stop-color:#3e3e3e;stop-opacity:1;" /> + </linearGradient> + <linearGradient + y2="713.91241" + x2="447.14349" + y1="762.51996" + x1="462.33984" + gradientTransform="translate(115.01653,-42.262386)" + gradientUnits="userSpaceOnUse" + id="linearGradient4835-1" + xlink:href="#linearGradient4753-01" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-68" + id="linearGradient4737-6" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + id="linearGradient4753-68"> + <stop + id="stop4755-89" + offset="0" + style="stop-color:#101010;stop-opacity:1;" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.47657159" + id="stop4761-8" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.60369939" + id="stop4759-7" /> + <stop + id="stop4757-07" + offset="1" + style="stop-color:#3e3e3e;stop-opacity:1;" /> + </linearGradient> + <linearGradient + y2="713.91241" + x2="447.14349" + y1="762.51996" + x1="462.33984" + gradientTransform="translate(131.20837,-48.215268)" + gradientUnits="userSpaceOnUse" + id="linearGradient4835-9" + xlink:href="#linearGradient4753-68" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-39" + id="linearGradient4737-86" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + id="linearGradient4753-39"> + <stop + id="stop4755-4" + offset="0" + style="stop-color:#101010;stop-opacity:1;" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.47657159" + id="stop4761-53" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.60369939" + id="stop4759-82" /> + <stop + id="stop4757-3" + offset="1" + style="stop-color:#3e3e3e;stop-opacity:1;" /> + </linearGradient> + <linearGradient + y2="713.91241" + x2="447.14349" + y1="762.51996" + x1="462.33984" + gradientTransform="translate(147.40021,-54.16815)" + gradientUnits="userSpaceOnUse" + id="linearGradient4835-94" + xlink:href="#linearGradient4753-39" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-32" + id="linearGradient4737-1" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + id="linearGradient4753-32"> + <stop + id="stop4755-81" + offset="0" + style="stop-color:#101010;stop-opacity:1;" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.47657159" + id="stop4761-64" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.60369939" + id="stop4759-67" /> + <stop + id="stop4757-79" + offset="1" + style="stop-color:#3e3e3e;stop-opacity:1;" /> + </linearGradient> + <linearGradient + y2="713.91241" + x2="447.14349" + y1="762.51996" + x1="462.33984" + gradientTransform="translate(164.06828,-60.359147)" + gradientUnits="userSpaceOnUse" + id="linearGradient4835-6" + xlink:href="#linearGradient4753-32" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-2" + id="linearGradient4737-19" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + id="linearGradient4753-2"> + <stop + id="stop4755-63" + offset="0" + style="stop-color:#101010;stop-opacity:1;" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.47657159" + id="stop4761-1" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.60369939" + id="stop4759-5" /> + <stop + id="stop4757-9" + offset="1" + style="stop-color:#3e3e3e;stop-opacity:1;" /> + </linearGradient> + <linearGradient + y2="713.91241" + x2="447.14349" + y1="762.51996" + x1="462.33984" + gradientTransform="translate(180.49823,-66.073913)" + gradientUnits="userSpaceOnUse" + id="linearGradient4835-70" + xlink:href="#linearGradient4753-2" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-7" + id="linearGradient4737-61" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + id="linearGradient4753-7"> + <stop + id="stop4755-62" + offset="0" + style="stop-color:#101010;stop-opacity:1;" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.47657159" + id="stop4761-534" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.60369939" + id="stop4759-07" /> + <stop + id="stop4757-55" + offset="1" + style="stop-color:#3e3e3e;stop-opacity:1;" /> + </linearGradient> + <linearGradient + y2="713.91241" + x2="447.14349" + y1="762.51996" + x1="462.33984" + gradientTransform="translate(196.45195,-72.264911)" + gradientUnits="userSpaceOnUse" + id="linearGradient4835-3" + xlink:href="#linearGradient4753-7" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-017" + id="linearGradient4737-88" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + id="linearGradient4753-017"> + <stop + id="stop4755-5" + offset="0" + style="stop-color:#101010;stop-opacity:1;" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.47657159" + id="stop4761-0" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.60369939" + id="stop4759-59" /> + <stop + id="stop4757-09" + offset="1" + style="stop-color:#3e3e3e;stop-opacity:1;" /> + </linearGradient> + <linearGradient + y2="713.91241" + x2="447.14349" + y1="762.51996" + x1="462.33984" + gradientTransform="translate(213.12002,-77.979677)" + gradientUnits="userSpaceOnUse" + id="linearGradient4835-35" + xlink:href="#linearGradient4753-017" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-67" + id="linearGradient4737-72" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + id="linearGradient4753-67"> + <stop + id="stop4755-22" + offset="0" + style="stop-color:#101010;stop-opacity:1;" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.47657159" + id="stop4761-01" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.60369939" + id="stop4759-17" /> + <stop + id="stop4757-59" + offset="1" + style="stop-color:#3e3e3e;stop-opacity:1;" /> + </linearGradient> + <linearGradient + y2="713.91241" + x2="447.14349" + y1="762.51996" + x1="462.33984" + gradientTransform="translate(229.54998,-83.932557)" + gradientUnits="userSpaceOnUse" + id="linearGradient4835-18" + xlink:href="#linearGradient4753-67" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-99" + id="linearGradient4737-866" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + id="linearGradient4753-99"> + <stop + id="stop4755-26" + offset="0" + style="stop-color:#101010;stop-opacity:1;" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.47657159" + id="stop4761-65" /> + <stop + style="stop-color:#acacac;stop-opacity:1;" + offset="0.60369939" + id="stop4759-84" /> + <stop + id="stop4757-03" + offset="1" + style="stop-color:#3e3e3e;stop-opacity:1;" /> + </linearGradient> + <linearGradient + y2="713.91241" + x2="447.14349" + y1="762.51996" + x1="462.33984" + gradientTransform="translate(245.97993,-89.885443)" + gradientUnits="userSpaceOnUse" + id="linearGradient4835-78" + xlink:href="#linearGradient4753-99" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753" + id="linearGradient5170" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.11034178,-0.45120379)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-09" + id="linearGradient5172" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(16.293772,-6.7832111)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-07" + id="linearGradient5174" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(32.866764,-12.497978)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-9" + id="linearGradient5176" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(49.296717,-18.212744)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-3" + id="linearGradient5178" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(65.72667,-24.403741)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-1" + id="linearGradient5180" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(82.156624,-30.356622)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-6" + id="linearGradient5182" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(98.586578,-36.309505)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-01" + id="linearGradient5184" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(115.01653,-42.262386)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-68" + id="linearGradient5186" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(131.20837,-48.215268)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-39" + id="linearGradient5188" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(147.40021,-54.16815)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-32" + id="linearGradient5190" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(164.06828,-60.359147)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-2" + id="linearGradient5192" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(180.49823,-66.073913)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-7" + id="linearGradient5194" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(196.45195,-72.264911)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-017" + id="linearGradient5196" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(213.12002,-77.979677)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-67" + id="linearGradient5198" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(229.54998,-83.932557)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4753-99" + id="linearGradient5200" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(245.97993,-89.885443)" + x1="462.33984" + y1="762.51996" + x2="447.14349" + y2="713.91241" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5205" + id="linearGradient5211" + x1="192.18854" + y1="640.29102" + x2="183.33424" + y2="664.34637" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5215" + id="linearGradient5221" + x1="550.91754" + y1="631.59814" + x2="562.11096" + y2="661.61688" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-53" + id="linearGradient5224" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(262.50578,95.187841)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-38" + id="linearGradient5227" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(246.07582,88.996844)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-0" + id="linearGradient5230" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(229.16964,83.996424)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-57" + id="linearGradient5233" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(213.21591,77.805426)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-42" + id="linearGradient5236" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(197.02408,71.376314)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-29" + id="linearGradient5239" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(180.59412,65.899662)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-62" + id="linearGradient5242" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(164.16417,59.708666)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-5" + id="linearGradient5245" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(147.4961,53.755784)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-63" + id="linearGradient5248" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(131.54238,47.802902)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-6" + id="linearGradient5251" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(114.39808,42.088135)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-7" + id="linearGradient5254" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(97.968123,36.373369)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-3" + id="linearGradient5257" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(82.014399,30.420488)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-4" + id="linearGradient5260" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(65.584446,24.229491)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-9" + id="linearGradient5263" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(49.154493,18.038493)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-2" + id="linearGradient5266" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(32.962654,12.085612)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249" + id="linearGradient5269" + gradientUnits="userSpaceOnUse" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" + gradientTransform="translate(16.500546,6.0614254)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249" + id="linearGradient5321" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(16.500546,6.0614254)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-2" + id="linearGradient5323" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(32.962654,12.085612)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-9" + id="linearGradient5325" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(49.154493,18.038493)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-4" + id="linearGradient5327" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(65.584446,24.229491)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-3" + id="linearGradient5329" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(82.014399,30.420488)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-7" + id="linearGradient5331" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(97.968123,36.373369)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-6" + id="linearGradient5333" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(114.39808,42.088135)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-63" + id="linearGradient5335" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(131.54238,47.802902)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-5" + id="linearGradient5337" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(147.4961,53.755784)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-62" + id="linearGradient5339" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(164.16417,59.708666)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-29" + id="linearGradient5341" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(180.59412,65.899662)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-42" + id="linearGradient5343" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(197.02408,71.376314)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-57" + id="linearGradient5345" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(213.21591,77.805426)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-0" + id="linearGradient5347" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(229.16964,83.996424)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-38" + id="linearGradient5349" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(246.07582,88.996844)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4249-53" + id="linearGradient5351" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(262.50578,95.187841)" + x1="56.430466" + y1="632.71771" + x2="67.791367" + y2="650.30981" /> </defs> <metadata id="metadata7"> @@ -373,7 +2243,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> @@ -736,176 +2606,191 @@ inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccscccccccccccccccscsccsscccsccccscsccscccccsscssscsssscsscscssscssssscssscscccsssscscccccsccssccssssscccccccccccccccccccccccsccssscsscccsssccsscsccscccccccsscssccssccsssccssccccccsssscsssscssssccscscsccscscscsccsscsccscccccccccccccccccccccccccccssccssccscssccssscccccccccccccscsssscssssscsscsssssssscsccssccscccccsssssssssccscc" /> <path - d="m 751.29906,574.49054 0,56.09559 -368.04049,133.95574 -368.040477,-133.95574 0,-56.61975 368.347517,133.55687 z" + d="m 749.69878,574.66835 0,56.09559 -366.44021,133.77793 -367.263011,-133.80025 0,-56.61975 367.570051,133.40138 z" id="path3354-4" style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc" /> <g - transform="translate(0.11034178,-0.45120379)" - id="g5049-2" - style="stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"> + id="g5271" + transform="translate(-18.659191,-7.4636765)"> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3290-8" - d="m 321.48422,721.5392 -22.36609,12.913 0,30.0333" /> + style="fill:none;stroke:url(#linearGradient5321);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + id="path3292-8" + d="m 92.180672,637.64386 -22.366085,12.91307 0,30.03328" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3292-8" - d="m 75.569784,632.03363 -22.366085,12.91307 0,30.03328" /> + style="fill:none;stroke:url(#linearGradient5323);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3292-8-4" + d="m 108.64278,643.66805 -22.366085,12.91307 0,30.03328" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3294-1" - d="m 305.08992,715.57213 -22.36608,12.91307 0,30.0333" /> + style="fill:none;stroke:url(#linearGradient5325);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3292-8-5" + d="m 124.83462,649.62094 -22.36609,12.91306 0,30.03328" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3296-8" - d="m 288.69563,709.6051 -22.36609,12.9131 0,30.0332" /> + style="fill:none;stroke:url(#linearGradient5327);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3292-8-0" + d="m 141.26457,655.81193 -22.36608,12.91307 0,30.03328" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3298-6" - d="m 272.30133,703.63806 -22.36608,12.91304 0,30.0333" /> + style="fill:none;stroke:url(#linearGradient5329);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3292-8-9" + d="m 157.69453,662.00293 -22.36608,12.91307 0,30.03328" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3300-0" - d="m 255.90704,697.67102 -22.36609,12.91307 0,30.03331" /> + style="fill:none;stroke:url(#linearGradient5331);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3292-8-7" + d="m 173.64825,667.9558 -22.36608,12.91307 0,30.03328" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3302-2" - d="m 239.51274,691.70399 -22.36608,12.91306 0,30.03325" /> + style="fill:none;stroke:url(#linearGradient5333);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3292-8-41" + d="m 190.07821,673.67057 -22.36608,12.91307 0,30.03328" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3304-4" - d="m 223.11845,685.73695 -22.36609,12.91307 0,30.03328" /> + style="fill:none;stroke:url(#linearGradient5335);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3292-8-2" + d="m 207.22251,679.38534 -22.36609,12.91307 0,30.03328" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3306-9" - d="m 206.72415,679.76992 -22.36609,12.91306 0,30.03332" /> + style="fill:none;stroke:url(#linearGradient5337);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3292-8-21" + d="m 223.17623,685.33822 -22.36609,12.91306 0,30.03328" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3308-0" - d="m 190.32985,673.80288 -22.36608,12.91307 0,30.03325" /> + style="fill:none;stroke:url(#linearGradient5339);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3292-8-6" + d="m 239.8443,691.2911 -22.36609,12.91307 0,30.03328" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3310-2" - d="m 173.93556,667.83585 -22.36609,12.91306 0,30.03328" /> + style="fill:none;stroke:url(#linearGradient5341);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3292-8-59" + d="m 256.27425,697.4821 -22.36609,12.91307 0,30.03328" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3312-2" - d="m 157.54126,661.86881 -22.36608,12.91307 0,30.03328" /> + style="fill:none;stroke:url(#linearGradient5343);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3292-8-1" + d="m 272.70421,702.95875 -22.36609,12.91307 0,30.03328" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3314-1" - d="m 141.14697,655.90177 -22.36609,12.91307 0,30.03328" /> + style="fill:none;stroke:url(#linearGradient5345);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3292-8-42" + d="m 288.89604,709.38786 -22.36609,12.91307 0,30.03328" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3316-5" - d="m 124.75267,649.93474 -22.36608,12.91306 0,30.03329" /> + style="fill:none;stroke:url(#linearGradient5347);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3292-8-73" + d="m 304.84977,715.57886 -22.36609,12.91307 0,30.03328" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3318-4" - d="m 108.35837,643.9677 -22.36608,12.91307 0,30.03328" /> + style="fill:none;stroke:url(#linearGradient5349);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3292-8-72" + d="m 321.75595,720.57928 -22.36609,12.91307 0,30.03328" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3320-4" - d="m 91.96408,638.00067 -22.366085,12.91306 0,30.03328" /> + style="fill:none;stroke:url(#linearGradient5351);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3292-8-3" + d="m 338.18591,726.77028 -22.36609,12.91307 0,30.03328" /> + </g> + <g + id="g5152" + transform="translate(16.429953,-5.9528819)"> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + style="fill:none;stroke:url(#linearGradient5170);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path3322-4" - d="m 443.61027,721.5392 22.36608,12.913 0,30.0333" /> + d="m 443.72061,721.088 22.36608,12.913 0,30.0333" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3324-2" - d="m 476.39886,709.6051 22.36608,12.9131 0,30.0332" /> + style="fill:none;stroke:url(#linearGradient5172);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3322-4-3" + d="m 459.90404,714.75598 22.36608,12.913 0,30.0333" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3326-5" - d="m 460.00456,715.57213 22.36609,12.91307 0,30.0333" /> + style="fill:none;stroke:url(#linearGradient5174);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3322-4-9" + d="m 476.47704,709.04122 22.36608,12.913 0,30.0333" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3328-0" - d="m 525.58175,691.70399 22.36608,12.91306 0,30.03325" /> + style="fill:none;stroke:url(#linearGradient5176);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3322-4-8" + d="m 492.90699,703.32646 22.36607,12.913 0,30.0333" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3330-4" - d="m 509.18745,697.67102 22.36609,12.91307 0,30.03331" /> + style="fill:none;stroke:url(#linearGradient5178);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3322-4-1" + d="m 509.33694,697.13546 22.36608,12.913 0,30.0333" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3332-2" - d="m 492.79316,703.63806 22.36608,12.91304 0,30.0333" /> + style="fill:none;stroke:url(#linearGradient5180);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3322-4-14" + d="m 525.76689,691.18258 22.36608,12.913 0,30.0333" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3334-1" - d="m 558.37034,679.76992 22.36608,12.91306 0,30.03332" /> + style="fill:none;stroke:url(#linearGradient5182);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3322-4-0" + d="m 542.19685,685.22969 22.36608,12.913 0,30.0333" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3336-2" - d="m 541.97604,685.73695 22.36609,12.91307 0,30.03328" /> + style="fill:none;stroke:url(#linearGradient5184);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3322-4-5" + d="m 558.6268,679.27682 22.36608,12.913 0,30.0333" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3338-7" - d="m 607.55322,661.86881 22.36609,12.91307 0,30.03328" /> + style="fill:none;stroke:url(#linearGradient5186);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3322-4-15" + d="m 574.81864,673.32393 22.36608,12.913 0,30.0333" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3340-7" - d="m 574.76463,673.80288 22.36609,12.91307 0,30.03325" /> + style="fill:none;stroke:url(#linearGradient5188);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3322-4-85" + d="m 591.01048,667.37105 22.36608,12.913 0,30.0333" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3342-9" - d="m 591.15893,667.83585 22.36609,12.91306 0,30.03328" /> + style="fill:none;stroke:url(#linearGradient5190);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3322-4-4" + d="m 607.67855,661.18005 22.36608,12.913 0,30.0333" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3344-5" - d="m 689.5247,632.03363 22.36609,12.91307 0,30.03328" /> + style="fill:none;stroke:url(#linearGradient5192);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3322-4-2" + d="m 624.1085,655.46528 22.36608,12.913 0,30.0333" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3346-5" - d="m 623.94752,655.90177 22.36609,12.91307 0,30.03328" /> + style="fill:none;stroke:url(#linearGradient5194);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3322-4-18" + d="m 640.06222,649.27429 22.36608,12.913 0,30.0333" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3348-4" - d="m 640.34182,649.93474 22.36608,12.91306 0,30.03329" /> + style="fill:none;stroke:url(#linearGradient5196);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3322-4-42" + d="m 656.73029,643.55953 22.36608,12.913 0,30.0333" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3350-0" - d="m 656.73611,643.9677 22.36609,12.91307 0,30.03328" /> + style="fill:none;stroke:url(#linearGradient5198);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3322-4-17" + d="m 673.16025,637.60664 22.36608,12.913 0,30.0333" /> <path inkscape:connector-curvature="0" - style="fill:none;stroke:#3e3e3e;stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="path3352-3" - d="m 673.13041,638.00067 22.36608,12.91306 0,30.03328" /> + style="fill:none;stroke:url(#linearGradient5200);stroke-width:9.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3322-4-31" + d="m 689.5902,631.65376 22.36608,12.913 0,30.0333" /> </g> + <path + style="fill:url(#linearGradient5211);fill-opacity:1;stroke:none;display:inline" + d="m 13.872826,595.95429 c 0.387521,-16.26739 -3.132044,-24.34489 11.843623,-17.81444 67.361595,23.56741 305.258621,108.07438 347.099071,124.14652 6.9538,4.2814 16.05227,4.7547 12.47851,7.2194 -0.0902,3.98398 -2.69274,4.02033 -4.62883,4.99233 -1.93608,0.97199 -2.92965,-0.15731 -5.87591,0.39099 -1.28974,3.03308 -1.90493,21.91052 -1.90493,21.91052 0,0 -3.99564,-7.30146 -4.7623,-11.12968 -0.76666,-3.82822 -3.77724,-3.13603 -9.18147,-5.22972 C 289.67149,695.89705 13.872826,595.95429 13.872826,595.95429 z" + id="path5202" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccscczcc" /> + <path + style="fill:url(#linearGradient5221);fill-opacity:1;stroke:none" + d="m 749.01081,575.84113 c 0.30103,-3.12022 -1.0367,-3.0558 -13.718,-9.28068 -46.08067,16.93915 -285.08057,107.25201 -352.73995,131.17677 -26.94394,-4.90548 4.70243,5.27427 9.2182,8.05818 4.51572,2.78391 16.61463,-1.25017 26.77523,-5.28719 53.11696,-19.719 286.75703,-106.37669 330.46452,-124.66708 z" + id="path5213" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccc" /> </g> <g inkscape:groupmode="layer" diff --git a/py/builtin.c b/py/builtin.c index 53ae93ad95..39b2da9200 100644 --- a/py/builtin.c +++ b/py/builtin.c @@ -18,7 +18,7 @@ // args[0] is function from class body // args[1] is class name // args[2:] are base objects -mp_obj_t mp_builtin___build_class__(int n_args, const mp_obj_t *args) { +static mp_obj_t mp_builtin___build_class__(int n_args, const mp_obj_t *args) { assert(2 <= n_args); // we differ from CPython: we set the new __locals__ object here @@ -62,7 +62,7 @@ mp_obj_t mp_builtin___build_class__(int n_args, const mp_obj_t *args) { MP_DEFINE_CONST_FUN_OBJ_VAR(mp_builtin___build_class___obj, 2, mp_builtin___build_class__); -mp_obj_t mp_builtin___repl_print__(mp_obj_t o) { +static mp_obj_t mp_builtin___repl_print__(mp_obj_t o) { if (o != mp_const_none) { mp_obj_print(o); printf("\n"); @@ -70,6 +70,8 @@ mp_obj_t mp_builtin___repl_print__(mp_obj_t o) { return mp_const_none; } +MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin___repl_print___obj, mp_builtin___repl_print__); + mp_obj_t mp_builtin_abs(mp_obj_t o_in) { if (MP_OBJ_IS_SMALL_INT(o_in)) { mp_small_int_t val = MP_OBJ_SMALL_INT_VALUE(o_in); @@ -97,7 +99,9 @@ mp_obj_t mp_builtin_abs(mp_obj_t o_in) { } } -mp_obj_t mp_builtin_all(mp_obj_t o_in) { +MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_abs_obj, mp_builtin_abs); + +static mp_obj_t mp_builtin_all(mp_obj_t o_in) { mp_obj_t iterable = rt_getiter(o_in); mp_obj_t item; while ((item = rt_iternext(iterable)) != mp_const_stop_iteration) { @@ -108,7 +112,9 @@ mp_obj_t mp_builtin_all(mp_obj_t o_in) { return mp_const_true; } -mp_obj_t mp_builtin_any(mp_obj_t o_in) { +MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_all_obj, mp_builtin_all); + +static mp_obj_t mp_builtin_any(mp_obj_t o_in) { mp_obj_t iterable = rt_getiter(o_in); mp_obj_t item; while ((item = rt_iternext(iterable)) != mp_const_stop_iteration) { @@ -119,7 +125,9 @@ mp_obj_t mp_builtin_any(mp_obj_t o_in) { return mp_const_false; } -mp_obj_t mp_builtin_callable(mp_obj_t o_in) { +MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_any_obj, mp_builtin_any); + +static mp_obj_t mp_builtin_callable(mp_obj_t o_in) { if (mp_obj_is_callable(o_in)) { return mp_const_true; } else { @@ -127,7 +135,9 @@ mp_obj_t mp_builtin_callable(mp_obj_t o_in) { } } -mp_obj_t mp_builtin_chr(mp_obj_t o_in) { +MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_callable_obj, mp_builtin_callable); + +static mp_obj_t mp_builtin_chr(mp_obj_t o_in) { int ord = mp_obj_get_int(o_in); if (0 <= ord && ord <= 0x10ffff) { char *str = m_new(char, 2); @@ -139,7 +149,9 @@ mp_obj_t mp_builtin_chr(mp_obj_t o_in) { } } -mp_obj_t mp_builtin_divmod(mp_obj_t o1_in, mp_obj_t o2_in) { +MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_chr_obj, mp_builtin_chr); + +static mp_obj_t mp_builtin_divmod(mp_obj_t o1_in, mp_obj_t o2_in) { if (MP_OBJ_IS_SMALL_INT(o1_in) && MP_OBJ_IS_SMALL_INT(o2_in)) { mp_small_int_t i1 = MP_OBJ_SMALL_INT_VALUE(o1_in); mp_small_int_t i2 = MP_OBJ_SMALL_INT_VALUE(o2_in); @@ -152,6 +164,8 @@ mp_obj_t mp_builtin_divmod(mp_obj_t o1_in, mp_obj_t o2_in) { } } +MP_DEFINE_CONST_FUN_OBJ_2(mp_builtin_divmod_obj, mp_builtin_divmod); + static mp_obj_t mp_builtin_hash(mp_obj_t o_in) { // TODO hash will generally overflow small integer; can we safely truncate it? return mp_obj_new_int(mp_obj_hash(o_in)); @@ -165,7 +179,7 @@ static mp_obj_t mp_builtin_iter(mp_obj_t o_in) { MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_iter_obj, mp_builtin_iter); -mp_obj_t mp_builtin_len(mp_obj_t o_in) { +static mp_obj_t mp_builtin_len(mp_obj_t o_in) { mp_obj_t len = mp_obj_len_maybe(o_in); if (len == NULL) { nlr_jump(mp_obj_new_exception_msg_varg(MP_QSTR_TypeError, "object of type '%s' has no len()", mp_obj_get_type_str(o_in))); @@ -174,7 +188,9 @@ mp_obj_t mp_builtin_len(mp_obj_t o_in) { } } -mp_obj_t mp_builtin_max(int n_args, const mp_obj_t *args) { +MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_len_obj, mp_builtin_len); + +static mp_obj_t mp_builtin_max(int n_args, const mp_obj_t *args) { if (n_args == 1) { // given an iterable mp_obj_t iterable = rt_getiter(args[0]); @@ -201,7 +217,9 @@ mp_obj_t mp_builtin_max(int n_args, const mp_obj_t *args) { } } -mp_obj_t mp_builtin_min(int n_args, const mp_obj_t *args) { +MP_DEFINE_CONST_FUN_OBJ_VAR(mp_builtin_max_obj, 1, mp_builtin_max); + +static mp_obj_t mp_builtin_min(int n_args, const mp_obj_t *args) { if (n_args == 1) { // given an iterable mp_obj_t iterable = rt_getiter(args[0]); @@ -228,6 +246,8 @@ mp_obj_t mp_builtin_min(int n_args, const mp_obj_t *args) { } } +MP_DEFINE_CONST_FUN_OBJ_VAR(mp_builtin_min_obj, 1, mp_builtin_min); + static mp_obj_t mp_builtin_next(mp_obj_t o) { mp_obj_t ret = rt_iternext(o); if (ret == mp_const_stop_iteration) { @@ -239,7 +259,7 @@ static mp_obj_t mp_builtin_next(mp_obj_t o) { MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_next_obj, mp_builtin_next); -mp_obj_t mp_builtin_ord(mp_obj_t o_in) { +static mp_obj_t mp_builtin_ord(mp_obj_t o_in) { const char *str = qstr_str(mp_obj_get_qstr(o_in)); if (strlen(str) == 1) { return mp_obj_new_int(str[0]); @@ -248,15 +268,19 @@ mp_obj_t mp_builtin_ord(mp_obj_t o_in) { } } -mp_obj_t mp_builtin_pow(int n_args, const mp_obj_t *args) { +MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_ord_obj, mp_builtin_ord); + +static mp_obj_t mp_builtin_pow(int n_args, const mp_obj_t *args) { + assert(2 <= n_args && n_args <= 3); switch (n_args) { case 2: return rt_binary_op(RT_BINARY_OP_POWER, args[0], args[1]); - case 3: return rt_binary_op(RT_BINARY_OP_MODULO, rt_binary_op(RT_BINARY_OP_POWER, args[0], args[1]), args[2]); // TODO optimise... - default: nlr_jump(mp_obj_new_exception_msg_varg(MP_QSTR_TypeError, "pow expected at most 3 arguments, got %d", n_args)); + default: return rt_binary_op(RT_BINARY_OP_MODULO, rt_binary_op(RT_BINARY_OP_POWER, args[0], args[1]), args[2]); // TODO optimise... } } -mp_obj_t mp_builtin_print(int n_args, const mp_obj_t *args) { +MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_pow_obj, 2, 3, mp_builtin_pow); + +static mp_obj_t mp_builtin_print(int n_args, const mp_obj_t *args) { for (int i = 0; i < n_args; i++) { if (i > 0) { printf(" "); @@ -273,21 +297,25 @@ mp_obj_t mp_builtin_print(int n_args, const mp_obj_t *args) { return mp_const_none; } -mp_obj_t mp_builtin_range(int n_args, const mp_obj_t *args) { +MP_DEFINE_CONST_FUN_OBJ_VAR(mp_builtin_print_obj, 0, mp_builtin_print); + +static mp_obj_t mp_builtin_range(int n_args, const mp_obj_t *args) { + assert(1 <= n_args && n_args <= 3); switch (n_args) { case 1: return mp_obj_new_range(0, mp_obj_get_int(args[0]), 1); case 2: return mp_obj_new_range(mp_obj_get_int(args[0]), mp_obj_get_int(args[1]), 1); - case 3: return mp_obj_new_range(mp_obj_get_int(args[0]), mp_obj_get_int(args[1]), mp_obj_get_int(args[2])); - default: nlr_jump(mp_obj_new_exception_msg_varg(MP_QSTR_TypeError, "range expected at most 3 arguments, got %d", n_args)); + default: return mp_obj_new_range(mp_obj_get_int(args[0]), mp_obj_get_int(args[1]), mp_obj_get_int(args[2])); } } -mp_obj_t mp_builtin_sum(int n_args, const mp_obj_t *args) { +MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_range_obj, 1, 3, mp_builtin_range); + +static mp_obj_t mp_builtin_sum(int n_args, const mp_obj_t *args) { + assert(1 <= n_args && n_args <= 2); mp_obj_t value; switch (n_args) { case 1: value = mp_obj_new_int(0); break; - case 2: value = args[1]; break; - default: nlr_jump(mp_obj_new_exception_msg_varg(MP_QSTR_TypeError, "sum expected at most 2 arguments, got %d", n_args)); + default: value = args[1]; break; } mp_obj_t iterable = rt_getiter(args[0]); mp_obj_t item; @@ -296,6 +324,7 @@ mp_obj_t mp_builtin_sum(int n_args, const mp_obj_t *args) { } return value; } +MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_sum_obj, 1, 2, mp_builtin_sum); static mp_obj_t mp_builtin_sorted(mp_obj_t args, mp_map_t *kwargs) { mp_obj_t *args_items = NULL; diff --git a/py/builtin.h b/py/builtin.h index a69f1166ac..3401528a68 100644 --- a/py/builtin.h +++ b/py/builtin.h @@ -1,26 +1,25 @@ -// TODO convert all these to objects using MP_DECLARE and MP_DEFINE +mp_obj_t mp_builtin___import__(int n_args, mp_obj_t *args); MP_DECLARE_CONST_FUN_OBJ(mp_builtin___build_class___obj); -mp_obj_t mp_builtin___import__(int n, mp_obj_t *args); -mp_obj_t mp_builtin___repl_print__(mp_obj_t o); -mp_obj_t mp_builtin_abs(mp_obj_t o_in); -mp_obj_t mp_builtin_all(mp_obj_t o_in); -mp_obj_t mp_builtin_any(mp_obj_t o_in); -mp_obj_t mp_builtin_callable(mp_obj_t o_in); -mp_obj_t mp_builtin_chr(mp_obj_t o_in); -mp_obj_t mp_builtin_divmod(mp_obj_t o1_in, mp_obj_t o2_in); +MP_DECLARE_CONST_FUN_OBJ(mp_builtin___repl_print___obj); +MP_DECLARE_CONST_FUN_OBJ(mp_builtin_abs_obj); +MP_DECLARE_CONST_FUN_OBJ(mp_builtin_all_obj); +MP_DECLARE_CONST_FUN_OBJ(mp_builtin_any_obj); +MP_DECLARE_CONST_FUN_OBJ(mp_builtin_callable_obj); +MP_DECLARE_CONST_FUN_OBJ(mp_builtin_chr_obj); +MP_DECLARE_CONST_FUN_OBJ(mp_builtin_divmod_obj); MP_DECLARE_CONST_FUN_OBJ(mp_builtin_hash_obj); MP_DECLARE_CONST_FUN_OBJ(mp_builtin_isinstance_obj); MP_DECLARE_CONST_FUN_OBJ(mp_builtin_issubclass_obj); MP_DECLARE_CONST_FUN_OBJ(mp_builtin_iter_obj); -mp_obj_t mp_builtin_len(mp_obj_t o_in); -mp_obj_t mp_builtin_list(int n_args, const mp_obj_t *args); -mp_obj_t mp_builtin_max(int n_args, const mp_obj_t *args); -mp_obj_t mp_builtin_min(int n_args, const mp_obj_t *args); +MP_DECLARE_CONST_FUN_OBJ(mp_builtin_len_obj); +MP_DECLARE_CONST_FUN_OBJ(mp_builtin_list_obj); +MP_DECLARE_CONST_FUN_OBJ(mp_builtin_max_obj); +MP_DECLARE_CONST_FUN_OBJ(mp_builtin_min_obj); MP_DECLARE_CONST_FUN_OBJ(mp_builtin_next_obj); -mp_obj_t mp_builtin_ord(mp_obj_t o_in); -mp_obj_t mp_builtin_pow(int n_args, const mp_obj_t *args); -mp_obj_t mp_builtin_print(int n_args, const mp_obj_t *args); -mp_obj_t mp_builtin_range(int n_args, const mp_obj_t *args); -mp_obj_t mp_builtin_sum(int n_args, const mp_obj_t *args); +MP_DECLARE_CONST_FUN_OBJ(mp_builtin_ord_obj); +MP_DECLARE_CONST_FUN_OBJ(mp_builtin_pow_obj); +MP_DECLARE_CONST_FUN_OBJ(mp_builtin_print_obj); +MP_DECLARE_CONST_FUN_OBJ(mp_builtin_range_obj); MP_DECLARE_CONST_FUN_OBJ(mp_builtin_sorted_obj); +MP_DECLARE_CONST_FUN_OBJ(mp_builtin_sum_obj); diff --git a/py/builtinimport.c b/py/builtinimport.c index 90a0fc3394..33576e3f0e 100644 --- a/py/builtinimport.c +++ b/py/builtinimport.c @@ -18,7 +18,7 @@ #include "map.h" #include "builtin.h" -mp_obj_t mp_builtin___import__(int n, mp_obj_t *args) { +mp_obj_t mp_builtin___import__(int n_args, mp_obj_t *args) { /* printf("import:\n"); for (int i = 0; i < n; i++) { diff --git a/py/mpconfig.h b/py/mpconfig.h index ada4aa2ea4..5d8c57692e 100644 --- a/py/mpconfig.h +++ b/py/mpconfig.h @@ -91,7 +91,7 @@ typedef long long mp_longint_impl_t; #define BITS_PER_BYTE (8) #define BITS_PER_WORD (BITS_PER_BYTE * BYTES_PER_WORD) // machine_int_t value with most significant bit set -#define WORD_MSBIT_HIGH (1 << (BYTES_PER_WORD * 8 - 1)) +#define WORD_MSBIT_HIGH (((machine_uint_t)1) << (BYTES_PER_WORD * 8 - 1)) // printf format spec to use for machine_int_t and friends #ifndef INT_FMT @@ -108,9 +108,15 @@ bool mp_obj_equal(mp_obj_t o1, mp_obj_t o2) { return val == 0; } else if (o2 == mp_const_true) { return val == 1; - } else { - return false; + } else if (MP_OBJ_IS_TYPE(o2, &int_type)) { + // If o2 is long int, dispatch to its virtual methods + mp_obj_base_t *o = o2; + if (o->type->binary_op != NULL) { + mp_obj_t r = o->type->binary_op(RT_COMPARE_OP_EQUAL, o2, o1); + return r == mp_const_true ? true : false; + } } + return false; } } else if (MP_OBJ_IS_QSTR(o1) || MP_OBJ_IS_QSTR(o2)) { return false; diff --git a/py/objfun.c b/py/objfun.c index eb24ea8763..c624cf2d27 100644 --- a/py/objfun.c +++ b/py/objfun.c @@ -113,38 +113,13 @@ const mp_obj_type_t fun_native_type = { .call_n_kw = fun_native_call_n_kw, }; -mp_obj_t rt_make_function_0(mp_fun_0_t fun) { +// fun must have the correct signature for n_args fixed arguments +mp_obj_t rt_make_function_n(int n_args, void *fun) { mp_obj_fun_native_t *o = m_new_obj(mp_obj_fun_native_t); o->base.type = &fun_native_type; - o->n_args_min = 0; - o->n_args_max = 0; - o->fun = fun; - return o; -} - -mp_obj_t rt_make_function_1(mp_fun_1_t fun) { - mp_obj_fun_native_t *o = m_new_obj(mp_obj_fun_native_t); - o->base.type = &fun_native_type; - o->n_args_min = 1; - o->n_args_max = 1; - o->fun = fun; - return o; -} - -mp_obj_t rt_make_function_2(mp_fun_2_t fun) { - mp_obj_fun_native_t *o = m_new_obj(mp_obj_fun_native_t); - o->base.type = &fun_native_type; - o->n_args_min = 2; - o->n_args_max = 2; - o->fun = fun; - return o; -} - -mp_obj_t rt_make_function_3(mp_fun_3_t fun) { - mp_obj_fun_native_t *o = m_new_obj(mp_obj_fun_native_t); - o->base.type = &fun_native_type; - o->n_args_min = 3; - o->n_args_max = 3; + o->is_kw = false; + o->n_args_min = n_args; + o->n_args_max = n_args; o->fun = fun; return o; } @@ -152,6 +127,7 @@ mp_obj_t rt_make_function_3(mp_fun_3_t fun) { mp_obj_t rt_make_function_var(int n_args_min, mp_fun_var_t fun) { mp_obj_fun_native_t *o = m_new_obj(mp_obj_fun_native_t); o->base.type = &fun_native_type; + o->is_kw = false; o->n_args_min = n_args_min; o->n_args_max = ~((machine_uint_t)0); o->fun = fun; @@ -162,6 +138,7 @@ mp_obj_t rt_make_function_var(int n_args_min, mp_fun_var_t fun) { mp_obj_t rt_make_function_var_between(int n_args_min, int n_args_max, mp_fun_var_t fun) { mp_obj_fun_native_t *o = m_new_obj(mp_obj_fun_native_t); o->base.type = &fun_native_type; + o->is_kw = false; o->n_args_min = n_args_min; o->n_args_max = n_args_max; o->fun = fun; diff --git a/py/objint.c b/py/objint.c index 26d3c0e337..c0bf756f1b 100644 --- a/py/objint.c +++ b/py/objint.c @@ -8,16 +8,7 @@ #include "mpconfig.h" #include "mpqstr.h" #include "obj.h" - -typedef struct _mp_obj_int_t { - mp_obj_base_t base; -#if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_NONE - mp_longint_impl_t val; -#endif -} mp_obj_int_t; - -void int_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in); -mp_obj_t int_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in); +#include "objint.h" // This dispatcher function is expected to be independent of the implementation // of long int @@ -54,11 +45,13 @@ void int_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj // This is called only for non-SMALL_INT mp_obj_t int_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) { assert(0); + return mp_const_none; } // This is called only with strings whose value doesn't fit in SMALL_INT mp_obj_t mp_obj_new_int_from_long_str(const char *s) { assert(0); + return mp_const_none; } mp_obj_t mp_obj_new_int_from_uint(machine_uint_t value) { @@ -69,6 +62,7 @@ mp_obj_t mp_obj_new_int_from_uint(machine_uint_t value) { } // TODO: Raise exception assert(0); + return mp_const_none; } mp_obj_t mp_obj_new_int(machine_int_t value) { @@ -77,5 +71,6 @@ mp_obj_t mp_obj_new_int(machine_int_t value) { } // TODO: Raise exception assert(0); + return mp_const_none; } #endif diff --git a/py/objint.h b/py/objint.h new file mode 100644 index 0000000000..14cf977be0 --- /dev/null +++ b/py/objint.h @@ -0,0 +1,9 @@ +typedef struct _mp_obj_int_t { + mp_obj_base_t base; +#if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_NONE + mp_longint_impl_t val; +#endif +} mp_obj_int_t; + +void int_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in); +mp_obj_t int_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in); diff --git a/py/objstr.c b/py/objstr.c index be1f00e686..f48bde6001 100644 --- a/py/objstr.c +++ b/py/objstr.c @@ -169,8 +169,8 @@ static mp_obj_t str_find(int n_args, const mp_obj_t *args) { const char* haystack = qstr_str(((mp_obj_str_t*)args[0])->qstr); const char* needle = qstr_str(((mp_obj_str_t*)args[1])->qstr); - ssize_t haystack_len = strlen(haystack); - ssize_t needle_len = strlen(needle); + size_t haystack_len = strlen(haystack); + size_t needle_len = strlen(needle); size_t start = 0; size_t end = haystack_len; @@ -183,14 +183,17 @@ static mp_obj_t str_find(int n_args, const mp_obj_t *args) { } char *p = strstr(haystack + start, needle); - ssize_t pos = -1; - if (p) { - pos = p - haystack; + if (p == NULL) { + // not found + return MP_OBJ_NEW_SMALL_INT(-1); + } else { + // found + machine_int_t pos = p - haystack; if (pos + needle_len > end) { pos = -1; } + return MP_OBJ_NEW_SMALL_INT(pos); } - return MP_OBJ_NEW_SMALL_INT(pos); } mp_obj_t str_strip(int n_args, const mp_obj_t *args) { diff --git a/py/runtime.c b/py/runtime.c index 9815452fc3..4335831ae4 100644 --- a/py/runtime.c +++ b/py/runtime.c @@ -97,7 +97,7 @@ void rt_init(void) { // built-in core functions mp_map_add_qstr(&map_builtins, MP_QSTR___build_class__, (mp_obj_t)&mp_builtin___build_class___obj); - mp_map_add_qstr(&map_builtins, MP_QSTR___repl_print__, rt_make_function_1(mp_builtin___repl_print__)); + mp_map_add_qstr(&map_builtins, MP_QSTR___repl_print__, (mp_obj_t)&mp_builtin___repl_print___obj); // built-in types mp_map_add_qstr(&map_builtins, MP_QSTR_bool, (mp_obj_t)&bool_type); @@ -115,27 +115,27 @@ void rt_init(void) { mp_map_add_qstr(&map_builtins, MP_QSTR_type, (mp_obj_t)&mp_const_type); mp_map_add_qstr(&map_builtins, MP_QSTR_zip, (mp_obj_t)&zip_type); - // built-in user functions; TODO covert all to &mp_builtin_xxx's - mp_map_add_qstr(&map_builtins, MP_QSTR_abs, rt_make_function_1(mp_builtin_abs)); - mp_map_add_qstr(&map_builtins, MP_QSTR_all, rt_make_function_1(mp_builtin_all)); - mp_map_add_qstr(&map_builtins, MP_QSTR_any, rt_make_function_1(mp_builtin_any)); - mp_map_add_qstr(&map_builtins, MP_QSTR_callable, rt_make_function_1(mp_builtin_callable)); - mp_map_add_qstr(&map_builtins, MP_QSTR_chr, rt_make_function_1(mp_builtin_chr)); - mp_map_add_qstr(&map_builtins, MP_QSTR_divmod, rt_make_function_2(mp_builtin_divmod)); + // built-in user functions + mp_map_add_qstr(&map_builtins, MP_QSTR_abs, (mp_obj_t)&mp_builtin_abs_obj); + mp_map_add_qstr(&map_builtins, MP_QSTR_all, (mp_obj_t)&mp_builtin_all_obj); + mp_map_add_qstr(&map_builtins, MP_QSTR_any, (mp_obj_t)&mp_builtin_any_obj); + mp_map_add_qstr(&map_builtins, MP_QSTR_callable, (mp_obj_t)&mp_builtin_callable_obj); + mp_map_add_qstr(&map_builtins, MP_QSTR_chr, (mp_obj_t)&mp_builtin_chr_obj); + mp_map_add_qstr(&map_builtins, MP_QSTR_divmod, (mp_obj_t)&mp_builtin_divmod_obj); mp_map_add_qstr(&map_builtins, MP_QSTR_hash, (mp_obj_t)&mp_builtin_hash_obj); mp_map_add_qstr(&map_builtins, MP_QSTR_isinstance, (mp_obj_t)&mp_builtin_isinstance_obj); mp_map_add_qstr(&map_builtins, MP_QSTR_issubclass, (mp_obj_t)&mp_builtin_issubclass_obj); mp_map_add_qstr(&map_builtins, MP_QSTR_iter, (mp_obj_t)&mp_builtin_iter_obj); - mp_map_add_qstr(&map_builtins, MP_QSTR_len, rt_make_function_1(mp_builtin_len)); - mp_map_add_qstr(&map_builtins, MP_QSTR_max, rt_make_function_var(1, mp_builtin_max)); - mp_map_add_qstr(&map_builtins, MP_QSTR_min, rt_make_function_var(1, mp_builtin_min)); + mp_map_add_qstr(&map_builtins, MP_QSTR_len, (mp_obj_t)&mp_builtin_len_obj); + mp_map_add_qstr(&map_builtins, MP_QSTR_max, (mp_obj_t)&mp_builtin_max_obj); + mp_map_add_qstr(&map_builtins, MP_QSTR_min, (mp_obj_t)&mp_builtin_min_obj); mp_map_add_qstr(&map_builtins, MP_QSTR_next, (mp_obj_t)&mp_builtin_next_obj); - mp_map_add_qstr(&map_builtins, MP_QSTR_ord, rt_make_function_1(mp_builtin_ord)); - mp_map_add_qstr(&map_builtins, MP_QSTR_pow, rt_make_function_var(2, mp_builtin_pow)); - mp_map_add_qstr(&map_builtins, MP_QSTR_print, rt_make_function_var(0, mp_builtin_print)); - mp_map_add_qstr(&map_builtins, MP_QSTR_range, rt_make_function_var(1, mp_builtin_range)); + mp_map_add_qstr(&map_builtins, MP_QSTR_ord, (mp_obj_t)&mp_builtin_ord_obj); + mp_map_add_qstr(&map_builtins, MP_QSTR_pow, (mp_obj_t)&mp_builtin_pow_obj); + mp_map_add_qstr(&map_builtins, MP_QSTR_print, (mp_obj_t)&mp_builtin_print_obj); + mp_map_add_qstr(&map_builtins, MP_QSTR_range, (mp_obj_t)&mp_builtin_range_obj); mp_map_add_qstr(&map_builtins, MP_QSTR_sorted, (mp_obj_t)&mp_builtin_sorted_obj); - mp_map_add_qstr(&map_builtins, MP_QSTR_sum, rt_make_function_var(1, mp_builtin_sum)); + mp_map_add_qstr(&map_builtins, MP_QSTR_sum, (mp_obj_t)&mp_builtin_sum_obj); next_unique_code_id = 1; // 0 indicates "no code" unique_codes_alloc = 0; @@ -589,12 +589,7 @@ mp_obj_t rt_make_function_from_id(int unique_code_id) { fun = mp_obj_new_fun_bc(c->n_args, c->n_locals + c->n_stack, c->u_byte.code); break; case MP_CODE_NATIVE: - switch (c->n_args) { - case 0: fun = rt_make_function_0(c->u_native.fun); break; - case 1: fun = rt_make_function_1((mp_fun_1_t)c->u_native.fun); break; - case 2: fun = rt_make_function_2((mp_fun_2_t)c->u_native.fun); break; - default: assert(0); fun = mp_const_none; - } + fun = rt_make_function_n(c->n_args, c->u_native.fun); break; case MP_CODE_INLINE_ASM: fun = mp_obj_new_fun_asm(c->n_args, c->u_inline_asm.fun); diff --git a/py/runtime.h b/py/runtime.h index ac53e14110..32cb47684f 100644 --- a/py/runtime.h +++ b/py/runtime.h @@ -12,10 +12,8 @@ void rt_store_global(qstr qstr, mp_obj_t obj); mp_obj_t rt_unary_op(int op, mp_obj_t arg); mp_obj_t rt_binary_op(int op, mp_obj_t lhs, mp_obj_t rhs); mp_obj_t rt_make_function_from_id(int unique_code_id); -mp_obj_t rt_make_function_0(mp_fun_0_t f); -mp_obj_t rt_make_function_1(mp_fun_1_t f); -mp_obj_t rt_make_function_2(mp_fun_2_t f); -mp_obj_t rt_make_function_var(int n_args_min, mp_fun_var_t f); +mp_obj_t rt_make_function_n(int n_args, void *fun); // fun must have the correct signature for n_args fixed arguments +mp_obj_t rt_make_function_var(int n_args_min, mp_fun_var_t fun); mp_obj_t rt_make_function_var_between(int n_args_min, int n_args_max, mp_fun_var_t fun); // min and max are inclusive mp_obj_t rt_make_closure_from_id(int unique_code_id, mp_obj_t closure_tuple); mp_obj_t rt_call_function_0(mp_obj_t fun); diff --git a/stm/audio.c b/stm/audio.c index 34adefbcd6..e2aa32b9fc 100644 --- a/stm/audio.c +++ b/stm/audio.c @@ -91,8 +91,8 @@ void audio_init(void) { // Python interface mp_obj_t m = mp_obj_new_module(qstr_from_str_static("audio")); - rt_store_attr(m, qstr_from_str_static("dac"), rt_make_function_1(pyb_audio_dac)); - rt_store_attr(m, qstr_from_str_static("is_full"), rt_make_function_0(pyb_audio_is_full)); - rt_store_attr(m, qstr_from_str_static("fill"), rt_make_function_1(pyb_audio_fill)); + rt_store_attr(m, qstr_from_str_static("dac"), rt_make_function_n(1, pyb_audio_dac)); + rt_store_attr(m, qstr_from_str_static("is_full"), rt_make_function_n(0, pyb_audio_is_full)); + rt_store_attr(m, qstr_from_str_static("fill"), rt_make_function_n(1, pyb_audio_fill)); rt_store_name(qstr_from_str_static("audio"), m); } @@ -220,13 +220,13 @@ void lcd_init(void) { // Python interface mp_obj_t m = mp_obj_new_module(qstr_from_str_static("lcd")); - rt_store_attr(m, qstr_from_str_static("lcd8"), rt_make_function_2(lcd_draw_pixel_8)); - rt_store_attr(m, qstr_from_str_static("clear"), rt_make_function_0(lcd_pix_clear)); - rt_store_attr(m, qstr_from_str_static("get"), rt_make_function_2(lcd_pix_get)); - rt_store_attr(m, qstr_from_str_static("set"), rt_make_function_2(lcd_pix_set)); - rt_store_attr(m, qstr_from_str_static("reset"), rt_make_function_2(lcd_pix_reset)); - rt_store_attr(m, qstr_from_str_static("show"), rt_make_function_0(lcd_pix_show)); - rt_store_attr(m, qstr_from_str_static("text"), rt_make_function_1(lcd_print)); + rt_store_attr(m, qstr_from_str_static("lcd8"), rt_make_function_n(2, lcd_draw_pixel_8)); + rt_store_attr(m, qstr_from_str_static("clear"), rt_make_function_n(0, lcd_pix_clear)); + rt_store_attr(m, qstr_from_str_static("get"), rt_make_function_n(2, lcd_pix_get)); + rt_store_attr(m, qstr_from_str_static("set"), rt_make_function_n(2, lcd_pix_set)); + rt_store_attr(m, qstr_from_str_static("reset"), rt_make_function_n(2, lcd_pix_reset)); + rt_store_attr(m, qstr_from_str_static("show"), rt_make_function_n(0, lcd_pix_show)); + rt_store_attr(m, qstr_from_str_static("text"), rt_make_function_n(1, lcd_print)); rt_store_name(qstr_from_str_static("lcd"), m); } diff --git a/stm/main.c b/stm/main.c index cdc4432c09..2085182c29 100644 --- a/stm/main.c +++ b/stm/main.c @@ -812,36 +812,36 @@ soft_reset: // add some functions to the python namespace { - rt_store_name(qstr_from_str_static("help"), rt_make_function_0(pyb_help)); + rt_store_name(qstr_from_str_static("help"), rt_make_function_n(0, pyb_help)); mp_obj_t m = mp_obj_new_module(qstr_from_str_static("pyb")); - rt_store_attr(m, qstr_from_str_static("info"), rt_make_function_0(pyb_info)); - rt_store_attr(m, qstr_from_str_static("sd_test"), rt_make_function_0(pyb_sd_test)); - rt_store_attr(m, qstr_from_str_static("stop"), rt_make_function_0(pyb_stop)); - rt_store_attr(m, qstr_from_str_static("standby"), rt_make_function_0(pyb_standby)); - rt_store_attr(m, qstr_from_str_static("source_dir"), rt_make_function_1(pyb_source_dir)); - rt_store_attr(m, qstr_from_str_static("main"), rt_make_function_1(pyb_main)); - rt_store_attr(m, qstr_from_str_static("sync"), rt_make_function_0(pyb_sync)); - rt_store_attr(m, qstr_from_str_static("gc"), rt_make_function_0(pyb_gc)); - rt_store_attr(m, qstr_from_str_static("delay"), rt_make_function_1(pyb_delay)); - rt_store_attr(m, qstr_from_str_static("led"), rt_make_function_1(pyb_led)); + rt_store_attr(m, qstr_from_str_static("info"), rt_make_function_n(0, pyb_info)); + rt_store_attr(m, qstr_from_str_static("sd_test"), rt_make_function_n(0, pyb_sd_test)); + rt_store_attr(m, qstr_from_str_static("stop"), rt_make_function_n(0, pyb_stop)); + rt_store_attr(m, qstr_from_str_static("standby"), rt_make_function_n(0, pyb_standby)); + rt_store_attr(m, qstr_from_str_static("source_dir"), rt_make_function_n(1, pyb_source_dir)); + rt_store_attr(m, qstr_from_str_static("main"), rt_make_function_n(1, pyb_main)); + rt_store_attr(m, qstr_from_str_static("sync"), rt_make_function_n(0, pyb_sync)); + rt_store_attr(m, qstr_from_str_static("gc"), rt_make_function_n(0, pyb_gc)); + rt_store_attr(m, qstr_from_str_static("delay"), rt_make_function_n(1, pyb_delay)); + rt_store_attr(m, qstr_from_str_static("led"), rt_make_function_n(1, pyb_led)); rt_store_attr(m, qstr_from_str_static("switch"), (mp_obj_t)&pyb_switch_obj); - rt_store_attr(m, qstr_from_str_static("servo"), rt_make_function_2(pyb_servo_set)); - rt_store_attr(m, qstr_from_str_static("pwm"), rt_make_function_2(pyb_pwm_set)); + rt_store_attr(m, qstr_from_str_static("servo"), rt_make_function_n(2, pyb_servo_set)); + rt_store_attr(m, qstr_from_str_static("pwm"), rt_make_function_n(2, pyb_pwm_set)); rt_store_attr(m, qstr_from_str_static("accel"), (mp_obj_t)&pyb_mma_read_obj); rt_store_attr(m, qstr_from_str_static("mma_read"), (mp_obj_t)&pyb_mma_read_all_obj); rt_store_attr(m, qstr_from_str_static("mma_mode"), (mp_obj_t)&pyb_mma_write_mode_obj); - rt_store_attr(m, qstr_from_str_static("hid"), rt_make_function_1(pyb_hid_send_report)); - rt_store_attr(m, qstr_from_str_static("time"), rt_make_function_0(pyb_rtc_read)); - rt_store_attr(m, qstr_from_str_static("rand"), rt_make_function_0(pyb_rng_get)); - rt_store_attr(m, qstr_from_str_static("Led"), rt_make_function_1(pyb_Led)); - rt_store_attr(m, qstr_from_str_static("Servo"), rt_make_function_1(pyb_Servo)); - rt_store_attr(m, qstr_from_str_static("I2C"), rt_make_function_2(pyb_I2C)); + rt_store_attr(m, qstr_from_str_static("hid"), rt_make_function_n(1, pyb_hid_send_report)); + rt_store_attr(m, qstr_from_str_static("time"), rt_make_function_n(0, pyb_rtc_read)); + rt_store_attr(m, qstr_from_str_static("rand"), rt_make_function_n(0, pyb_rng_get)); + rt_store_attr(m, qstr_from_str_static("Led"), rt_make_function_n(1, pyb_Led)); + rt_store_attr(m, qstr_from_str_static("Servo"), rt_make_function_n(1, pyb_Servo)); + rt_store_attr(m, qstr_from_str_static("I2C"), rt_make_function_n(2, pyb_I2C)); rt_store_attr(m, qstr_from_str_static("gpio"), (mp_obj_t)&pyb_gpio_obj); - rt_store_attr(m, qstr_from_str_static("Usart"), rt_make_function_2(pyb_Usart)); + rt_store_attr(m, qstr_from_str_static("Usart"), rt_make_function_n(2, pyb_Usart)); rt_store_name(qstr_from_str_static("pyb"), m); - rt_store_name(qstr_from_str_static("open"), rt_make_function_2(pyb_io_open)); + rt_store_name(qstr_from_str_static("open"), rt_make_function_n(2, pyb_io_open)); } // print a message to the LCD diff --git a/stm/printf.c b/stm/printf.c index c0fa82e1b0..732e834526 100644 --- a/stm/printf.c +++ b/stm/printf.c @@ -213,9 +213,9 @@ int pfenv_printf(const pfenv_t *pfenv, const char *fmt, va_list args) { // usable. I expect that this will be replaced with something // more appropriate. char dot = '.'; - double d = va_arg(args, double); + mp_float_t d = va_arg(args, double); int left = (int)d; - int right = (int)((d - (double)(int)d) * 1000000.0); + int right = (int)((d - (mp_float_t)(int)d) * 1000000.0); chrs += pfenv_print_int(pfenv, left, 1, 10, 'a', flags, width); chrs += pfenv_print_strn(pfenv, &dot, 1, flags, width); chrs += pfenv_print_int(pfenv, right, 0, 10, 'a', PF_FLAG_ZERO_PAD, 6); diff --git a/stm/pybwlan.c b/stm/pybwlan.c index 09d642d9c8..91d71a652b 100644 --- a/stm/pybwlan.c +++ b/stm/pybwlan.c @@ -357,11 +357,11 @@ void pyb_wlan_init(void) { mp_obj_t m = mp_obj_new_module(qstr_from_str_static("wlan")); rt_store_attr(m, qstr_from_str_static("connect"), rt_make_function_var(0, pyb_wlan_connect)); - rt_store_attr(m, qstr_from_str_static("disconnect"), rt_make_function_0(pyb_wlan_disconnect)); - rt_store_attr(m, qstr_from_str_static("ip"), rt_make_function_0(pyb_wlan_get_ip)); - rt_store_attr(m, qstr_from_str_static("get_host"), rt_make_function_1(pyb_wlan_get_host)); - rt_store_attr(m, qstr_from_str_static("http_get"), rt_make_function_2(pyb_wlan_http_get)); - rt_store_attr(m, qstr_from_str_static("serve"), rt_make_function_0(pyb_wlan_serve)); + rt_store_attr(m, qstr_from_str_static("disconnect"), rt_make_function_n(0, pyb_wlan_disconnect)); + rt_store_attr(m, qstr_from_str_static("ip"), rt_make_function_n(0, pyb_wlan_get_ip)); + rt_store_attr(m, qstr_from_str_static("get_host"), rt_make_function_n(1, pyb_wlan_get_host)); + rt_store_attr(m, qstr_from_str_static("http_get"), rt_make_function_n(2, pyb_wlan_http_get)); + rt_store_attr(m, qstr_from_str_static("serve"), rt_make_function_n(0, pyb_wlan_serve)); rt_store_name(qstr_from_str_static("wlan"), m); } @@ -17,6 +17,8 @@ int strncmp(const char *s1, const char *s2, size_t n); char *strndup(const char *s, size_t n); char *strcpy(char *dest, const char *src); char *strcat(char *dest, const char *src); +char *strchr(const char *s, int c); +char *strstr(const char *haystack, const char *needle); int printf(const char *fmt, ...); int snprintf(char *str, size_t size, const char *fmt, ...); diff --git a/stm/string0.c b/stm/string0.c index 2a5f255971..d67c5f2b17 100644 --- a/stm/string0.c +++ b/stm/string0.c @@ -108,3 +108,31 @@ char *strcat(char *dest, const char *src) { *d = '\0'; return dest; } + +// Public Domain implementation of strchr from: +// http://en.wikibooks.org/wiki/C_Programming/Strings#The_strchr_function +char *strchr(const char *s, int c) +{ + /* Scan s for the character. When this loop is finished, + s will either point to the end of the string or the + character we were looking for. */ + while (*s != '\0' && *s != (char)c) + s++; + return ((*s == c) ? (char *) s : 0); +} + + +// Public Domain implementation of strstr from: +// http://en.wikibooks.org/wiki/C_Programming/Strings#The_strstr_function +char *strstr(const char *haystack, const char *needle) +{ + size_t needlelen; + /* Check for the null needle case. */ + if (*needle == '\0') + return (char *) haystack; + needlelen = strlen(needle); + for (; (haystack = strchr(haystack, *needle)) != 0; haystack++) + if (strncmp(haystack, needle, needlelen) == 0) + return (char *) haystack; + return 0; +} diff --git a/stm/timer.c b/stm/timer.c index 2605d4b4bc..c665a461d0 100644 --- a/stm/timer.c +++ b/stm/timer.c @@ -72,10 +72,10 @@ void timer_init(void) { // Python interface mp_obj_t m = mp_obj_new_module(qstr_from_str_static("timer")); - rt_store_attr(m, qstr_from_str_static("callback"), rt_make_function_1(timer_py_set_callback)); - rt_store_attr(m, qstr_from_str_static("period"), rt_make_function_1(timer_py_set_period)); - rt_store_attr(m, qstr_from_str_static("prescaler"), rt_make_function_1(timer_py_set_prescaler)); - rt_store_attr(m, qstr_from_str_static("value"), rt_make_function_0(timer_py_get_value)); + rt_store_attr(m, qstr_from_str_static("callback"), rt_make_function_n(1, timer_py_set_callback)); + rt_store_attr(m, qstr_from_str_static("period"), rt_make_function_n(1, timer_py_set_period)); + rt_store_attr(m, qstr_from_str_static("prescaler"), rt_make_function_n(1, timer_py_set_prescaler)); + rt_store_attr(m, qstr_from_str_static("value"), rt_make_function_n(0, timer_py_get_value)); rt_store_name(qstr_from_str_static("timer"), m); } |
